refactor: Use Subsonic getSong API to fetch song details
Co-authored-by: aider (gemini/gemini-2.5-pro) <aider@aider.chat>
This commit is contained in:
50
main.py
50
main.py
@@ -48,26 +48,55 @@ def parse_log_line(line):
|
|||||||
|
|
||||||
async def navidrome_get_song_details(song_id):
|
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
|
navidrome_url = settings.NAVIDROME_URL
|
||||||
if not navidrome_url:
|
username = settings.NAVIDROME_USER
|
||||||
logging.error("NAVIDROME_URL must be set in settings.py.")
|
|
||||||
|
if not all([navidrome_url, username]):
|
||||||
|
logging.error("NAVIDROME_URL and NAVIDROME_USER must be set in settings.py.")
|
||||||
return None
|
return None
|
||||||
|
|
||||||
api_url = f"{navidrome_url.rstrip('/')}/api/inspect"
|
salt = settings.SUBSONIC_SALT
|
||||||
params = {'id': song_id}
|
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:
|
try:
|
||||||
async with aiohttp.ClientSession() as session:
|
async with aiohttp.ClientSession() as session:
|
||||||
async with session.get(api_url, params=params) as response:
|
async with session.get(api_url, params=params) as response:
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
data = await response.json()
|
data = await response.json()
|
||||||
return data
|
|
||||||
except aiohttp.ClientError as e:
|
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
|
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):
|
async def navidrome_set_rating(song_id):
|
||||||
navidrome_url = settings.NAVIDROME_URL
|
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.")
|
logging.info(f"Successfully set rating for song {song_id} to 1, but couldn't get song details.")
|
||||||
return
|
return
|
||||||
|
|
||||||
raw_tags = details.get('rawTags', {})
|
title = details.get('title', 'Unknown Title')
|
||||||
title = raw_tags.get('title', ['Unknown Title'])[0]
|
artist = details.get('artist', 'Unknown Artist')
|
||||||
artist = raw_tags.get('artist', ['Unknown Artist'])[0]
|
album = details.get('album', 'Unknown Album')
|
||||||
album = raw_tags.get('album', ['Unknown Album'])[0]
|
|
||||||
logging.info(f'Set song "{title}" - {artist} ({album}) rating to 1.')
|
logging.info(f'Set song "{title}" - {artist} ({album}) rating to 1.')
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user