From 12e35de8d96932a4fc7c0e8df5cec7fb89ff125b Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Sat, 7 Feb 2026 12:07:50 -0700 Subject: [PATCH] refactor: Use Subsonic getSong API to fetch song details Co-authored-by: aider (gemini/gemini-2.5-pro) --- main.py | 50 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/main.py b/main.py index fa69fce..4d03f5c 100644 --- a/main.py +++ b/main.py @@ -48,26 +48,55 @@ def parse_log_line(line): async def navidrome_get_song_details(song_id): """ - Gets song details from Navidrome's inspect API. + Gets song details from Navidrome's Subsonic API. """ navidrome_url = settings.NAVIDROME_URL - if not navidrome_url: - logging.error("NAVIDROME_URL must be set in settings.py.") + username = settings.NAVIDROME_USER + + if not all([navidrome_url, username]): + logging.error("NAVIDROME_URL and NAVIDROME_USER must be set in settings.py.") return None - api_url = f"{navidrome_url.rstrip('/')}/api/inspect" - params = {'id': song_id} + salt = settings.SUBSONIC_SALT + token = settings.SUBSONIC_TOKEN + + if not all([salt, token]): + password = settings.NAVIDROME_PASSWORD + if not password: + logging.error("Either (SUBSONIC_SALT and SUBSONIC_TOKEN) or NAVIDROME_PASSWORD must be set in settings.py.") + return None + + # Subsonic API requires a salt and a token (md5(password + salt)) + salt = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(10)) + token = hashlib.md5((password + salt).encode('utf-8')).hexdigest() + + params = { + 'u': username, + 't': token, + 's': salt, + 'v': '1.16.1', + 'c': 'heart-monitor', + 'f': 'json', + 'id': song_id, + } + + api_url = f"{navidrome_url.rstrip('/')}/rest/getSong" try: async with aiohttp.ClientSession() as session: async with session.get(api_url, params=params) as response: response.raise_for_status() data = await response.json() - return data except aiohttp.ClientError as e: - logging.error(f"Error calling Navidrome inspect API for song {song_id}: {e}") + logging.error(f"Error calling Navidrome getSong API for song {song_id}: {e}") return None + if data.get('subsonic-response', {}).get('status') != 'ok': + logging.error(f"Failed to get song details for song {song_id}. Response: {data}") + return None + + return data.get('subsonic-response', {}).get('song') + async def navidrome_set_rating(song_id): navidrome_url = settings.NAVIDROME_URL @@ -121,10 +150,9 @@ async def navidrome_set_rating(song_id): logging.info(f"Successfully set rating for song {song_id} to 1, but couldn't get song details.") return - raw_tags = details.get('rawTags', {}) - title = raw_tags.get('title', ['Unknown Title'])[0] - artist = raw_tags.get('artist', ['Unknown Artist'])[0] - album = raw_tags.get('album', ['Unknown Album'])[0] + title = details.get('title', 'Unknown Title') + artist = details.get('artist', 'Unknown Artist') + album = details.get('album', 'Unknown Album') logging.info(f'Set song "{title}" - {artist} ({album}) rating to 1.')