MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Handle access errors scanning directories

See merge request funkwhale/funkwhale!1149
This commit is contained in:
Agate 2020-06-21 13:14:23 +02:00
parent d8fea1a684 88a72ea14d
commit fe0ed1f040
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/funkwhale_api/music/management/commands/import_files.py
View File

@ -3,6 +3,7 @@ import datetime
import itertools import itertools
import os import os
import queue import queue
import sys
import threading import threading
import time import time
import urllib.parse import urllib.parse
@ -29,7 +30,13 @@ def crawl_dir(dir, extensions, recursive=True, ignored=[]):
return return
try: try:
scanner = os.scandir(dir) 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: for entry in scanner:
try:
if entry.is_file(): if entry.is_file():
for e in extensions: for e in extensions:
if entry.name.lower().endswith(".{}".format(e.lower())): if entry.name.lower().endswith(".{}".format(e.lower())):
@ -39,6 +46,11 @@ def crawl_dir(dir, extensions, recursive=True, ignored=[]):
yield from crawl_dir( yield from crawl_dir(
entry.path, extensions, recursive=recursive, ignored=ignored 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: finally:
if hasattr(scanner, "close"): if hasattr(scanner, "close"):
scanner.close() scanner.close()

1
changes/changelog.d/import-eaccess-fix.bugfix Normal file
View File

@ -0,0 +1 @@
Handle access errors scanning directories when importing files