From 363a4b5d35813bbebc0bc56437513595c93efd57 Mon Sep 17 00:00:00 2001 From: Petitminion Date: Tue, 7 Nov 2023 15:33:28 +0100 Subject: [PATCH] resolves review Part-of: --- api/funkwhale_api/music/dynamic_preferences_registry.py | 8 ++++---- api/funkwhale_api/music/tasks.py | 2 +- api/tests/music/test_tasks.py | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/api/funkwhale_api/music/dynamic_preferences_registry.py b/api/funkwhale_api/music/dynamic_preferences_registry.py index f459586d7..20890fde8 100644 --- a/api/funkwhale_api/music/dynamic_preferences_registry.py +++ b/api/funkwhale_api/music/dynamic_preferences_registry.py @@ -41,9 +41,9 @@ class MbidTaggedContent(types.BooleanPreference): name = "only_allow_musicbrainz_tagged_files" verbose_name = "Only allow Musicbrainz tagged files" help_text = ( - "Only Musicbrainz tagged files will be allowed to be uploaded on the server. " - "If files where uploaded before this settings will not affect them. " - "To clean the db from files not following mb tags use the funkwhale cli " - "or use quality filters" + "Requires uploaded files to be tagged with a MusicBrainz ID. " + "Enabling this setting has no impact on previously uploaded files. " + "You can use the CLI to clear files that don't contain an MBID or " + "or enable quality filtering to hide untagged content from API calls. " ) default = False diff --git a/api/funkwhale_api/music/tasks.py b/api/funkwhale_api/music/tasks.py index f50ac8be3..a5982b371 100644 --- a/api/funkwhale_api/music/tasks.py +++ b/api/funkwhale_api/music/tasks.py @@ -248,7 +248,7 @@ def process_upload(upload, update_denormalization=True): upload, "invalid_metadata", detail=detail, file_metadata=metadata_dump ) check_mbid = preferences.get("music__only_allow_musicbrainz_tagged_files") - if check_mbid is True and not serializer.validated_data.get("mbid"): + if check_mbid and not serializer.validated_data.get("mbid"): return fail_import( upload, "Uploading files without a MusicBrainz ID is not permitted in this pod", diff --git a/api/tests/music/test_tasks.py b/api/tests/music/test_tasks.py index d742bebb4..c73535303 100644 --- a/api/tests/music/test_tasks.py +++ b/api/tests/music/test_tasks.py @@ -1276,7 +1276,7 @@ def test_can_import_track_with_same_position_in_different_discs(factories, mocke }, "position": upload.track.position, "disc_number": 2, - "mbid": str(uuid.uuid4()), + "mbid": None, } mocker.patch.object(metadata.TrackMetadataSerializer, "validated_data", data) @@ -1310,7 +1310,7 @@ def test_can_import_track_with_same_position_in_same_discs_skipped(factories, mo }, "position": upload.track.position, "disc_number": upload.track.disc_number, - "mbid": str(uuid.uuid4()), + "mbid": None, } mocker.patch.object(metadata.TrackMetadataSerializer, "validated_data", data) @@ -1407,7 +1407,6 @@ def test_upload_checks_mbid_tag(temp_signal, factories, mocker, preferences): mocker.patch("funkwhale_api.federation.routes.outbox.dispatch") mocker.patch("funkwhale_api.music.tasks.populate_album_cover") mocker.patch("funkwhale_api.music.metadata.Metadata.get_picture") - # mocker.spy(tasks, "get_track_from_import_metadata") track = factories["music.Track"](album__attachment_cover=None, mbid=None) path = os.path.join(DATA_DIR, "with_cover.opus")