Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
jovuit
funkwhale
Commits
ddb75c06
Commit
ddb75c06
authored
Jun 05, 2020
by
Agate
💬
Browse files
Revert "Merge branch 'fix-import-python-3-5' into 'develop'"
This reverts merge request !1129
parent
6b0e0222
Changes
2
Hide whitespace changes
Inline
Side-by-side
api/funkwhale_api/music/management/commands/import_files.py
View file @
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
):
...
...
changes/changelog.d/1147.bugfix
deleted
100644 → 0
View file @
6b0e0222
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
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment