From 99877fa7406c98ecc6b4e2ef7eaf2e975b19ef3b Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Mon, 16 Feb 2026 19:27:47 -0600 Subject: [PATCH] fix(v2): align immersive track info/radio and i18n history keys cx --- src-tauri/src/commands_v2.rs | 36 ++++++++++++--- src-tauri/src/lib.rs | 1 + src/lib/components/TrackInfoModal.svelte | 45 ++++++++++++++----- .../immersive/panels/HistoryPanel.svelte | 2 +- .../immersive/panels/QueuePanel.svelte | 2 +- .../immersive/panels/TrackInfoPanel.svelte | 23 +++++++++- src/lib/i18n/locales/de.json | 1 + src/lib/i18n/locales/en.json | 1 + src/lib/i18n/locales/es.json | 1 + src/lib/i18n/locales/fr.json | 1 + src/routes/+page.svelte | 43 +++++++++++++++--- 11 files changed, 130 insertions(+), 26 deletions(-) diff --git a/src-tauri/src/commands_v2.rs b/src-tauri/src/commands_v2.rs index f48b0d1af..d410e7de0 100644 --- a/src-tauri/src/commands_v2.rs +++ b/src-tauri/src/commands_v2.rs @@ -40,7 +40,6 @@ use crate::offline::OfflineState; use crate::offline_cache::OfflineCacheState; use crate::playback_context::{ContentSource, ContextType, PlaybackContext}; use crate::plex::{PlexMusicSection, PlexPlayResult, PlexServerInfo, PlexTrack}; -use crate::queue::QueueTrack; use crate::reco_store::{HomeResolved, HomeSeeds, RecoEventInput, RecoState}; use crate::runtime::{RuntimeManagerState, RuntimeStatus, RuntimeError, RuntimeEvent, DegradedReason, CommandRequirement}; use crate::AppState; @@ -3235,7 +3234,15 @@ pub async fn v2_create_track_radio( artist_id: u64, state: State<'_, AppState>, blacklist_state: State<'_, BlacklistState>, + bridge: State<'_, CoreBridgeState>, + runtime: State<'_, RuntimeManagerState>, ) -> Result { + runtime + .manager() + .check_requirements(CommandRequirement::RequiresCoreBridgeAuth) + .await + .map_err(|e| e.to_string())?; + let client = state.client.read().await.clone(); let session_id = tokio::task::spawn_blocking(move || -> Result { @@ -3302,8 +3309,10 @@ pub async fn v2_create_track_radio( return Err("Failed to generate any radio tracks".to_string()); } - let queue_tracks: Vec = tracks.iter().map(track_to_queue_track_from_api).collect(); - state.queue.set_queue(queue_tracks, Some(0)); + let queue_tracks: Vec = + tracks.iter().map(track_to_queue_track_from_api).collect(); + let bridge = bridge.get().await; + bridge.set_queue(queue_tracks, Some(0)).await; let queue_track_ids: Vec = tracks.iter().map(|t| t.id).collect(); let context = PlaybackContext::new( @@ -3319,8 +3328,13 @@ pub async fn v2_create_track_radio( Ok(session_id) } -fn track_to_queue_track_from_api(track: &crate::api::Track) -> QueueTrack { - let artwork_url = track.album.as_ref().and_then(|a| a.image.large.clone()); +fn track_to_queue_track_from_api(track: &crate::api::Track) -> CoreQueueTrack { + let artwork_url = track + .album + .as_ref() + .and_then(|a| a.image.large.clone()) + .or_else(|| track.album.as_ref().and_then(|a| a.image.thumbnail.clone())) + .or_else(|| track.album.as_ref().and_then(|a| a.image.small.clone())); let artist = track .performer .as_ref() @@ -3334,7 +3348,7 @@ fn track_to_queue_track_from_api(track: &crate::api::Track) -> QueueTrack { let album_id = track.album.as_ref().map(|a| a.id.clone()); let artist_id = track.performer.as_ref().map(|p| p.id); - QueueTrack { + CoreQueueTrack { id: track.id, title: track.title.clone(), artist, @@ -3363,6 +3377,16 @@ pub async fn v2_get_queue_state( Ok(bridge.get_queue_state().await) } +/// Get currently selected queue track (V2) +#[tauri::command] +pub async fn v2_get_current_queue_track( + bridge: State<'_, CoreBridgeState>, +) -> Result, RuntimeError> { + let bridge = bridge.get().await; + let state = bridge.get_queue_state().await; + Ok(state.current_track.map(Into::into)) +} + /// Set repeat mode (V2 - uses QbzCore) #[tauri::command] pub async fn v2_set_repeat_mode( diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 84754da3a..0b01100cc 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -838,6 +838,7 @@ pub fn run() { commands_v2::v2_set_force_x11, commands_v2::v2_restart_app, commands_v2::v2_get_queue_state, + commands_v2::v2_get_current_queue_track, commands_v2::v2_set_repeat_mode, commands_v2::v2_toggle_shuffle, commands_v2::v2_set_shuffle, diff --git a/src/lib/components/TrackInfoModal.svelte b/src/lib/components/TrackInfoModal.svelte index 3240c2858..1c0848b43 100644 --- a/src/lib/components/TrackInfoModal.svelte +++ b/src/lib/components/TrackInfoModal.svelte @@ -56,8 +56,8 @@ return role.replace(/([A-Z])/g, ' $1').trim().toUpperCase(); } - // Group performers by role and return ordered entries - function getGroupedCredits(performers: Performer[]): { role: string; names: string[] }[] { + // Group performers by role and return ordered entries + function getGroupedCredits(performers: Performer[]): { role: string; names: string[] }[] { const grouped: Record = {}; performers.forEach(performer => { @@ -98,8 +98,25 @@ return a.localeCompare(b); }); - return entries.map(([role, names]) => ({ role, names })); - } + return entries.map(([role, names]) => ({ role, names })); + } + + // Parse Qobuz performers string: "Name, Role - Name, Role" + function parsePerformers(performersStr?: string): Performer[] { + if (!performersStr) return []; + return performersStr + .split(' - ') + .map(segment => segment.trim()) + .filter(Boolean) + .map(segment => { + const parts = segment.split(', ').map(p => p.trim()).filter(Boolean); + return { + name: parts[0] || '', + roles: parts.slice(1) + }; + }) + .filter(p => p.name.length > 0); + } // Load track info when modal opens $effect(() => { @@ -111,14 +128,18 @@ } }); - async function loadTrackInfo(id: number) { - loading = true; - error = null; - try { - trackInfo = await invoke('get_track_info', { trackId: id }); - } catch (e) { - error = e instanceof Error ? e.message : String(e); - trackInfo = null; + async function loadTrackInfo(id: number) { + loading = true; + error = null; + try { + const track = await invoke('v2_get_track', { trackId: id }); + trackInfo = { + track, + performers: parsePerformers(track.performers) + }; + } catch (e) { + error = e instanceof Error ? e.message : String(e); + trackInfo = null; } finally { loading = false; } diff --git a/src/lib/components/immersive/panels/HistoryPanel.svelte b/src/lib/components/immersive/panels/HistoryPanel.svelte index 6b412f2ca..1b360fdc9 100644 --- a/src/lib/components/immersive/panels/HistoryPanel.svelte +++ b/src/lib/components/immersive/panels/HistoryPanel.svelte @@ -67,7 +67,7 @@ {:else}
- {$t('player.historyEmpty') || 'No history yet'} + {$t('player.noHistoryYet') || 'No history yet'}
{/if} diff --git a/src/lib/components/immersive/panels/QueuePanel.svelte b/src/lib/components/immersive/panels/QueuePanel.svelte index 55e702cf2..5ff4d853b 100644 --- a/src/lib/components/immersive/panels/QueuePanel.svelte +++ b/src/lib/components/immersive/panels/QueuePanel.svelte @@ -153,7 +153,7 @@ {:else}
- {$t('player.historyEmpty') || 'No history yet'} + {$t('player.noHistoryYet') || 'No history yet'}
{/if} diff --git a/src/lib/components/immersive/panels/TrackInfoPanel.svelte b/src/lib/components/immersive/panels/TrackInfoPanel.svelte index 3e1c75fe9..cc11fe402 100644 --- a/src/lib/components/immersive/panels/TrackInfoPanel.svelte +++ b/src/lib/components/immersive/panels/TrackInfoPanel.svelte @@ -82,6 +82,23 @@ return entries.map(([role, names]) => ({ role, names })); } + // Parse Qobuz performers string: "Name, Role - Name, Role" + function parsePerformers(performersStr?: string): Performer[] { + if (!performersStr) return []; + return performersStr + .split(' - ') + .map(segment => segment.trim()) + .filter(Boolean) + .map(segment => { + const parts = segment.split(', ').map(p => p.trim()).filter(Boolean); + return { + name: parts[0] || '', + roles: parts.slice(1) + }; + }) + .filter(p => p.name.length > 0); + } + // Load track info only when trackId actually changes $effect(() => { if (trackId && trackId !== loadedTrackId) { @@ -98,7 +115,11 @@ loading = true; error = null; try { - trackInfo = await invoke('get_track_info', { trackId: id }); + const track = await invoke('v2_get_track', { trackId: id }); + trackInfo = { + track, + performers: parsePerformers(track.performers) + }; loadedTrackId = id; } catch (e) { error = e instanceof Error ? e.message : String(e); diff --git a/src/lib/i18n/locales/de.json b/src/lib/i18n/locales/de.json index 84f174951..07af0b8cc 100644 --- a/src/lib/i18n/locales/de.json +++ b/src/lib/i18n/locales/de.json @@ -377,6 +377,7 @@ "history": "Verlauf", "recentlyPlayed": "Kürzlich gespielt", "noHistoryYet": "Noch keine Titel abgespielt", + "historyEmpty": "Noch keine Titel abgespielt", "infinitePlay": "Unendliches Abspielen", "infinitePlayEnabled": "Unendliches Abspielen aktiviert", "infinitePlayDisabled": "Unendliches Abspielen deaktiviert", diff --git a/src/lib/i18n/locales/en.json b/src/lib/i18n/locales/en.json index 0522d908d..0625061ed 100644 --- a/src/lib/i18n/locales/en.json +++ b/src/lib/i18n/locales/en.json @@ -385,6 +385,7 @@ "history": "History", "recentlyPlayed": "Recently Played", "noHistoryYet": "No tracks played yet", + "historyEmpty": "No tracks played yet", "infinitePlay": "Infinite Play", "infinitePlayEnabled": "Infinite play enabled", "infinitePlayDisabled": "Infinite play disabled", diff --git a/src/lib/i18n/locales/es.json b/src/lib/i18n/locales/es.json index b220cba1d..3be5234b2 100644 --- a/src/lib/i18n/locales/es.json +++ b/src/lib/i18n/locales/es.json @@ -385,6 +385,7 @@ "history": "Historial", "recentlyPlayed": "Reproducido Recientemente", "noHistoryYet": "Sin pistas reproducidas aún", + "historyEmpty": "Sin pistas reproducidas aún", "infinitePlay": "Reproducción Infinita", "infinitePlayEnabled": "Reproducción infinita activada", "infinitePlayDisabled": "Reproducción infinita desactivada", diff --git a/src/lib/i18n/locales/fr.json b/src/lib/i18n/locales/fr.json index 50a1f06df..7e8dd361e 100644 --- a/src/lib/i18n/locales/fr.json +++ b/src/lib/i18n/locales/fr.json @@ -377,6 +377,7 @@ "history": "Historique", "recentlyPlayed": "Récemment écouté", "noHistoryYet": "Aucune piste lue pour l'instant", + "historyEmpty": "Aucune piste lue pour l'instant", "infinitePlay": "Lecture infinie", "infinitePlayEnabled": "Lecture infinie activée", "infinitePlayDisabled": "Lecture infinie désactivée", diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index fccf6b7fc..e0a7998fe 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -2907,6 +2907,18 @@ setOnResumeFromStop(async () => { const queueState = await getBackendQueueState(); if (!queueState) return; + const tryQueueIndices = async (indices: number[]): Promise => { + for (const idx of indices) { + if (idx < 0) continue; + if (queueState.total_tracks > 0 && idx >= queueState.total_tracks) continue; + const selected = await playQueueIndex(idx); + if (selected) { + console.log('[Player] Resume from stop: selected queue index', idx); + return selected; + } + } + return null; + }; // Normal case: current track already selected in queue, replay it. if (queueState.current_track && queueState.current_index !== null) { @@ -2915,21 +2927,41 @@ return; } + // Hybrid backend state: queue index exists but current_track is missing. + // This can happen after queue mutations where selection metadata lags. + if (!queueState.current_track && queueState.current_index !== null) { + console.log('[Player] Resume from stop: hybrid queue state, trying [current,0,1]:', queueState.current_index); + const selected = await tryQueueIndices([queueState.current_index, 0, 1]); + if (selected) { + await playQueueTrack(selected); + return; + } + } + // Empty chamber case: queue exists but no current track selected yet. if (queueState.current_index === null && queueState.upcoming.length > 0) { const firstUpcoming = queueState.upcoming[0]; - const firstTrack = await playQueueIndex(0); + const firstTrack = await tryQueueIndices([0, 1]); // Preferred path: bind queue index first, then play selected track. if (firstTrack) { - console.log('[Player] Resuming from stop, starting queue from index 0'); + console.log('[Player] Resuming from stop, starting queue from first valid index'); await playQueueTrack(firstTrack); return; } - // Defensive fallback: if play_index fails, play first upcoming directly. - // This guarantees user-visible playback instead of silent no-op. - console.warn('[Player] playQueueIndex(0) failed, falling back to first upcoming track'); + // Fallback #1: ask backend to advance/select next track from empty chamber state. + // Some queue states can reject play_index(0) while still accepting next_track. + const advancedTrack = await nextTrack(); + if (advancedTrack) { + console.log('[Player] playQueueIndex(0) failed, resumed via nextTrack()'); + await playQueueTrack(advancedTrack); + return; + } + + // Fallback #2: play the first upcoming track directly. + // Last-resort to avoid a visible no-op on Play button. + console.warn('[Player] Queue resume fallback: playing first upcoming track directly'); await playQueueTrack(firstUpcoming); } }); @@ -3753,6 +3785,7 @@ /> {:else}