yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-06 02:09:55 +02:00
Code Issues Releases Wiki Activity

Revert "Fix #994: use PostgreSQL full-text-search"

Browse source 
This reverts commit b3d8d6a4da.
This commit is contained in:
Eliot Berriot 2019-12-17 10:57:05 +01:00
parent b3d8d6a4da
commit 7b0db234e2
No known key found for this signature in database
GPG key ID: 6B501DFD73514E14
6 changed files with 5 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -629,10 +629,7 @@ class Search(views.APIView):
"album__title__unaccent",
"artist__name__unaccent",
]
if settings.USE_FULL_TEXT_SEARCH:
query_obj = utils.get_fts_query(query)
else:
query_obj = utils.get_query(query, search_fields)
query_obj = utils.get_query(query, search_fields)
qs = (
models.Track.objects.all()
.filter(query_obj)
@ -642,10 +639,7 @@ class Search(views.APIView):
def get_albums(self, query):
search_fields = ["mbid", "title__unaccent", "artist__name__unaccent"]
if settings.USE_FULL_TEXT_SEARCH:
query_obj = utils.get_fts_query(query)
else:
query_obj = utils.get_query(query, search_fields)
query_obj = utils.get_query(query, search_fields)
qs = (
models.Album.objects.all()
.filter(query_obj)
@ -655,10 +649,7 @@ class Search(views.APIView):
def get_artists(self, query):
search_fields = ["mbid", "name__unaccent"]
if settings.USE_FULL_TEXT_SEARCH:
query_obj = utils.get_fts_query(query)
else:
query_obj = utils.get_query(query, search_fields)
query_obj = utils.get_query(query, search_fields)
qs = models.Artist.objects.all().filter(query_obj).with_albums()
return common_utils.order_for_search(qs, "name")[: self.max_results]