reparations
This commit is contained in:
parent
d7fef03f1b
commit
bfe09e8afc
@ -50,7 +50,7 @@ class Cache:
|
|||||||
artist=row['artist'],
|
artist=row['artist'],
|
||||||
song=row['song'],
|
song=row['song'],
|
||||||
lyrics=row['lyrics'],
|
lyrics=row['lyrics'],
|
||||||
src=f"{row['src']} (redis cache, id: {row['id']})",
|
src=f"{row['src']} (redis cache, id: {key})",
|
||||||
confidence=row['confidence']
|
confidence=row['confidence']
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
@ -171,18 +171,18 @@ class Cache:
|
|||||||
else:
|
else:
|
||||||
best_match = (result_tracks[0], 100)
|
best_match = (result_tracks[0], 100)
|
||||||
|
|
||||||
if not best_match:
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
if best_match:
|
||||||
(candidate, confidence) = best_match
|
(candidate, confidence) = best_match
|
||||||
matched = self.get_matched(redis_results=redis_result, matched_candidate=candidate,
|
matched = self.get_matched(redis_results=redis_result, matched_candidate=candidate,
|
||||||
confidence=confidence)
|
confidence=confidence)
|
||||||
|
|
||||||
|
if matched:
|
||||||
time_end: float = time.time()
|
time_end: float = time.time()
|
||||||
time_diff: float = time_end - time_start
|
time_diff: float = time_end - time_start
|
||||||
matched.confidence = confidence
|
matched.confidence = confidence
|
||||||
matched.time = time_diff
|
matched.time = time_diff
|
||||||
|
|
||||||
if matched:
|
|
||||||
logging.info("Found %s on redis cache, skipping SQLite...",
|
logging.info("Found %s on redis cache, skipping SQLite...",
|
||||||
f"{artist} - {song}")
|
f"{artist} - {song}")
|
||||||
return matched
|
return matched
|
||||||
|
@ -65,12 +65,16 @@ class RedisCache:
|
|||||||
search_res = await self.redis_client.ft().search(
|
search_res = await self.redis_client.ft().search(
|
||||||
Query(f"@artist:{artist} @song:{song}"
|
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]
|
for result in search_res.docs]
|
||||||
else:
|
else:
|
||||||
random_redis_key = await self.redis_client.randomkey()
|
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 = 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
|
return search_res_out
|
||||||
except:
|
except:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user