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

Fix service status not showing Spotify as active metadata source

Browse source 
The status cache's source field was being set by _get_metadata_fallback_source(),
which internally calls is_spotify_authenticated() a second time via module import.
Any inconsistency between that path and the direct auth check already performed
would return 'deezer', poisoning the cache — and since the WebSocket takes over
from the HTTP poll, it never corrected itself.

Now reads config directly and reuses the single auth probe result.
This commit is contained in:
Broque Thomas 2026-04-13 14:50:49 -07:00
parent ff5684bded
commit 4cf18ad2c9
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
web_server.py
View file

@ -4688,22 +4688,23 @@ def get_status():
rate_limit_info = spotify_client.get_rate_limit_info() if (spotify_client and is_rate_limited) else None rate_limit_info = spotify_client.get_rate_limit_info() if (spotify_client and is_rate_limited) else None
cooldown_remaining = spotify_client.get_post_ban_cooldown_remaining() if spotify_client else 0 cooldown_remaining = spotify_client.get_post_ban_cooldown_remaining() if spotify_client else 0
# Read configured source once — no auth validation here, we do that explicitly below
configured_source = config_manager.get('metadata.fallback_source', 'deezer') or 'deezer'
if is_rate_limited or cooldown_remaining > 0: if is_rate_limited or cooldown_remaining > 0:
# During rate limit or post-ban cooldown, skip the auth probe entirely. # During rate limit or post-ban cooldown, skip the auth probe entirely.
# Probing Spotify here would reset the rate limit timer. # Probing Spotify here would reset the rate limit timer.
music_source = _get_metadata_fallback_source() music_source = 'deezer' if configured_source == 'spotify' else configured_source
if music_source == 'spotify':
music_source = 'deezer' # Spotify rate limited — can't use it
spotify_response_time = 0 spotify_response_time = 0
else: else:
spotify_start = time.time() spotify_start = time.time()
spotify_connected = spotify_client.is_spotify_authenticated() if spotify_client else False spotify_connected = spotify_client.is_spotify_authenticated() if spotify_client else False
spotify_response_time = (time.time() - spotify_start) * 1000 spotify_response_time = (time.time() - spotify_start) * 1000
# Use whatever the user configured as primary metadata source # Use configured source; fall back to deezer only if Spotify isn't authenticated
music_source = _get_metadata_fallback_source() if configured_source == 'spotify':
# If user selected spotify but it's not authed, fall back music_source = 'spotify' if spotify_connected else 'deezer'
if music_source == 'spotify' and not spotify_connected: else:
music_source = 'deezer' music_source = configured_source
_status_cache['spotify'] = { _status_cache['spotify'] = {
'connected': True, # Always true — iTunes fallback is always available 'connected': True, # Always true — iTunes fallback is always available