danvics/soulsync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fixed issue where cancelled downloads wouldn't send album context to wishlist.

Browse source
This commit is contained in:
Broque Thomas 2026-03-01 09:22:50 -08:00
parent afa495756f
commit dced926a6e
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
web_server.py
View file

@ -6123,6 +6123,10 @@ def get_artist_image(artist_id):
For Spotify, returns the artist's image directly. For Spotify, returns the artist's image directly.
""" """
try: try:
# Soul IDs from Hydrabase can't be looked up on Spotify/iTunes
if artist_id.startswith('soul_'):
return jsonify({"success": True, "image_url": None})
if spotify_client and spotify_client.is_spotify_authenticated(): if spotify_client and spotify_client.is_spotify_authenticated():
# Use Spotify directly # Use Spotify directly
artist_data = spotify_client.sp.artist(artist_id) artist_data = spotify_client.sp.artist(artist_id)
@ -13740,6 +13744,7 @@ def _run_quality_scanner(scope='watchlist'):
'artists': [{'name': artist} for artist in best_match.artists], 'artists': [{'name': artist} for artist in best_match.artists],
'album': { 'album': {
'name': best_match.album, 'name': best_match.album,
'artists': [{'name': artist} for artist in best_match.artists],
'album_type': 'album' # Default to 'album' for quality scanner matches 'album_type': 'album' # Default to 'album' for quality scanner matches
}, },
'duration_ms': best_match.duration_ms, 'duration_ms': best_match.duration_ms,
@ -16888,14 +16893,23 @@ def cancel_download_task():
# Fallback for any other type # Fallback for any other type
formatted_artists.append({'name': str(artist)}) formatted_artists.append({'name': str(artist)})
# Build album data - preserve all fields (including artists) for correct folder placement
album_raw = track_info.get('album', {})
if isinstance(album_raw, dict):
album_data = dict(album_raw) # Copy all fields including artists
album_data.setdefault('name', 'Unknown Album')
album_data.setdefault('album_type', track_info.get('album_type', 'album'))
else:
album_data = {
'name': str(album_raw) if album_raw else 'Unknown Album',
'album_type': track_info.get('album_type', 'album')
}
spotify_track_data = { spotify_track_data = {
'id': track_info.get('id'), 'id': track_info.get('id'),
'name': track_info.get('name'), 'name': track_info.get('name'),
'artists': formatted_artists, 'artists': formatted_artists,
'album': { 'album': album_data,
'name': track_info.get('album'),
'album_type': track_info.get('album_type', 'album') # Use track's album type if available
},
'duration_ms': track_info.get('duration_ms') 'duration_ms': track_info.get('duration_ms')
} }
@ -17335,18 +17349,14 @@ def _add_cancelled_task_to_wishlist(task):
else: else:
formatted_artists.append({'name': str(artist)}) formatted_artists.append({'name': str(artist)})
# Build album data with all available info # Build album data - preserve all fields (including artists) for correct folder placement
album_raw = track_info.get('album', {}) album_raw = track_info.get('album', {})
if isinstance(album_raw, dict): if isinstance(album_raw, dict):
album_data = { album_data = dict(album_raw) # Copy all fields including artists
'name': album_raw.get('name', 'Unknown Album'), album_data.setdefault('name', 'Unknown Album')
'album_type': track_info.get('album_type', 'album') album_data.setdefault('album_type', track_info.get('album_type', 'album'))
} # Add images fallback if not present
# Preserve images if present in album object if 'images' not in album_data and track_info.get('album_image_url'):
if 'images' in album_raw:
album_data['images'] = album_raw['images']
# Otherwise, try to get from album_image_url
elif track_info.get('album_image_url'):
album_data['images'] = [{'url': track_info.get('album_image_url')}] album_data['images'] = [{'url': track_info.get('album_image_url')}]
else: else:
# album is a string (album name) # album is a string (album name)