various/stale

lyric_search/models.py

@@ -99,9 +99,7 @@ POSTGRES_PASSWORD = os.getenv("POSTGRES_PASSWORD", "")
 # URL-encode the password to handle special characters
 encoded_password = urllib.parse.quote_plus(POSTGRES_PASSWORD)
 
-DATABASE_URL: str = (
-    f"postgresql+asyncpg://{POSTGRES_USER}:{encoded_password}@{POSTGRES_HOST}:{POSTGRES_PORT}/{POSTGRES_DB}"
-)
+DATABASE_URL: str = f"postgresql+asyncpg://{POSTGRES_USER}:{encoded_password}@{POSTGRES_HOST}:{POSTGRES_PORT}/{POSTGRES_DB}"
 async_engine: AsyncEngine = create_async_engine(
     DATABASE_URL, pool_size=20, max_overflow=10, pool_pre_ping=True, echo=False
 )

lyric_search/sources/cache.py

@@ -91,10 +91,8 @@ class Cache:
         logging.debug(
             "Checking whether %s is already stored", artistsong.replace("\n", " - ")
         )
-        check_query: str = (
-            'SELECT id, artist, song FROM lyrics  WHERE editdist3((lower(artist) || " " || lower(song)), (? || " " || ?))\
+        check_query: str = 'SELECT id, artist, song FROM lyrics  WHERE editdist3((lower(artist) || " " || lower(song)), (? || " " || ?))\
                         <= 410 ORDER BY editdist3((lower(artist) || " " || lower(song)), ?) ASC LIMIT 1'
-        )
         artistsong_split = artistsong.split("\n", maxsplit=1)
         artist = artistsong_split[0].lower()
         song = artistsong_split[1].lower()
@@ -215,8 +213,10 @@ class Cache:
             lyrics = regex.sub(r"(<br>|\n|\r\n)", " / ", lyr_result.lyrics.strip())
             lyrics = regex.sub(r"\s{2,}", " ", lyrics)
 
-            insert_query = "INSERT INTO lyrics (src, date_retrieved, artist, song, artistsong, confidence, lyrics)\
+            insert_query = (
+                "INSERT INTO lyrics (src, date_retrieved, artist, song, artistsong, confidence, lyrics)\
                 VALUES(?, ?, ?, ?, ?, ?, ?)"
+            )
             params = (
                 lyr_result.src,
                 time.time(),
@@ -260,10 +260,8 @@ class Cache:
 
             if artist == "!" and song == "!":
                 random_search = True
-                search_query: str = (
-                    "SELECT id, artist, song, lyrics, src, confidence\
+                search_query: str = "SELECT id, artist, song, lyrics, src, confidence\
                 FROM lyrics ORDER BY RANDOM() LIMIT 1"
-                )
 
             logging.info("Searching %s - %s on %s", artist, song, self.label)
 
@@ -322,11 +320,9 @@ class Cache:
                     self.cache_pre_query
                 ) as _db_cursor:
                     if not random_search:
-                        search_query: str = (
-                            'SELECT id, artist, song, lyrics, src, confidence FROM lyrics\
+                        search_query: str = 'SELECT id, artist, song, lyrics, src, confidence FROM lyrics\
                         WHERE editdist3((lower(artist) || " " || lower(song)), (? || " " || ?))\
                         <= 410 ORDER BY editdist3((lower(artist) || " " || lower(song)), ?) ASC LIMIT 10'
-                        )
                         search_params: tuple = (
                             artist.strip(),
                             song.strip(),

lyric_search/sources/lrclib.py

@@ -5,7 +5,7 @@ from sqlalchemy.future import select
 from lyric_search import utils
 from lyric_search.constructors import LyricsResult
 from lyric_search.models import Tracks, Lyrics, AsyncSessionLocal
-from . import redis_cache
+from . import redis_cache, cache
 
 logger = logging.getLogger()
 log_level = logging.getLevelName(logger.level)
@@ -19,6 +19,7 @@ class LRCLib:
         self.datautils = utils.DataUtils()
         self.matcher = utils.TrackMatcher()
         self.redis_cache = redis_cache.RedisCache()
+        self.cache = cache.Cache()
 
     async def search(
         self,
@@ -152,6 +153,9 @@ class LRCLib:
                 )
 
                 await self.redis_cache.increment_found_count(self.label)
+                # Store plain lyrics to Redis cache (like Genius does)
+                if plain:
+                    await self.cache.store(matched)
                 return matched
 
         except Exception as e:

lyric_search/utils.py

@@ -111,8 +111,9 @@ class DataUtils:
     """
 
     def __init__(self) -> None:
-        self.lrc_regex = regex.compile(  # capture mm:ss and optional .xxx, then the lyric text
-            r"""
+        self.lrc_regex = (
+            regex.compile(  # capture mm:ss and optional .xxx, then the lyric text
+                r"""
             \[                 # literal “[”
             (                # 1st (and only) capture group:
                 [0-9]{2}       #   two-digit minutes
@@ -123,7 +124,8 @@ class DataUtils:
             \s*                # optional whitespace
             (.*)               # capture the rest of the line as words
             """,
-            regex.VERBOSE,
+                regex.VERBOSE,
+            )
         )
         self.scrub_regex_1: Pattern = regex.compile(r"(\[.*?\])(\s){0,}(\:){0,1}")
         self.scrub_regex_2: Pattern = regex.compile(