diff --git a/api/funkwhale_api/music/models.py b/api/funkwhale_api/music/models.py index 6d3c0dffdc21c7f42e95deb1faf14e1d72d74eff..87f7ba8191c62547c4ebeb4c7f41a3986ef23a77 100644 --- a/api/funkwhale_api/music/models.py +++ b/api/funkwhale_api/music/models.py @@ -557,7 +557,9 @@ class UploadQuerySet(models.QuerySet): libraries = Library.objects.viewable_by(actor) if include: - return self.filter(library__in=libraries, import_status="finished").distinct() + return self.filter( + library__in=libraries, import_status="finished" + ).distinct() return self.exclude(library__in=libraries, import_status="finished").distinct() def local(self, include=True): diff --git a/api/funkwhale_api/subsonic/views.py b/api/funkwhale_api/subsonic/views.py index 308ed4913620223ba9bfa1448858f2ddfc937460..da646fcad765b376e1f8162a7e699a9d8d88a661 100644 --- a/api/funkwhale_api/subsonic/views.py +++ b/api/funkwhale_api/subsonic/views.py @@ -235,7 +235,9 @@ class SubsonicViewSet(viewsets.GenericViewSet): except (TypeError, KeyError, ValueError): size = 50 - queryset = queryset.playable_by(actor).prefetch_related('uploads').order_by("?")[:size] + queryset = ( + queryset.playable_by(actor).prefetch_related("uploads").order_by("?")[:size] + ) data = { "randomSongs": { "song": serializers.GetSongSerializer(queryset, many=True).data diff --git a/api/tests/subsonic/test_views.py b/api/tests/subsonic/test_views.py index 9e71fca94f8f7984dd29e8126a47568ab4670bef..8d84758dce6c37f8980dc6131b9c31d6d62a97bc 100644 --- a/api/tests/subsonic/test_views.py +++ b/api/tests/subsonic/test_views.py @@ -254,13 +254,15 @@ def test_get_random_songs(f, db, logged_in_api_client, factories, mocker): factories["music.Track"]() order_by = mocker.patch.object( - music_models.TrackQuerySet, 'order_by', return_value=[track1, track2] + music_models.TrackQuerySet, "order_by", return_value=[track1, track2] ) response = logged_in_api_client.get(url, {"f": f, "size": 2}) assert response.status_code == 200 assert response.data == { - "randomSongs": {"song": serializers.GetSongSerializer([track1, track2], many=True).data} + "randomSongs": { + "song": serializers.GetSongSerializer([track1, track2], many=True).data + } } order_by.assert_called_once_with("?")