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

lrc tweaks

Browse Source
This commit is contained in:
codey
2025-01-17 07:48:29 -05:00
parent 76182e3df1
commit 7899fc2d71
5 changed files with 66 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lyric_search_new/sources/aggregate.py
View File

@@ -36,7 +36,7 @@ class Aggregate:
search_result: Optional[LyricsResult] = None
for source in sources:
if source.label.lower() in self.exclude_methods:
if source.label.lower() != "cache":
if source.label.lower() != "cache" or not plain:
logging.info("Skipping source: %s, excluded.", source.label)
continue
logging.info("Cache exclude requested, ignoring")

17
lyric_search_new/sources/lrclib.py
View File

@@ -41,6 +41,8 @@ class LRCLib:
artist: str = artist.strip().lower()
song: str = song.strip().lower()
time_start: float = time.time()
lrc_obj: Optional[list[dict]] = None
logging.info("Searching %s - %s on %s",
artist, song, self.label)
@@ -67,9 +69,16 @@ class LRCLib:
if not isinstance(search_data, list):
raise InvalidResponseException("Invalid JSON.")
possible_matches = [(x, f"{result.get('artistName')} - {result.get('trackName')}")
if plain:
possible_matches = [(x, f"{result.get('artistName')} - {result.get('trackName')}")
for x, result in enumerate(search_data)]
else:
logging.info("Limiting possible matches to only those with non-null syncedLyrics")
possible_matches = [(x, f"{result.get('artistName')} - {result.get('trackName')}")
for x, result in enumerate(search_data) if isinstance(result['syncedLyrics'], str)]
best_match = self.matcher.find_best_match(input_track,
possible_matches)[0]
if not best_match:
@@ -93,6 +102,7 @@ class LRCLib:
if not isinstance(search_data[best_match_id]['syncedLyrics'], str):
raise InvalidResponseException(f"Invalid JSON: Cannot find syncedLyrics key.\n{search_data}")
returned_lyrics: str = search_data[best_match_id]['syncedLyrics']
lrc_obj = self.datautils.create_lrc_object(returned_lyrics)
returned_track: str = f"{returned_artist} - {returned_song}"
(_matched, confidence) = self.matcher.find_best_match(input_track=input_track,
candidate_tracks=[(0, returned_track)])
@@ -104,12 +114,11 @@ class LRCLib:
matched = LyricsResult(artist=returned_artist,
song=returned_song,
src=self.label,
lyrics=returned_lyrics,
lyrics=returned_lyrics if plain else lrc_obj,
confidence=confidence,
time=time_diff)
await self.cache.store(matched)
return matched
except:
if log_level == "DEBUG":
traceback.print_exc()
traceback.print_exc()
return