From f2f0426498578a808fca6952f7b87e30b405de69 Mon Sep 17 00:00:00 2001 From: codey Date: Sun, 11 Aug 2024 08:03:36 -0400 Subject: [PATCH] push --- endpoints/LyricSearch.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/endpoints/LyricSearch.py b/endpoints/LyricSearch.py index ac6891d..35f7670 100644 --- a/endpoints/LyricSearch.py +++ b/endpoints/LyricSearch.py @@ -35,13 +35,6 @@ class LyricSearch(FastAPI): self.lyrics_engine = importlib.import_module("lyrics_engine").LyricsEngine() self.endpoint_name = "/search/" - self.search_method_order = [ - 666, - 1, - 8, - 2, - 3 - ] self.acceptable_request_sources = [ "WEB", "IRC-MS", @@ -88,7 +81,7 @@ class LyricSearch(FastAPI): 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 { "err": True, "errorText": "Invalid parameters" @@ -104,9 +97,10 @@ class LyricSearch(FastAPI): searchObject = self.lyrics_engine.create_query_object("%s : %s" % (searchArtist, searchSong)) if 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, - method_order=self.search_method_order, recipient='anyone') if not(searchWorker) or not('l') in searchWorker.keys():