From 5248a252ec1965f57f6cc72f51b2cf495afe7b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Pe=C3=B1a?= Date: Sat, 19 Nov 2022 16:56:38 +0000 Subject: [PATCH] Resolves 404 on skipped upload --- api/funkwhale_api/music/models.py | 8 ++++++-- api/tests/music/test_models.py | 3 ++- changes/changelog.d/1349.bugfix | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 changes/changelog.d/1349.bugfix diff --git a/api/funkwhale_api/music/models.py b/api/funkwhale_api/music/models.py index a34c927d5..a96327a64 100644 --- a/api/funkwhale_api/music/models.py +++ b/api/funkwhale_api/music/models.py @@ -680,8 +680,12 @@ class UploadQuerySet(common_models.NullsLastQuerySet): libraries = Library.objects.viewable_by(actor) if include: - return self.filter(library__in=libraries, import_status="finished") - return self.exclude(library__in=libraries, import_status="finished") + return self.filter( + library__in=libraries, import_status__in=["finished", "skipped"] + ) + return self.exclude( + library__in=libraries, import_status__in=["finished", "skipped"] + ) def local(self, include=True): query = models.Q(library__actor__domain_id=settings.FEDERATION_HOSTNAME) diff --git a/api/tests/music/test_models.py b/api/tests/music/test_models.py index d8e3bb444..e30596756 100644 --- a/api/tests/music/test_models.py +++ b/api/tests/music/test_models.py @@ -212,7 +212,8 @@ def test_library(factories): @pytest.mark.parametrize( - "status,expected", [("pending", False), ("errored", False), ("finished", True)] + "status,expected", + [("pending", False), ("errored", False), ("finished", True), ("skipped", True)], ) def test_playable_by_correct_status(status, expected, factories): upload = factories["music.Upload"]( diff --git a/changes/changelog.d/1349.bugfix b/changes/changelog.d/1349.bugfix new file mode 100644 index 000000000..d8699880e --- /dev/null +++ b/changes/changelog.d/1349.bugfix @@ -0,0 +1 @@ +Fixed unplayable skipped upload (#1349)