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

Show short entries first in search results to improve UX

Browse source
This commit is contained in:
Eliot Berriot 2019-01-03 17:34:14 +01:00
parent 567884b741
commit 89f6e3656b
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
3 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
api/funkwhale_api/music/views.py
View file

@ -448,28 +448,29 @@ class Search(views.APIView):
"artist__name__unaccent",
]
query_obj = utils.get_query(query, search_fields)
return (
qs = (
models.Track.objects.all()
.filter(query_obj)
.select_related("artist", "album__artist")
)[: self.max_results]
)
return common_utils.order_for_search(qs, "title")[: self.max_results]
def get_albums(self, query):
search_fields = ["mbid", "title__unaccent", "artist__name__unaccent"]
query_obj = utils.get_query(query, search_fields)
return (
qs = (
models.Album.objects.all()
.filter(query_obj)
.select_related()
.prefetch_related("tracks")
)[: self.max_results]
.prefetch_related("tracks__artist")
)
return common_utils.order_for_search(qs, "title")[: self.max_results]
def get_artists(self, query):
search_fields = ["mbid", "name__unaccent"]
query_obj = utils.get_query(query, search_fields)
return (models.Artist.objects.all().filter(query_obj).with_albums())[
: self.max_results
]
qs = models.Artist.objects.all().filter(query_obj).with_albums()
return common_utils.order_for_search(qs, "name")[: self.max_results]
def get_tags(self, query):
search_fields = ["slug", "name__unaccent"]