MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'search-improvement-subsonic' into 'develop' 

Return shorter search results first on Subsonic API

See merge request funkwhale/funkwhale!519
This commit is contained in:
Eliot Berriot 2019-01-05 16:10:20 +01:00
parent 14a84a79ce 031d96a0a6
commit b5448a42f7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/funkwhale_api/subsonic/views.py
View File

@ -10,7 +10,7 @@ from rest_framework.serializers import ValidationError
import funkwhale_api import funkwhale_api
from funkwhale_api.activity import record from funkwhale_api.activity import record
from funkwhale_api.common import preferences from funkwhale_api.common import preferences, utils as common_utils
from funkwhale_api.favorites.models import TrackFavorite from funkwhale_api.favorites.models import TrackFavorite
from funkwhale_api.music import models as music_models from funkwhale_api.music import models as music_models
from funkwhale_api.music import utils from funkwhale_api.music import utils
@ -345,6 +345,7 @@ class SubsonicViewSet(viewsets.GenericViewSet):
utils.get_query(query, c["search_fields"]) utils.get_query(query, c["search_fields"])
) )
queryset = queryset.playable_by(actor) queryset = queryset.playable_by(actor)
queryset = common_utils.order_for_search(queryset, c["search_fields"][0])
queryset = queryset[offset : offset + size] queryset = queryset[offset : offset + size]
payload["searchResult3"][c["subsonic"]] = c["serializer"](queryset) payload["searchResult3"][c["subsonic"]] = c["serializer"](queryset)
return response.Response(payload) return response.Response(payload)