Skip to content
Snippets Groups Projects
Commit fe0ed1f0 authored by Agate's avatar Agate :speech_balloon:
Browse files

Merge branch 'import-eaccess-fix' into 'develop'

Handle access errors scanning directories

See merge request funkwhale/funkwhale!1149
parents d8fea1a6 88a72ea1
Branches
No related tags found
No related merge requests found
......@@ -3,6 +3,7 @@ import datetime
import itertools
import os
import queue
import sys
import threading
import time
import urllib.parse
......@@ -29,7 +30,13 @@ def crawl_dir(dir, extensions, recursive=True, ignored=[]):
return
try:
scanner = os.scandir(dir)
except Exception as e:
m = "Error while reading {}: {} {}\n".format(dir, e.__class__.__name__, e)
sys.stderr.write(m)
return
try:
for entry in scanner:
try:
if entry.is_file():
for e in extensions:
if entry.name.lower().endswith(".{}".format(e.lower())):
......@@ -39,6 +46,11 @@ def crawl_dir(dir, extensions, recursive=True, ignored=[]):
yield from crawl_dir(
entry.path, extensions, recursive=recursive, ignored=ignored
)
except Exception as e:
m = "Error while reading {}: {} {}\n".format(
entry.name, e.__class__.__name__, e
)
sys.stderr.write(m)
finally:
if hasattr(scanner, "close"):
scanner.close()
......
Handle access errors scanning directories when importing files
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment