changes
This commit is contained in:
@@ -50,6 +50,8 @@ class Cache:
|
||||
try:
|
||||
artist: str = artist.strip().lower()
|
||||
song: str = song.strip().lower()
|
||||
search_params: Optional[tuple] = None
|
||||
random_search: bool = False
|
||||
logging.info("Searching %s - %s on %s",
|
||||
artist, song, self.label)
|
||||
async with sqlite3.connect(self.cache_db, timeout=2) as db_conn:
|
||||
@@ -61,7 +63,11 @@ class Cache:
|
||||
WHERE editdist3((artist || " " || song), (? || " " || ?))\
|
||||
<= 410 ORDER BY editdist3((artist || " " || song), ?) ASC LIMIT 10'
|
||||
search_params: tuple = (artist.strip(), song.strip(),
|
||||
f"{artist.strip()} {song.strip()}")
|
||||
f"{artist.strip()} {song.strip()}")
|
||||
if artist == "!" and song == "!":
|
||||
random_search: bool = True
|
||||
search_query: str = 'SELECT id, artist, song, lyrics, src, confidence FROM lyrics ORDER BY RANDOM() LIMIT 1'
|
||||
search_params = None
|
||||
async with await _db_cursor.execute(search_query, search_params) as db_cursor:
|
||||
results: list = await db_cursor.fetchall()
|
||||
result_tracks: list = []
|
||||
@@ -70,8 +76,11 @@ class Cache:
|
||||
result_tracks.append((_id, f"{_artist} - {_song}"))
|
||||
input_track: str = f"{artist} - {song}"
|
||||
matcher = utils.TrackMatcher()
|
||||
best_match: tuple|None = matcher.find_best_match(input_track=input_track,
|
||||
if not random_search:
|
||||
best_match: tuple|None = matcher.find_best_match(input_track=input_track,
|
||||
candidate_tracks=result_tracks)
|
||||
else:
|
||||
best_match = (result_tracks[0], float(1))
|
||||
if not best_match:
|
||||
return None
|
||||
(candidate, confidence) = best_match
|
||||
|
||||
Reference in New Issue
Block a user