codey/api
1
0
Fork 0
Code Issues 1 Pull Requests Activity

changes

Browse Source
This commit is contained in:
codey
2025-01-14 18:37:49 -05:00
parent 06581c1fce
commit 598478f804
6 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lyric_search_new/sources/lrclib.py
View File

@@ -23,7 +23,7 @@ class LRCLib:
"""LRCLib Search Module"""
def __init__(self):
self.label: str = "LRCLib"
self.lrclib_url: str = "https://lrclib.net/api/get"
self.lrclib_url: str = "https://lrclib.net/api/search"
self.headers: dict = common.SCRAPE_HEADERS
self.timeout = ClientTimeout(connect=2, sock_read=4)
self.datautils = utils.DataUtils()
@@ -38,7 +38,9 @@ class LRCLib:
artist: str = artist.strip().lower()
song: str = song.strip().lower()
logging.info("Searching %s - %s on %s",
artist, song, self.label)
artist, song, self.label)
input_track: str = f"{artist} - {song}"
returned_lyrics: str = ''
async with ClientSession() as client:
async with client.get(self.lrclib_url,
@@ -55,22 +57,35 @@ class LRCLib:
raise InvalidResponseException("Search response text was invalid (len < 100 chars.)")
search_data: dict|None = await request.json()
# logging.info("Search Data:\n%s", search_data)
if not isinstance(search_data, dict):
if not isinstance(search_data, list):
raise InvalidResponseException("Invalid JSON.")
if not isinstance(search_data['artistName'], str):
possible_matches = [(x, f"{result.get('artistName')} - {result.get('trackName')}")
for x, result in enumerate(search_data)]
best_match = self.matcher.find_best_match(input_track,
possible_matches)[0]
if not best_match:
return
best_match_id = best_match[0]
if not isinstance(search_data[best_match_id]['artistName'], str):
raise InvalidResponseException(f"Invalid JSON: Cannot find artistName key.\n{search_data}")
if not isinstance(search_data['trackName'], str):
if not isinstance(search_data[best_match_id]['trackName'], str):
raise InvalidResponseException(f"Invalid JSON: Cannot find trackName key.\n{search_data}")
if not isinstance(search_data[best_match_id]['plainLyrics'], str):
raise InvalidResponseException(f"Invalid JSON: Cannot find plainLyrics key.\n{search_data}")
returned_artist: str = search_data['artistName']
returned_song: str = search_data['trackName']
returned_lyrics: str = search_data['plainLyrics']
returned_artist: str = search_data[best_match_id]['artistName']
returned_song: str = search_data[best_match_id]['trackName']
returned_lyrics: str = search_data[best_match_id]['plainLyrics']
returned_lyrics = self.datautils.scrub_lyrics(returned_lyrics)
input_track: str = f"{artist} - {song}"
returned_track: str = f"{artist} - {song}"
returned_track: str = f"{returned_artist} - {returned_song}"
(_matched, confidence) = self.matcher.find_best_match(input_track=input_track,
candidate_tracks=[(0, returned_track)])
if not confidence: