Add cover art cache, more caching and optimization for metadata, global metadata search, fix some scaling issues, add example tracks for albums and artists, urls for artists, remove play button

utils/constants.py

@@ -9,6 +9,8 @@ discord_presence_id = 1368277020332523530
 audio_extensions = ["mp3", "m4a", "aac", "flac", "ogg", "opus", "wav"]
 view_modes = ["files", "playlist"]
 
+COVER_CACHE_DIR = "cover_cache"
+
 MUSICBRAINZ_PROJECT_NAME = "csd4ni3l/music-player"
 MUSCIBRAINZ_VERSION = "git"
 MUSICBRAINZ_CONTACT = "csd4ni3l@proton.me"

utils/online_metadata.py

@@ -1,13 +1,25 @@
 import musicbrainzngs as music_api
-from iso3166 import countries
 
-from utils.constants import MUSICBRAINZ_PROJECT_NAME, MUSICBRAINZ_CONTACT, MUSCIBRAINZ_VERSION
+from io import BytesIO
 
-import urllib.request, json, os, arcade
+from PIL import Image
 
-WORD_BLACKLIST = ["compilation", "remix", "vs", "cover"]
+from concurrent.futures import ThreadPoolExecutor, as_completed
+
+from urllib.request import urlopen, Request
+from urllib.error import URLError, HTTPError
+
+from utils.constants import MUSICBRAINZ_PROJECT_NAME, MUSICBRAINZ_CONTACT, MUSCIBRAINZ_VERSION, COVER_CACHE_DIR
+
+import urllib.request, json, os, arcade, logging, iso3166
+
+WORD_BLACKLIST = ["compilation", "remix", "vs", "cover", "version", "instrumental", "restrung", "interlude"]
 LRCLIB_BASE_URL = "https://lrclib.net/api/search"
 
+def get_country(code):
+    country = iso3166.countries.get(code, None)
+    return country.name if country else "Worldwide"
+
 def check_blacklist(text, blacklist):
     return any(word in text for word in blacklist)
 
@@ -20,27 +32,26 @@ def finalize_blacklist(title):
 
     return blacklist
 
-def is_release_valid(release_id):
-    try:
-        release_data = music_api.get_release_by_id(release_id, includes=["release-groups"])
-        rg = release_data.get("release", {}).get("release-group", {})
-        if rg.get("primary-type", "").lower() == "album":
-            return True
-    except music_api.ResponseError:
-        pass
-    return False
+def is_release_valid(release):
+    return release.get("release-event-count", 0) == 0 # only include albums
 
-def get_country(country_code):
-    try:
-        country = countries.get(country_code)
-    except KeyError:
-        country = None
+def ensure_metadata_file():
+    if os.path.exists("metadata_cache.json") and os.path.isfile("metadata_cache.json"):
+        with open("metadata_cache.json", "r") as file:
+            metadata_cache = json.load(file)
+    else:
+        metadata_cache = {
+            "query_results": {},
+            "recording_by_id": {},
+            "artist_by_id": {},
+            "lyrics_by_artist_title": {},
+            "album_by_id": {}
+        }
 
-    return country.name if country else None
+    return metadata_cache
 
 def get_artists_metadata(artist_ids):
-    with open("metadata_cache.json", "r") as file:
-        metadata_cache = json.load(file)
+    metadata_cache = ensure_metadata_file()
 
     artist_metadata = {}
 
@@ -50,11 +61,12 @@ def get_artists_metadata(artist_ids):
             name = data["name"]
             artist_metadata[name] = data
         else:
-            artist_data = music_api.get_artist_by_id(artist_id)["artist"]
+            artist_data = music_api.get_artist_by_id(artist_id, includes=["annotation", "releases", "url-rels"])["artist"]
 
-            artist_metadata[artist_data["name"]] = {
+            metadata = {
                 "name": artist_data["name"],
                 "musicbrainz_id": artist_id,
+                "example_tracks": [release["title"] for release in artist_data.get("release-list", [])[:3]],
                 "gender": artist_data.get("gender", "Unknown"),
                 "country": get_country(artist_data.get("country", "WZ")) or "Unknown",
                 "tag-list": [tag["name"] for tag in artist_data.get("tag_list", [])],
@@ -62,90 +74,114 @@ def get_artists_metadata(artist_ids):
                 "isni-list": artist_data.get("isni-list", []),
                 "born": artist_data.get("life-span", {}).get("begin", "Unknown"),
                 "dead": artist_data.get("life-span", {}).get("ended", "Unknown").lower() == "true",
-                "comment": artist_data.get("disambiguation", "None")
+                "comment": artist_data.get("disambiguation", "None"),
+                "urls": {}
             }
 
-            metadata_cache["artist_by_id"][artist_id] = artist_metadata[artist_data["name"]]
+            for url_data in artist_data.get("url-relation-list", []):
+                url_type = url_data.get("type", "").lower()
+                url_target = url_data.get("target", "")
+                if not url_type or not url_target or not url_type in ["youtube", "imdb", "viaf", "soundcloud", "wikidata", "last.fm", "lyrics", "official homepage"]:
+                    continue
+
+                if url_type in metadata["urls"]:
+                    metadata["urls"][url_type].append(url_target)
+                else:
+                    metadata["urls"][url_type] = [url_target]
+
+            artist_metadata[artist_data["name"]] = metadata
+            metadata_cache["artist_by_id"][artist_id] = metadata
     
     with open("metadata_cache.json", "w") as file:
         file.write(json.dumps(metadata_cache))
 
     return artist_metadata
 
-def get_albums_metadata(release_list):
-    with open("metadata_cache.json", "r") as file:
-        metadata_cache = json.load(file)
+def extract_release_metadata(release_list):
+    metadata_cache = ensure_metadata_file()
 
     album_metadata = {}
 
     for release in release_list:
+        if not isinstance(release, dict):
+            continue
+
         release_title = release.get("title", "").lower()
+        release_id = release["id"]
 
         if any(word in release_title for word in ["single", "ep", "maxi"]):
             continue
 
         if release.get("status") == "Official":
-            release_id = release["id"]
-            if release_id in metadata_cache["is_release_album_by_id"]:
-                if not metadata_cache["is_release_album_by_id"][release_id]:
-                    continue
+            if release_id in metadata_cache["album_by_id"]:
+                album_metadata[release_id] = metadata_cache["album_by_id"][release_id]
             else:
-                if not is_release_valid(release_id):
-                    metadata_cache["is_release_album_by_id"][release_id] = False
-                    continue
-            
-            metadata_cache["is_release_album_by_id"][release_id] = True
-            
-            album_metadata[release.get("title", "")] = {
-                "musicbrainz_id": release.get("id") if release else "Unknown",
-                "album_name": release.get("title") if release else "Unknown",
-                "album_date": release.get("date") if release else "Unknown",
-                "album_country": (get_country(release.get("country", "WZ")) or "Worldwide") if release else "Unknown",
-            }
+                album_metadata[release_id] = {
+                    "musicbrainz_id": release.get("id") if release else "Unknown",
+                    "album_name": release.get("title") if release else "Unknown",
+                    "album_date": release.get("date") if release else "Unknown",
+                    "album_country": (get_country(release.get("country", "WZ")) or "Worldwide") if release else "Unknown",
+                }
+                metadata_cache["album_by_id"][release_id] = album_metadata[release_id]
 
     with open("metadata_cache.json", "w") as file:
         file.write(json.dumps(metadata_cache))
 
     return album_metadata
 
-def get_music_metadata(artist, title):
-    if os.path.exists("metadata_cache.json") and os.path.isfile("metadata_cache.json"):
-        with open("metadata_cache.json", "r") as file:
-            metadata_cache = json.load(file)
+def get_album_metadata(album_id):
+    metadata_cache = ensure_metadata_file()
+
+    release = music_api.get_release_by_id(album_id, includes=["recordings"])["release"]
+
+    if album_id in metadata_cache["album_by_id"]:
+        album_metadata = metadata_cache["album_by_id"][release["id"]]
     else:
-        metadata_cache = {
-            "query_results": {},
-            "recording_by_id": {},
-            "artist_by_id": {},
-            "is_release_album_by_id": {},
-            "lyrics_by_id": {}
+        album_metadata = {
+            "musicbrainz_id": release.get("id") if release else "Unknown",
+            "album_name": release.get("title") if release else "Unknown",
+            "album_date": release.get("date") if release else "Unknown",
+            "album_country": (get_country(release.get("country", "WZ")) or "Worldwide") if release else "Unknown",
+            "album_tracks": [track['recording']['title'] for track in release.get('medium-list', [])[0].get('track-list', {})[:3]]
         }
+        metadata_cache["album_by_id"][release["id"]] = album_metadata
+
+    with open("metadata_cache.json", "w") as file:
+        file.write(json.dumps(metadata_cache))
+
+    return album_metadata
+
+def get_music_metadata(artist=None, title=None, musicbrainz_id=None):
+    metadata_cache = ensure_metadata_file()
 
     music_api.set_useragent(MUSICBRAINZ_PROJECT_NAME, MUSCIBRAINZ_VERSION, MUSICBRAINZ_CONTACT)
 
-    if artist:
-        query = f"{artist} - {title}"
+    if not musicbrainz_id:
+        if artist:
+            query = f"{artist} - {title}"
+        else:
+            query = title
+
+        if query in metadata_cache["query_results"]:
+            recording_id = metadata_cache["query_results"][query]
+        else:
+            results = music_api.search_recordings(query=query, limit=100)["recording-list"]
+
+            finalized_blacklist = finalize_blacklist(title)            
+
+            for r in results:
+                if not r.get("title") or not r.get("isrc-list"):
+                    continue
+
+                if check_blacklist(r["title"].lower(), finalized_blacklist) or check_blacklist(r.get("disambiguation", "").lower(), finalized_blacklist):
+                    continue
+                
+                recording_id = r["id"]
+                break
+
+            metadata_cache["query_results"][query] = recording_id
     else:
-        query = title
-
-    if query in metadata_cache["query_results"]:
-        recording_id = metadata_cache["query_results"][query]
-    else:
-        results = music_api.search_recordings(query=title, limit=100)["recording-list"]
-
-        finalized_blacklist = finalize_blacklist(title)
-
-        for r in results:
-            if not r.get("title") or not r.get("isrc-list"):
-                continue
-
-            if check_blacklist(r["title"].lower(), finalized_blacklist) or check_blacklist(r.get("disambiguation", "").lower(), finalized_blacklist):
-                continue
-
-            recording_id = r["id"]
-            break
-
-        metadata_cache["query_results"][query] = recording_id
+        recording_id = musicbrainz_id
 
     if recording_id in metadata_cache["recording_by_id"]:
         detailed = metadata_cache["recording_by_id"][recording_id]
@@ -155,27 +191,21 @@ def get_music_metadata(artist, title):
             includes=["artists", "releases", "isrcs", "tags", "ratings"]
         )["recording"]
         metadata_cache["recording_by_id"][recording_id] = {
+            "title": detailed["title"],
             "artist-credit": [{"artist": {"id": artist_data["artist"]["id"]}} for artist_data in detailed.get("artist-credit", {}) if isinstance(artist_data, dict)],
             "isrc-list":  detailed["isrc-list"] if "isrc-list" in detailed else [],
             "rating": {"rating": detailed["rating"]["rating"]} if "rating" in detailed else {},
             "tags": detailed.get("tag-list", []),
-            "release-list": [{"id": release["id"], "title": release["title"], "status": release.get("status"), "date": release.get("date"), "country": release.get("country", "WZ")} for release in detailed["release-list"]] if "release-list" in detailed else []
+            "release-list": [{"id": release["id"], "title": release["title"], "status": release.get("status"), "date": release.get("date"), "country": release.get("country", "WZ")} for release in detailed["release-list"]] if "release-list" in detailed else [],
+            "release-event-count": detailed.get("release-event-count", 0)
         }
 
-    metadata_cache["lyrics_by_id"] = metadata_cache.get("lyrics_by_id", {})
-
-    if recording_id in metadata_cache["lyrics_by_id"]:
-        lyrics = metadata_cache["lyrics_by_id"][recording_id]
-    else:
-        lyrics = get_lyrics(artist, title)
-        metadata_cache["lyrics_by_id"][recording_id] = lyrics
-
     with open("metadata_cache.json", "w") as file:
         file.write(json.dumps(metadata_cache))
 
     artist_ids = [artist_data["artist"]["id"] for artist_data in detailed.get("artist-credit", {}) if isinstance(artist_data, dict)] # isinstance is needed, because sometimes & is included as an artist str
     artist_metadata = get_artists_metadata(artist_ids)
-    album_metadata = get_albums_metadata(detailed.get("release-list", []))
+    album_metadata = extract_release_metadata(detailed.get("release-list", []))
 
     music_metadata = {
         "musicbrainz_id": recording_id,
@@ -183,39 +213,115 @@ def get_music_metadata(artist, title):
         "musicbrainz_rating": detailed["rating"]["rating"] if "rating" in detailed.get("rating", {}) else "Unknown",
         "tags": [tag["name"] for tag in detailed.get("tag-list", [])]
     }
-
-    return music_metadata, artist_metadata, album_metadata, lyrics
+    return music_metadata, artist_metadata, album_metadata, get_lyrics(', '.join([artist for artist in artist_metadata]), detailed["title"])[0]
 
 def get_lyrics(artist, title):
-    if artist:
-        query = f"{artist} - {title}"
-    else:
-        query = title
-    
-    query_string = urllib.parse.urlencode({"q": query})
-    full_url = f"{LRCLIB_BASE_URL}?{query_string}"
+    metadata_cache = ensure_metadata_file()
 
-    with urllib.request.urlopen(full_url) as request:
-        data = json.loads(request.read().decode("utf-8"))
+    if (artist, title) in metadata_cache["lyrics_by_artist_title"]:
+        return metadata_cache["lyrics_by_artist_title"][(artist, title)]
+    else:
+        if artist:
+            query = f"{artist} - {title}"
+        else:
+            query = title
     
-    for result in data:
-        if result.get("plainLyrics"):
-            return result["plainLyrics"]
+        query_string = urllib.parse.urlencode({"q": query})
+        full_url = f"{LRCLIB_BASE_URL}?{query_string}"
+
+        with urllib.request.urlopen(full_url) as request:
+            data = json.loads(request.read().decode("utf-8"))
+    
+        for result in data:
+            if result.get("plainLyrics") and result.get("syncedLyrics"):
+                metadata_cache["lyrics_by_artist_title"][(artist, title)] = (result["plainLyrics"], result["syncedLyrics"])
+                return (result["plainLyrics"], result["syncedLyrics"])
         
+    with open("metadata_cache.json", "w") as file:
+        file.write(json.dumps(metadata_cache))
+
     if artist: # if there was an artist, it might have been misleading. For example, on Youtube, the uploader might not be the artist. We retry with only title.
         return get_lyrics(None, title)
 
-def get_album_cover_art(musicbrainz_album_id):
+def fetch_image_bytes(url):
     try:
-        cover_art_bytes = music_api.get_image_front(musicbrainz_album_id, 250)
-    except music_api.ResponseError:
+        req = Request(url, headers={"User-Agent": "csd4ni3l/music-player/git python-musicbrainzngs/0.7.1 ( csd4ni3l@proton.me )"})
+        with urlopen(req, timeout=10) as resp:
+            return resp.read()
+    except (HTTPError, URLError) as e:
+        logging.debug(f"Error fetching {url}: {e}")
         return None
 
-    with open("music_cover_art.jpg", "wb") as file:
-        file.write(cover_art_bytes)
+def download_cover_art(mb_album_id, size=250):
+    path = os.path.join(COVER_CACHE_DIR, f"{mb_album_id}_{size}.png")
+    if os.path.exists(path):
+        return mb_album_id, Image.open(path)
+
+    url = f"https://coverartarchive.org/release/{mb_album_id}/front-{size}"
+    img_bytes = fetch_image_bytes(url)
+    if not img_bytes:
+        return mb_album_id, None
+
+    try:
+        img = Image.open(BytesIO(img_bytes)).convert("RGBA")
+        img.save(path)
+        return mb_album_id, img
+    except Exception as e:
+        logging.debug(f"Failed to decode/save image for {mb_album_id}: {e}")
+        return mb_album_id, None
+
+def download_albums_cover_art(album_ids, size=250, max_workers=5):
+    music_api.set_useragent(MUSICBRAINZ_PROJECT_NAME, MUSCIBRAINZ_VERSION, MUSICBRAINZ_CONTACT)
+    os.makedirs(COVER_CACHE_DIR, exist_ok=True)
+    images = {}
+    with ThreadPoolExecutor(max_workers=max_workers) as executor:
+        futures = [executor.submit(download_cover_art, album_id, size) for album_id in album_ids]
+        for future in as_completed(futures):
+            album_id, img = future.result()
+            images[album_id] = arcade.Texture(img) if img else None
+    return images
+
+def search_recordings(search_term):
+    music_api.set_useragent(MUSICBRAINZ_PROJECT_NAME, MUSCIBRAINZ_VERSION, MUSICBRAINZ_CONTACT)
+    results = music_api.search_recordings(query=search_term, limit=100)["recording-list"]
+
+    finalized_blacklist = finalize_blacklist(search_term)
+
+    output_list = []
+
+    for r in results:
+        if not r.get("title") or not r.get("isrc-list"):
+            continue
+
+        if check_blacklist(r["title"].lower(), finalized_blacklist) or check_blacklist(r.get("disambiguation", "").lower(), finalized_blacklist):
+            continue
+        
+        artist_str = ", ".join([artist["name"] for artist in r["artist-credit"] if isinstance(artist, dict)])
+        output_list.append((artist_str, r["title"], r["id"]))
+
+    return output_list
+
+def search_artists(search_term):
+    music_api.set_useragent(MUSICBRAINZ_PROJECT_NAME, MUSCIBRAINZ_VERSION, MUSICBRAINZ_CONTACT)
     
-    texture = arcade.load_texture("music_cover_art.jpg")
+    results = music_api.search_artists(query=search_term)
 
-    os.remove("music_cover_art.jpg")
+    output_list = []
 
-    return texture
+    for r in results["artist-list"]:
+        output_list.append((r["name"], r["id"]))
+
+    return output_list
+
+def search_albums(search_term):
+    music_api.set_useragent(MUSICBRAINZ_PROJECT_NAME, MUSCIBRAINZ_VERSION, MUSICBRAINZ_CONTACT)
+
+    results = music_api.search_releases(search_term)
+
+    output_list = []
+
+    for r in results["release-list"]:
+        artist_str = ", ".join([artist["name"] for artist in r["artist-credit"] if isinstance(artist, dict)])
+        output_list.append((artist_str, r["title"], r["id"]))
+
+    return output_list

utils/preload.py

@@ -15,7 +15,10 @@ forward_icon = arcade.load_texture("assets/graphics/forward.png")
 backwards_icon = arcade.load_texture("assets/graphics/backwards.png")
 volume_icon = arcade.load_texture("assets/graphics/volume.png")
 
+person_icon = arcade.load_texture("assets/graphics/person.png")
+music_icon = arcade.load_texture("assets/graphics/music.png")
+
+global_search_icon = arcade.load_texture("assets/graphics/global_search.png")
 settings_icon = arcade.load_texture("assets/graphics/settings.png")
 download_icon = arcade.load_texture("assets/graphics/download.png")
 metadata_icon = arcade.load_texture("assets/graphics/metadata.png")
-music_icon = arcade.load_texture("assets/graphics/music.png")

utils/utils.py

@@ -1,9 +1,6 @@
-import logging, sys, traceback
+import logging, sys, traceback, pyglet, arcade, arcade.gui, textwrap
 
 from utils.constants import menu_background_color
-from utils.preload import resume_icon, music_icon
-
-import pyglet, arcade, arcade.gui
 
 from arcade.gui.experimental.scroll_area import UIScrollArea
 
@@ -100,22 +97,21 @@ class MouseAwareScrollArea(UIScrollArea):
 
         return super().on_event(event)
     
-class MusicItem(arcade.gui.UIBoxLayout):
-    def __init__(self, metadata: dict, width: int, height: int, padding=10):
+class Card(arcade.gui.UIBoxLayout):
+    def __init__(self, thumbnail, line_1: str, line_2: str, width: int, height: int, padding=10):
         super().__init__(width=width, height=height, space_between=padding, align="top")
 
-        self.metadata = metadata
-        if metadata:
-            self.button = self.add(arcade.gui.UITextureButton(
-                texture=metadata["thumbnail"],
-                texture_hovered=metadata["thumbnail"],
-                width=width / 1.25,
-                height=height * 0.5,
-                interaction_buttons=[arcade.MOUSE_BUTTON_LEFT, arcade.MOUSE_BUTTON_RIGHT]
-            ))
+        self.button = self.add(arcade.gui.UITextureButton(
+            texture=thumbnail,
+            texture_hovered=thumbnail,
+            width=width / 2.5,
+            height=height / 2.5,
+            interaction_buttons=[arcade.MOUSE_BUTTON_LEFT, arcade.MOUSE_BUTTON_RIGHT]
+        ))
 
-            self.title_label = self.add(arcade.gui.UILabel(
-                text=metadata["title"],
+        if line_1:
+            self.line_1_label = self.add(arcade.gui.UILabel(
+                text=line_1,
                 font_name="Roboto",
                 font_size=14,
                 width=width,
@@ -123,8 +119,9 @@ class MusicItem(arcade.gui.UIBoxLayout):
                 multiline=True
             ))
 
-            self.artist_label = self.add(arcade.gui.UILabel(
-                text=metadata["artist"],
+        if line_2:
+            self.line_2_label = self.add(arcade.gui.UILabel(
+                text=line_2,
                 font_name="Roboto",
                 font_size=12,
                 width=width,
@@ -133,54 +130,24 @@ class MusicItem(arcade.gui.UIBoxLayout):
                 text_color=arcade.color.GRAY
             ))
 
-            self.play_button = self.add(arcade.gui.UITextureButton(
-                texture=resume_icon,
-                texture_hovered=resume_icon,
-                width=width / 10,
-                height=height / 5,
-                interaction_buttons=[arcade.MOUSE_BUTTON_LEFT, arcade.MOUSE_BUTTON_RIGHT]
-            ))
-            self.play_button.visible = False
-
-        else:
-            self.button = self.add(arcade.gui.UITextureButton(
-                texture=music_icon,
-                texture_hovered=music_icon,
-                width=width / 1.25,
-                height=height * 0.5,
-            ))
-
-            self.add_music_label = self.add(arcade.gui.UILabel(
-                text="Add Music",
-                font_name="Roboto",
-                font_size=14,
-                width=width,
-                height=height * 0.5,
-                multiline=True
-            ))
-
     def on_event(self, event: arcade.gui.UIEvent):
-        if self.metadata:
-            if isinstance(event, UIMouseOutOfAreaEvent):
+        if isinstance(event, UIMouseOutOfAreaEvent):
+            # not hovering
+            self.with_background(color=arcade.color.TRANSPARENT_BLACK)
+            self.trigger_full_render()
+
+        elif isinstance(event, arcade.gui.UIMouseMovementEvent):
+            if self.rect.point_in_rect(event.pos):
+                # hovering
+                self.with_background(color=arcade.color.DARK_GRAY)
+                self.trigger_full_render()
+            else:
                 # not hovering
                 self.with_background(color=arcade.color.TRANSPARENT_BLACK)
-                self.play_button.visible = False
                 self.trigger_full_render()
 
-            elif isinstance(event, arcade.gui.UIMouseMovementEvent):
-                if self.rect.point_in_rect(event.pos):
-                    # hovering
-                    self.with_background(color=arcade.color.DARK_GRAY)
-                    self.play_button.visible = True
-                    self.trigger_full_render()
-                else:
-                    # not hovering
-                    self.with_background(color=arcade.color.TRANSPARENT_BLACK)
-                    self.play_button.visible = False
-                    self.trigger_full_render()
-
-            elif isinstance(event, arcade.gui.UIMousePressEvent) and self.rect.point_in_rect(event.pos):
-                self.button.on_click(event)
+        elif isinstance(event, arcade.gui.UIMousePressEvent) and self.rect.point_in_rect(event.pos):
+            self.button.on_click(event)
 
         return super().on_event(event)
 
@@ -219,4 +186,14 @@ def convert_seconds_to_date(seconds):
     if seconds > 0 or not any([days, hours, minutes]):
         result += "{} seconds".format(int(seconds))
 
-    return result.strip()
+    return result.strip()
+
+def get_wordwrapped_text(text, width=18):
+    if len(text) < width:
+        output_text = text.center(width)
+    elif len(text) == width:
+        output_text = text
+    else:
+        output_text = '\n'.join(textwrap.wrap(text, width=width))
+
+    return output_text