codey/api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

push

Browse Source
This commit is contained in:
codey 2024-08-11 08:03:36 -04:00
parent 70c738ac4b
commit f2f0426498
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
endpoints/LyricSearch.py
View File

@ -35,13 +35,6 @@ class LyricSearch(FastAPI):
self.lyrics_engine = importlib.import_module("lyrics_engine").LyricsEngine() self.lyrics_engine = importlib.import_module("lyrics_engine").LyricsEngine()
self.endpoint_name = "/search/" self.endpoint_name = "/search/"
self.search_method_order = [
666,
1,
8,
2,
3
]
self.acceptable_request_sources = [ self.acceptable_request_sources = [
"WEB", "WEB",
"IRC-MS", "IRC-MS",
@ -88,7 +81,7 @@ class LyricSearch(FastAPI):
len(searchArtist) + len(searchSong) >= 3 len(searchArtist) + len(searchSong) >= 3
) )
if not(random_song_requested) and not(query_valid): if not(random_song_requested) and not(searchText) and not(query_valid):
return { return {
"err": True, "err": True,
"errorText": "Invalid parameters" "errorText": "Invalid parameters"
@ -104,9 +97,10 @@ class LyricSearch(FastAPI):
searchObject = self.lyrics_engine.create_query_object("%s : %s" % (searchArtist, searchSong)) searchObject = self.lyrics_engine.create_query_object("%s : %s" % (searchArtist, searchSong))
if subSearch: if subSearch:
searchObject = self.lyrics_engine.create_query_object("%s : %s : %s" % (searchArtist, searchSong, subSearch)) searchObject = self.lyrics_engine.create_query_object("%s : %s : %s" % (searchArtist, searchSong, subSearch))
else:
searchObject = self.lyrics_engine.create_query_object(str(searchText))
searchWorker = await self.lyrics_engine.lyrics_worker(searching=searchObject, searchWorker = await self.lyrics_engine.lyrics_worker(searching=searchObject,
method_order=self.search_method_order,
recipient='anyone') recipient='anyone')
if not(searchWorker) or not('l') in searchWorker.keys(): if not(searchWorker) or not('l') in searchWorker.keys():