00dani/mpd-now-playable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cache 'no artwork', rather than repeatedly populating the cache with None

Browse source
This commit is contained in:
Danielle McLean 2024-05-09 12:12:54 +10:00
parent f7fc453c50
commit 1caf4a184c
Signed by: 00dani
GPG key ID: 6854781A0488421C
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/mpd_now_playable/mpd/artwork_cache.py
View file

@ -1,3 +1,5 @@
from dataclasses import dataclass
from aiocache import Cache from aiocache import Cache
from ..async_tools import run_background_task from ..async_tools import run_background_task
@ -6,6 +8,25 @@ from .types import CurrentSongResponse, MpdStateHandler
CACHE_TTL = 60 * 10 # ten minutes CACHE_TTL = 60 * 10 # ten minutes
@dataclass(frozen=True)
class HasArt:
data: bytes
@dataclass(frozen=True)
class HasNoArt:
data = None
ArtCacheEntry = HasArt | HasNoArt
def make_cache_entry(art: bytes | None) -> ArtCacheEntry:
if art is None:
return HasNoArt()
return HasArt(art)
def calc_album_key(song: CurrentSongResponse) -> str: def calc_album_key(song: CurrentSongResponse) -> str:
artist = song.get("albumartist", song.get("artist", "Unknown Artist")) artist = song.get("albumartist", song.get("artist", "Unknown Artist"))
album = song.get("album", "Unknown Album") album = song.get("album", "Unknown Album")
@ -18,8 +39,8 @@ def calc_track_key(song: CurrentSongResponse) -> str:
class MpdArtworkCache: class MpdArtworkCache:
mpd: MpdStateHandler mpd: MpdStateHandler
album_cache: "Cache[bytes | None]" album_cache: "Cache[ArtCacheEntry]"
track_cache: "Cache[bytes | None]" track_cache: "Cache[ArtCacheEntry]"
def __init__(self, mpd: MpdStateHandler): def __init__(self, mpd: MpdStateHandler):
self.mpd = mpd self.mpd = mpd
@ -29,7 +50,7 @@ class MpdArtworkCache:
async def get_cached_artwork(self, song: CurrentSongResponse) -> bytes | None: async def get_cached_artwork(self, song: CurrentSongResponse) -> bytes | None:
art = await self.track_cache.get(calc_track_key(song)) art = await self.track_cache.get(calc_track_key(song))
if art: if art:
return art return art.data
# If we don't have track artwork cached, go find some. # If we don't have track artwork cached, go find some.
run_background_task(self.cache_artwork(song)) run_background_task(self.cache_artwork(song))
@ -37,12 +58,12 @@ class MpdArtworkCache:
# Even if we don't have cached track art, we can try looking for cached album art. # Even if we don't have cached track art, we can try looking for cached album art.
art = await self.album_cache.get(calc_album_key(song)) art = await self.album_cache.get(calc_album_key(song))
if art: if art:
return art return art.data
return None return None
async def cache_artwork(self, song: CurrentSongResponse) -> None: async def cache_artwork(self, song: CurrentSongResponse) -> None:
art = await self.mpd.readpicture(song["file"]) art = make_cache_entry(await self.mpd.readpicture(song["file"]))
try: try:
await self.album_cache.add(calc_album_key(song), art, ttl=CACHE_TTL) await self.album_cache.add(calc_album_key(song), art, ttl=CACHE_TTL)
except ValueError: except ValueError: