From f54038ca837e98e264b97685d1c3fbc98e53a0ad Mon Sep 17 00:00:00 2001 From: Agate Date: Fri, 5 Jun 2020 10:42:56 +0200 Subject: [PATCH] Resolve "CLI in-place import impossible with virtualenv with python3.5" --- .../music/management/commands/import_files.py | 6 +++++- api/tests/files/nested/valid.ogg | Bin 0 -> 5158 bytes api/tests/test_import_audio_file.py | 14 ++++++++++++++ changes/changelog.d/1048.bugfix | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 api/tests/files/nested/valid.ogg create mode 100644 changes/changelog.d/1048.bugfix diff --git a/api/funkwhale_api/music/management/commands/import_files.py b/api/funkwhale_api/music/management/commands/import_files.py index fab980510..ddc598d06 100644 --- a/api/funkwhale_api/music/management/commands/import_files.py +++ b/api/funkwhale_api/music/management/commands/import_files.py @@ -27,7 +27,8 @@ def crawl_dir(dir, extensions, recursive=True, ignored=[]): if os.path.isfile(dir): yield dir return - with os.scandir(dir) as scanner: + try: + scanner = os.scandir(dir) for entry in scanner: if entry.is_file(): for e in extensions: @@ -38,6 +39,9 @@ def crawl_dir(dir, extensions, recursive=True, ignored=[]): yield from crawl_dir( entry, extensions, recursive=recursive, ignored=ignored ) + finally: + if hasattr(scanner, "close"): + scanner.close() def batch(iterable, n=1): diff --git a/api/tests/files/nested/valid.ogg b/api/tests/files/nested/valid.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e1643848a07a548e55d53726d4e4fe168a8ab2cd GIT binary patch literal 5158 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 literal 0 HcmV?d00001 diff --git a/api/tests/test_import_audio_file.py b/api/tests/test_import_audio_file.py index 04c06a8f4..7ee1028c8 100644 --- a/api/tests/test_import_audio_file.py +++ b/api/tests/test_import_audio_file.py @@ -352,3 +352,17 @@ def test_handle_modified_update_existing_path_if_found_and_attributed_to( event=event, stdout=stdout, library=library, in_place=True, ) update_track_metadata.assert_not_called() + + +def test_import_files(factories, capsys): + # smoke test to ensure the command run properly + library = factories["music.Library"](actor__local=True) + call_command( + "import_files", str(library.uuid), DATA_DIR, interactive=False, recursive=True + ) + captured = capsys.readouterr() + + imported = library.uploads.filter(import_status="finished").count() + assert imported > 0 + assert "Successfully imported {} new tracks".format(imported) in captured.out + assert "For details, please refer to import reference" in captured.out diff --git a/changes/changelog.d/1048.bugfix b/changes/changelog.d/1048.bugfix new file mode 100644 index 000000000..0f1973444 --- /dev/null +++ b/changes/changelog.d/1048.bugfix @@ -0,0 +1 @@ +Fixed recursive CLI importing crashing under Python 3.5 (#1148, #1147)