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

Fix watchlist scan failing entirely when Spotify is rate limited by adding iTunes provider fallback and missing rate limit ban detection

Browse source
This commit is contained in:
Broque Thomas 2026-03-14 14:58:12 -07:00
parent cf917279c2
commit 60261f2e91
2 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/spotify_client.py
View file

@ -1096,6 +1096,7 @@ class SpotifyClient:
return track_data return track_data
except Exception as e: except Exception as e:
_detect_and_set_rate_limit(e, 'get_track_details')
logger.error(f"Error fetching track details via Spotify: {e}") logger.error(f"Error fetching track details via Spotify: {e}")
# Fall through to iTunes fallback # Fall through to iTunes fallback
@ -1246,6 +1247,7 @@ class SpotifyClient:
return result return result
except Exception as e: except Exception as e:
_detect_and_set_rate_limit(e, 'get_album_tracks')
logger.error(f"Error fetching album tracks via Spotify: {e}") logger.error(f"Error fetching album tracks via Spotify: {e}")
# Fall through to iTunes fallback # Fall through to iTunes fallback
@ -1287,6 +1289,7 @@ class SpotifyClient:
return albums return albums
except Exception as e: except Exception as e:
_detect_and_set_rate_limit(e, 'get_artist_albums')
logger.error(f"Error fetching artist albums via Spotify: {e}") logger.error(f"Error fetching artist albums via Spotify: {e}")
# Fall through to iTunes fallback # Fall through to iTunes fallback

35
core/watchlist_scanner.py
View file

@ -478,7 +478,40 @@ class WatchlistScanner:
logger.warning(f"No valid client/ID for {watchlist_artist.artist_name}") logger.warning(f"No valid client/ID for {watchlist_artist.artist_name}")
return None return None
return self._get_artist_discography_with_client(client, artist_id, last_scan_timestamp) albums = self._get_artist_discography_with_client(client, artist_id, last_scan_timestamp)
# If primary provider returned nothing, try the other provider as fallback
if not albums:
fallback_id = None
fallback_client = None
if provider == 'spotify':
fallback_client = self.metadata_service.itunes
fallback_id = watchlist_artist.itunes_artist_id
# If no iTunes ID stored, search by name and cache it
if not fallback_id:
try:
search_results = fallback_client.search_artists(watchlist_artist.artist_name, limit=1)
if search_results:
fallback_id = search_results[0].id
logger.info(f"Resolved iTunes ID {fallback_id} for {watchlist_artist.artist_name}")
self.database.update_watchlist_artist_itunes_id(
watchlist_artist.spotify_artist_id or str(watchlist_artist.id),
fallback_id
)
watchlist_artist.itunes_artist_id = fallback_id
except Exception as e:
logger.debug(f"Could not resolve iTunes ID for {watchlist_artist.artist_name}: {e}")
elif provider == 'itunes':
fallback_client = self.metadata_service.spotify
fallback_id = watchlist_artist.spotify_artist_id
if fallback_client and fallback_id:
logger.info(f"{provider.capitalize()} returned no albums for {watchlist_artist.artist_name}, falling back to {'iTunes' if provider == 'spotify' else 'Spotify'}")
albums = self._get_artist_discography_with_client(fallback_client, fallback_id, last_scan_timestamp)
return albums
def scan_all_watchlist_artists(self) -> List[ScanResult]: def scan_all_watchlist_artists(self) -> List[ScanResult]:
""" """