From bfe09e8afc9b94b8ce7eb2eb576b44ead3152bd1 Mon Sep 17 00:00:00 2001
From: codey <codey@code.ee>
Date: Sat, 18 Jan 2025 14:46:05 -0500
Subject: [PATCH] reparations

---
 lyric_search_new/sources/cache.py       | 26 ++++++++++++-------------
 lyric_search_new/sources/redis_cache.py |  8 ++++++--
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/lyric_search_new/sources/cache.py b/lyric_search_new/sources/cache.py
index 5bca79c..c550107 100644
--- a/lyric_search_new/sources/cache.py
+++ b/lyric_search_new/sources/cache.py
@@ -50,7 +50,7 @@ class Cache:
                         artist=row['artist'],
                         song=row['song'],
                         lyrics=row['lyrics'],
-                        src=f"{row['src']} (redis cache, id: {row['id']})",
+                        src=f"{row['src']} (redis cache, id: {key})",
                         confidence=row['confidence']
                     )
         else:
@@ -171,21 +171,21 @@ class Cache:
                 else:
                     best_match = (result_tracks[0], 100)
                 
-                if not best_match:
-                    return None
                 
-                (candidate, confidence) = best_match
-                matched = self.get_matched(redis_results=redis_result, matched_candidate=candidate,
+                if best_match:
+                    (candidate, confidence) = best_match
+                    matched = self.get_matched(redis_results=redis_result, matched_candidate=candidate,
                                           confidence=confidence)                  
-                time_end: float = time.time()
-                time_diff: float = time_end - time_start
-                matched.confidence = confidence
-                matched.time = time_diff
+                
+                    if matched:
+                        time_end: float = time.time()
+                        time_diff: float = time_end - time_start
+                        matched.confidence = confidence
+                        matched.time = time_diff
 
-                if matched:
-                    logging.info("Found %s on redis cache, skipping SQLite...",
-                             f"{artist} - {song}")                  
-                    return matched
+                        logging.info("Found %s on redis cache, skipping SQLite...",
+                                    f"{artist} - {song}")                  
+                        return matched
             
             """SQLite: Fallback"""
                                    
diff --git a/lyric_search_new/sources/redis_cache.py b/lyric_search_new/sources/redis_cache.py
index 63e868e..3994ff8 100644
--- a/lyric_search_new/sources/redis_cache.py
+++ b/lyric_search_new/sources/redis_cache.py
@@ -65,12 +65,16 @@ class RedisCache:
                 search_res = await self.redis_client.ft().search(
                     Query(f"@artist:{artist} @song:{song}"
                           )) 
-                search_res_out = [(result['id'], dict(json.loads(result['json'])))
+                search_res_out = [(result['id'].split(":",
+                                                      maxsplit=1)[1][:-1], dict(json.loads(result['json'])))
                                   for result in search_res.docs]
             else:
                 random_redis_key = await self.redis_client.randomkey()
+                out_id = str(random_redis_key).split(":",
+                                                     maxsplit=1)[1][:-1]
                 search_res = await self.redis_client.json().get(random_redis_key)
-                search_res_out = [(random_redis_key, search_res)]
+                search_res_out = [(out_id, search_res)]
+
             
             return search_res_out
         except: