yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-05 20:11:58 +02:00
Code Issues Releases Wiki Activity

Fixed #295: broken pagination in Subsonic API

Browse source
This commit is contained in:
Eliot Berriot 2018-06-10 13:34:15 +02:00
parent 4c81de9226
commit 031784556f
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
3 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
api/funkwhale_api/subsonic/views.py
View file

@ -208,7 +208,9 @@ class SubsonicViewSet(viewsets.GenericViewSet):
methods=["get", "post"], url_name="get_album_list2", url_path="getAlbumList2"
)
def get_album_list2(self, request, *args, **kwargs):
queryset = music_models.Album.objects.with_tracks_count()
queryset = music_models.Album.objects.with_tracks_count().order_by(
"artist__name"
)
data = request.GET or request.POST
filterset = filters.AlbumList2FilterSet(data, queryset=queryset)
queryset = filterset.qs
@ -223,7 +225,7 @@ class SubsonicViewSet(viewsets.GenericViewSet):
size = 50
size = min(size, 500)
queryset = queryset[offset:size]
queryset = queryset[offset : offset + size]
data = {"albumList2": {"album": serializers.get_album_list2_data(queryset)}}
return response.Response(data)
@ -283,7 +285,7 @@ class SubsonicViewSet(viewsets.GenericViewSet):
queryset = c["queryset"].filter(
utils.get_query(query, c["search_fields"])
)
queryset = queryset[offset:size]
queryset = queryset[offset : offset + size]
payload["searchResult3"][c["subsonic"]] = c["serializer"](queryset)
return response.Response(payload)