From f400d2568b0308d3a8d44dea9a7a7e42f7f89491 Mon Sep 17 00:00:00 2001 From: Agate Date: Sun, 23 Aug 2020 16:35:19 +0200 Subject: [PATCH] Fixed slow import when duplicates --- api/funkwhale_api/music/tasks.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/api/funkwhale_api/music/tasks.py b/api/funkwhale_api/music/tasks.py index 7f47b402b..fa8e69591 100644 --- a/api/funkwhale_api/music/tasks.py +++ b/api/funkwhale_api/music/tasks.py @@ -251,6 +251,10 @@ def process_upload(upload, update_denormalization=True): fail_import(upload, "unknown_error") raise + broadcast = getter( + internal_config, "funkwhale", "config", "broadcast", default=True + ) + # under some situations, we want to skip the import ( # for instance if the user already owns the files) owned_duplicates = get_owned_duplicates(upload, track) @@ -266,12 +270,13 @@ def process_upload(upload, update_denormalization=True): upload.save( update_fields=["import_details", "import_status", "import_date", "track"] ) - signals.upload_import_status_updated.send( - old_status=old_status, - new_status=upload.import_status, - upload=upload, - sender=None, - ) + if broadcast: + signals.upload_import_status_updated.send( + old_status=old_status, + new_status=upload.import_status, + upload=upload, + sender=None, + ) return # all is good, let's finalize the import @@ -308,9 +313,6 @@ def process_upload(upload, update_denormalization=True): track.album, source=final_metadata.get("upload_source"), ) - broadcast = getter( - internal_config, "funkwhale", "config", "broadcast", default=True - ) if broadcast: signals.upload_import_status_updated.send( old_status=old_status,