Commit b52c9f98 authored by Agate's avatar Agate 💬
Browse files

Merge branch 'revert-6b0e0222' into 'develop'

Revert "Merge branch 'fix-import-python-3-5' into 'develop'"

See merge request funkwhale/funkwhale!1132
parents 6b0e0222 ddb75c06
......@@ -23,30 +23,21 @@ from funkwhale_api.common import utils as common_utils
from funkwhale_api.music import models, tasks, utils
def dir_scanner(scanner, extensions, recursive, ignored):
for entry in scanner:
if entry.is_file():
for e in extensions:
if entry.name.lower().endswith(".{}".format(e.lower())):
if entry.path not in ignored:
yield entry.path
elif recursive and entry.is_dir():
yield from dir_scanner(
entry, extensions, recursive=recursive, ignored=ignored
)
def crawl_dir(dir, extensions, recursive=True, ignored=[]):
if os.path.isfile(dir):
yield dir
return
else:
try:
scanner = os.scandir(dir)
yield from dir_scanner(scanner, extensions, recursive, ignored)
finally:
if hasattr(scanner, "close"):
scanner.close()
with os.scandir(dir) as scanner:
for entry in scanner:
if entry.is_file():
for e in extensions:
if entry.name.lower().endswith(".{}".format(e.lower())):
if entry.path not in ignored:
yield entry.path
elif recursive and entry.is_dir():
yield from crawl_dir(
entry, extensions, recursive=recursive, ignored=ignored
)
def batch(iterable, n=1):
......
Fixed an issue where in-place importing didn't work for directories on machines running Python 3.5 (#1148, #1147)
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment