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

0

Browse Source
This commit is contained in:
codey
2025-01-14 14:17:18 -05:00
parent d782451104
commit 06581c1fce
4 changed files with 56 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lyric_search_new/sources/lrclib.py
View File

@@ -5,6 +5,7 @@ import sys
sys.path.insert(1,'..')
import traceback
import logging
from typing import Optional
from aiohttp import ClientTimeout, ClientSession
from lyric_search_new import utils
from lyric_search_new.constructors import LyricsResult
@@ -21,24 +22,24 @@ class InvalidResponseException(Exception):
class LRCLib:
"""LRCLib Search Module"""
def __init__(self):
self.label = "LRCLib"
self.lrclib_url = "https://lrclib.net/api/get"
self.headers = common.SCRAPE_HEADERS
self.label: str = "LRCLib"
self.lrclib_url: str = "https://lrclib.net/api/get"
self.headers: dict = common.SCRAPE_HEADERS
self.timeout = ClientTimeout(connect=2, sock_read=4)
self.datautils = utils.DataUtils()
self.matcher = utils.TrackMatcher()
async def search(self, artist: str, song: str):
async def search(self, artist: str, song: str) -> Optional[LyricsResult]:
"""
@artist: the artist to search
@song: the song to search
"""
try:
artist = artist.strip().lower()
song = song.strip().lower()
artist: str = artist.strip().lower()
song: str = song.strip().lower()
logging.info("Searching %s - %s on %s",
artist, song, self.label)
returned_lyrics = ''
returned_lyrics: str = ''
async with ClientSession() as client:
async with client.get(self.lrclib_url,
params = {
@@ -48,12 +49,12 @@ class LRCLib:
timeout=self.timeout,
headers=self.headers) as request:
request.raise_for_status()
text = await request.text()
text: str|None = await request.text()
if len(text) < 100:
raise InvalidResponseException("Search response text was invalid (len < 100 chars.)")
search_data = await request.json()
search_data: dict|None = await request.json()
if not isinstance(search_data, dict):
raise InvalidResponseException("Invalid JSON.")
@@ -64,12 +65,12 @@ class LRCLib:
if not isinstance(search_data['trackName'], str):
raise InvalidResponseException(f"Invalid JSON: Cannot find trackName key.\n{search_data}")
returned_artist = search_data['artistName']
returned_song = search_data['trackName']
returned_lyrics = search_data['plainLyrics']
returned_artist: str = search_data['artistName']
returned_song: str = search_data['trackName']
returned_lyrics: str = search_data['plainLyrics']
returned_lyrics = self.datautils.scrub_lyrics(returned_lyrics)
input_track = f"{artist} - {song}"
returned_track = f"{artist} - {song}"
input_track: str = f"{artist} - {song}"
returned_track: str = f"{artist} - {song}"
(_matched, confidence) = self.matcher.find_best_match(input_track=input_track,
candidate_tracks=[(0, returned_track)])
if not confidence: