From 68aec71fdf323a7f5310f7fd8f5147a966d7aee0 Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Sun, 15 Feb 2026 21:55:15 -0600 Subject: [PATCH] fix(v2): migrate favorites cache, session, and context stores to V2 commands - Add v2_save_session_state and v2_load_session_state commands - Update favoritesStore to use V2 cache commands - Update albumFavoritesStore to use V2 cache commands - Update artistFavoritesStore to use V2 cache commands - Update sessionService to use V2 session commands - Update playbackContextStore to use V2 context commands --- src-tauri/src/commands_v2.rs | 46 ++++++++++++++++++++++++++ src-tauri/src/lib.rs | 2 ++ src/lib/services/sessionService.ts | 12 +++---- src/lib/stores/albumFavoritesStore.ts | 14 ++++---- src/lib/stores/artistFavoritesStore.ts | 14 ++++---- src/lib/stores/favoritesStore.ts | 14 ++++---- src/lib/stores/playbackContextStore.ts | 8 ++--- 7 files changed, 79 insertions(+), 31 deletions(-) diff --git a/src-tauri/src/commands_v2.rs b/src-tauri/src/commands_v2.rs index 6dc3fae13..fa0da0069 100644 --- a/src-tauri/src/commands_v2.rs +++ b/src-tauri/src/commands_v2.rs @@ -3065,6 +3065,52 @@ pub async fn v2_save_session_playback_mode( .map_err(|e| RuntimeError::Internal(e)) } +/// Save session state - full state (V2) +#[tauri::command] +pub async fn v2_save_session_state( + queueTracks: Vec, + currentIndex: Option, + currentPositionSecs: u64, + volume: f32, + shuffleEnabled: bool, + repeatMode: String, + wasPlaying: bool, + session_state: State<'_, crate::session_store::SessionStoreState>, +) -> Result<(), RuntimeError> { + let session = crate::session_store::PersistedSession { + queue_tracks: queueTracks, + current_index: currentIndex, + current_position_secs: currentPositionSecs, + volume, + shuffle_enabled: shuffleEnabled, + repeat_mode: repeatMode, + was_playing: wasPlaying, + saved_at: 0, // Will be set by save_session + }; + + let guard = session_state.store.lock() + .map_err(|e| RuntimeError::Internal(format!("Lock error: {}", e)))?; + let store = guard.as_ref() + .ok_or_else(|| RuntimeError::Internal("No active session".to_string()))?; + store.save_session(&session) + .map_err(|e| RuntimeError::Internal(e))?; + log::debug!("[V2] save_session_state: index={:?} pos={}", currentIndex, currentPositionSecs); + Ok(()) +} + +/// Load session state (V2) +#[tauri::command] +pub async fn v2_load_session_state( + session_state: State<'_, crate::session_store::SessionStoreState>, +) -> Result { + let guard = session_state.store.lock() + .map_err(|e| RuntimeError::Internal(format!("Lock error: {}", e)))?; + let store = guard.as_ref() + .ok_or_else(|| RuntimeError::Internal("No active session".to_string()))?; + store.load_session() + .map_err(|e| RuntimeError::Internal(e)) +} + /// Clear session (V2) #[tauri::command] pub async fn v2_clear_session( diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index c098c6c72..23a292225 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -1233,6 +1233,8 @@ pub fn run() { commands_v2::v2_clear_playback_context, commands_v2::v2_has_playback_context, // Session Persistence V2 + commands_v2::v2_save_session_state, + commands_v2::v2_load_session_state, commands_v2::v2_save_session_position, commands_v2::v2_save_session_volume, commands_v2::v2_save_session_playback_mode, diff --git a/src/lib/services/sessionService.ts b/src/lib/services/sessionService.ts index 6813a42ec..01a349f2b 100644 --- a/src/lib/services/sessionService.ts +++ b/src/lib/services/sessionService.ts @@ -46,7 +46,7 @@ export async function saveSessionState( wasPlaying: boolean ): Promise { try { - await invoke('save_session_state', { + await invoke('v2_save_session_state', { queueTracks, currentIndex, currentPositionSecs, @@ -66,7 +66,7 @@ export async function saveSessionState( */ export async function loadSessionState(): Promise { try { - const session = await invoke('load_session_state'); + const session = await invoke('v2_load_session_state'); console.log('[Session] State loaded:', { tracks: session.queue_tracks.length, currentIndex: session.current_index, @@ -85,7 +85,7 @@ export async function loadSessionState(): Promise { */ export async function saveSessionPosition(positionSecs: number): Promise { try { - await invoke('save_session_position', { positionSecs }); + await invoke('v2_save_session_position', { positionSecs }); } catch (err) { console.error('[Session] Failed to save position:', err); } @@ -96,7 +96,7 @@ export async function saveSessionPosition(positionSecs: number): Promise { */ export async function saveSessionVolume(volume: number): Promise { try { - await invoke('save_session_volume', { volume }); + await invoke('v2_save_session_volume', { volume }); } catch (err) { console.error('[Session] Failed to save volume:', err); } @@ -110,7 +110,7 @@ export async function saveSessionPlaybackMode( repeatMode: string ): Promise { try { - await invoke('save_session_playback_mode', { shuffle, repeatMode }); + await invoke('v2_save_session_playback_mode', { shuffle, repeatMode }); } catch (err) { console.error('[Session] Failed to save playback mode:', err); } @@ -121,7 +121,7 @@ export async function saveSessionPlaybackMode( */ export async function clearSession(): Promise { try { - await invoke('clear_session'); + await invoke('v2_clear_session'); console.log('[Session] Session cleared'); } catch (err) { console.error('[Session] Failed to clear session:', err); diff --git a/src/lib/stores/albumFavoritesStore.ts b/src/lib/stores/albumFavoritesStore.ts index 732ba1eac..5f0da2362 100644 --- a/src/lib/stores/albumFavoritesStore.ts +++ b/src/lib/stores/albumFavoritesStore.ts @@ -56,7 +56,7 @@ export async function loadAlbumFavorites(): Promise { try { // Step 1: Load from local cache for instant UI try { - const cachedIds = await invoke('get_cached_favorite_albums'); + const cachedIds = await invoke('v2_get_cached_favorite_albums'); if (cachedIds.length > 0) { favoriteAlbumIds = new Set(cachedIds); isLoaded = true; @@ -109,7 +109,7 @@ export async function syncFromApi(): Promise { } // Sync to local cache - await invoke('sync_cached_favorite_albums', { albumIds: allAlbumIds }); + await invoke('v2_sync_cached_favorite_albums', { albumIds: allAlbumIds }); // Update in-memory store favoriteAlbumIds = new Set(allAlbumIds); @@ -142,7 +142,7 @@ export async function toggleAlbumFavorite(albumId: string): Promise { try { if (newState) { await invoke('v2_add_favorite', { favType: 'album', itemId: albumId }); - await invoke('cache_favorite_album', { albumId }); + await invoke('v2_cache_favorite_album', { albumId }); favoriteAlbumIds.add(albumId); void logRecoEvent({ eventType: 'favorite', @@ -151,7 +151,7 @@ export async function toggleAlbumFavorite(albumId: string): Promise { }); } else { await invoke('v2_remove_favorite', { favType: 'album', itemId: albumId }); - await invoke('uncache_favorite_album', { albumId }); + await invoke('v2_uncache_favorite_album', { albumId }); favoriteAlbumIds.delete(albumId); } return newState; @@ -170,7 +170,7 @@ export async function toggleAlbumFavorite(albumId: string): Promise { */ export async function syncCache(albumIds: string[]): Promise { try { - await invoke('sync_cached_favorite_albums', { albumIds }); + await invoke('v2_sync_cached_favorite_albums', { albumIds }); favoriteAlbumIds = new Set(albumIds); notifyListeners(); } catch (err) { @@ -181,7 +181,7 @@ export async function syncCache(albumIds: string[]): Promise { export function markAsFavorite(albumId: string): void { if (!favoriteAlbumIds.has(albumId)) { favoriteAlbumIds.add(albumId); - invoke('cache_favorite_album', { albumId }).catch(() => {}); + invoke('v2_cache_favorite_album', { albumId }).catch(() => {}); notifyListeners(); } } @@ -189,7 +189,7 @@ export function markAsFavorite(albumId: string): void { export function unmarkAsFavorite(albumId: string): void { if (favoriteAlbumIds.has(albumId)) { favoriteAlbumIds.delete(albumId); - invoke('uncache_favorite_album', { albumId }).catch(() => {}); + invoke('v2_uncache_favorite_album', { albumId }).catch(() => {}); notifyListeners(); } } diff --git a/src/lib/stores/artistFavoritesStore.ts b/src/lib/stores/artistFavoritesStore.ts index 9349645c1..f81bdff9e 100644 --- a/src/lib/stores/artistFavoritesStore.ts +++ b/src/lib/stores/artistFavoritesStore.ts @@ -56,7 +56,7 @@ export async function loadArtistFavorites(): Promise { try { // Step 1: Load from local cache for instant UI try { - const cachedIds = await invoke('get_cached_favorite_artists'); + const cachedIds = await invoke('v2_get_cached_favorite_artists'); if (cachedIds.length > 0) { favoriteArtistIds = new Set(cachedIds); isLoaded = true; @@ -109,7 +109,7 @@ export async function syncFromApi(): Promise { } // Sync to local cache - await invoke('sync_cached_favorite_artists', { artistIds: allArtistIds }); + await invoke('v2_sync_cached_favorite_artists', { artistIds: allArtistIds }); // Update in-memory store favoriteArtistIds = new Set(allArtistIds); @@ -142,7 +142,7 @@ export async function toggleArtistFavorite(artistId: number): Promise { try { if (newState) { await invoke('v2_add_favorite', { favType: 'artist', itemId: String(artistId) }); - await invoke('cache_favorite_artist', { artistId }); + await invoke('v2_cache_favorite_artist', { artistId }); favoriteArtistIds.add(artistId); void logRecoEvent({ eventType: 'favorite', @@ -151,7 +151,7 @@ export async function toggleArtistFavorite(artistId: number): Promise { }); } else { await invoke('v2_remove_favorite', { favType: 'artist', itemId: String(artistId) }); - await invoke('uncache_favorite_artist', { artistId }); + await invoke('v2_uncache_favorite_artist', { artistId }); favoriteArtistIds.delete(artistId); } return newState; @@ -170,7 +170,7 @@ export async function toggleArtistFavorite(artistId: number): Promise { */ export async function syncCache(artistIds: number[]): Promise { try { - await invoke('sync_cached_favorite_artists', { artistIds }); + await invoke('v2_sync_cached_favorite_artists', { artistIds }); favoriteArtistIds = new Set(artistIds); notifyListeners(); } catch (err) { @@ -181,7 +181,7 @@ export async function syncCache(artistIds: number[]): Promise { export function markAsFavorite(artistId: number): void { if (!favoriteArtistIds.has(artistId)) { favoriteArtistIds.add(artistId); - invoke('cache_favorite_artist', { artistId }).catch(() => {}); + invoke('v2_cache_favorite_artist', { artistId }).catch(() => {}); notifyListeners(); } } @@ -189,7 +189,7 @@ export function markAsFavorite(artistId: number): void { export function unmarkAsFavorite(artistId: number): void { if (favoriteArtistIds.has(artistId)) { favoriteArtistIds.delete(artistId); - invoke('uncache_favorite_artist', { artistId }).catch(() => {}); + invoke('v2_uncache_favorite_artist', { artistId }).catch(() => {}); notifyListeners(); } } diff --git a/src/lib/stores/favoritesStore.ts b/src/lib/stores/favoritesStore.ts index 409357a47..e695c0460 100644 --- a/src/lib/stores/favoritesStore.ts +++ b/src/lib/stores/favoritesStore.ts @@ -75,7 +75,7 @@ export async function loadFavorites(): Promise { try { // Step 1: Load from local cache for instant UI (if available) try { - const cachedIds = await invoke('get_cached_favorite_tracks'); + const cachedIds = await invoke('v2_get_cached_favorite_tracks'); if (cachedIds.length > 0) { favoriteTrackIds = new Set(cachedIds); isLoaded = true; @@ -132,7 +132,7 @@ export async function syncFromApi(): Promise { } // Sync to local cache - await invoke('sync_cached_favorite_tracks', { trackIds: allTrackIds }); + await invoke('v2_sync_cached_favorite_tracks', { trackIds: allTrackIds }); // Update in-memory store favoriteTrackIds = new Set(allTrackIds); @@ -169,7 +169,7 @@ export async function toggleTrackFavorite(trackId: number): Promise { if (newState) { await invoke('v2_add_favorite', { favType: 'track', itemId: String(trackId) }); // API succeeded - update local cache - await invoke('cache_favorite_track', { trackId }); + await invoke('v2_cache_favorite_track', { trackId }); // Update in-memory store favoriteTrackIds.add(trackId); // Log for recommendations @@ -181,7 +181,7 @@ export async function toggleTrackFavorite(trackId: number): Promise { } else { await invoke('v2_remove_favorite', { favType: 'track', itemId: String(trackId) }); // API succeeded - update local cache - await invoke('uncache_favorite_track', { trackId }); + await invoke('v2_uncache_favorite_track', { trackId }); // Update in-memory store favoriteTrackIds.delete(trackId); } @@ -234,7 +234,7 @@ export async function syncCache(trackIds: number[]): Promise { */ export async function reset(): Promise { try { - await invoke('clear_favorites_cache'); + await invoke('v2_clear_favorites_cache'); } catch (err) { console.debug('[Favorites] Failed to clear cache:', err); } @@ -250,7 +250,7 @@ export function markAsFavorite(trackId: number): void { if (!favoriteTrackIds.has(trackId)) { favoriteTrackIds.add(trackId); // Also update cache - invoke('cache_favorite_track', { trackId }).catch(() => {}); + invoke('v2_cache_favorite_track', { trackId }).catch(() => {}); notifyListeners(); } } @@ -259,7 +259,7 @@ export function unmarkAsFavorite(trackId: number): void { if (favoriteTrackIds.has(trackId)) { favoriteTrackIds.delete(trackId); // Also update cache - invoke('uncache_favorite_track', { trackId }).catch(() => {}); + invoke('v2_uncache_favorite_track', { trackId }).catch(() => {}); notifyListeners(); } } diff --git a/src/lib/stores/playbackContextStore.ts b/src/lib/stores/playbackContextStore.ts index a97863077..c4030f0cd 100644 --- a/src/lib/stores/playbackContextStore.ts +++ b/src/lib/stores/playbackContextStore.ts @@ -48,7 +48,7 @@ export async function setPlaybackContext( ): Promise { console.log('[PlaybackContext] Setting context:', { contextType, id, label, trackIds: trackIds.length, startPosition }); - await invoke('set_playback_context', { + await invoke('v2_set_playback_context', { contextType, id, label, @@ -76,7 +76,7 @@ export async function setPlaybackContext( */ export async function clearPlaybackContext(): Promise { console.log('[PlaybackContext] Clearing context'); - await invoke('clear_playback_context'); + await invoke('v2_clear_playback_context'); currentContext = null; console.log('[PlaybackContext] Context cleared, notifying listeners'); notifyListeners(); @@ -86,7 +86,7 @@ export async function clearPlaybackContext(): Promise { * Get the current playback context */ export async function getPlaybackContext(): Promise { - const context = await invoke('get_playback_context'); + const context = await invoke('v2_get_playback_context'); currentContext = context; notifyListeners(); return context; @@ -96,7 +96,7 @@ export async function getPlaybackContext(): Promise { * Check if a context is active */ export async function hasPlaybackContext(): Promise { - return await invoke('has_playback_context'); + return await invoke('v2_has_playback_context'); } /**