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

Fixed full-text search

This commit is contained in:
Agate 2020-08-27 11:31:13 +02:00
parent 1d36df3f69
commit b1ae13ab0a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/funkwhale_api/common/search.py
View File

@ -59,13 +59,19 @@ def get_query(query_string, search_fields):
return query return query
def remove_chars(string, chars):
for char in chars:
string = string.replace(char, "")
return string
def get_fts_query(query_string, fts_fields=["body_text"], model=None): def get_fts_query(query_string, fts_fields=["body_text"], model=None):
search_type = "plain" search_type = "raw"
if query_string.startswith('"') and query_string.endswith('"'): if query_string.startswith('"') and query_string.endswith('"'):
# we pass the query directly to the FTS engine # we pass the query directly to the FTS engine
query_string = query_string[1:-1] query_string = query_string[1:-1]
search_type = "raw"
else: else:
query_string = remove_chars(query_string, ['"', "&", "(", ")", "!", "'"])
parts = query_string.replace(":", "").split(" ") parts = query_string.replace(":", "").split(" ")
parts = ["{}:*".format(p) for p in parts if p] parts = ["{}:*".format(p) for p in parts if p]
if not parts: if not parts: