diff --git a/src/lib/components/QueuePanel.svelte b/src/lib/components/QueuePanel.svelte index 8e98f2c34..8ffe8ddfb 100644 --- a/src/lib/components/QueuePanel.svelte +++ b/src/lib/components/QueuePanel.svelte @@ -2,6 +2,7 @@ import { X, Search, Heart, MoreVertical, Trash2 } from 'lucide-svelte'; import { t } from '$lib/i18n'; import { invoke } from '@tauri-apps/api/core'; + import { getUserItem, setUserItem } from '$lib/utils/userStorage'; interface QueueTrack { id: string; @@ -79,7 +80,7 @@ // Load banner dismissal state from localStorage $effect(() => { try { - const dismissed = localStorage.getItem('qbz-infinite-banner-dismissed'); + const dismissed = getUserItem('qbz-infinite-banner-dismissed'); infiniteBannerDismissed = dismissed === 'true'; } catch { // Ignore @@ -89,7 +90,7 @@ function dismissInfiniteBanner() { infiniteBannerDismissed = true; try { - localStorage.setItem('qbz-infinite-banner-dismissed', 'true'); + setUserItem('qbz-infinite-banner-dismissed', 'true'); } catch { // Ignore } diff --git a/src/lib/components/immersive/ImmersivePlayer.svelte b/src/lib/components/immersive/ImmersivePlayer.svelte index c57f8b6fd..e80a33b01 100644 --- a/src/lib/components/immersive/ImmersivePlayer.svelte +++ b/src/lib/components/immersive/ImmersivePlayer.svelte @@ -15,6 +15,7 @@ import VisualizerPanel from './panels/VisualizerPanel.svelte'; import LyricsFocusPanel from './panels/LyricsFocusPanel.svelte'; import QualityBadge from '$lib/components/QualityBadge.svelte'; + import { getUserItem, setUserItem } from '$lib/utils/userStorage'; interface LyricsLine { text: string; @@ -161,16 +162,16 @@ } function saveLastUsedView() { - const setting = localStorage.getItem('qbz-immersive-default-view') || 'remember'; + const setting = getUserItem('qbz-immersive-default-view') || 'remember'; if (setting === 'remember') { - localStorage.setItem('qbz-immersive-last-view', getCurrentViewKey()); + setUserItem('qbz-immersive-last-view', getCurrentViewKey()); } } function restoreView() { - const setting = localStorage.getItem('qbz-immersive-default-view') || 'remember'; + const setting = getUserItem('qbz-immersive-default-view') || 'remember'; if (setting === 'remember') { - const lastView = localStorage.getItem('qbz-immersive-last-view'); + const lastView = getUserItem('qbz-immersive-last-view'); if (lastView) { applyStoredView(lastView as ImmersiveViewKey); } diff --git a/src/lib/components/views/FavoritesView.svelte b/src/lib/components/views/FavoritesView.svelte index f4b5a8aec..169aff841 100644 --- a/src/lib/components/views/FavoritesView.svelte +++ b/src/lib/components/views/FavoritesView.svelte @@ -18,6 +18,7 @@ import { syncCache as syncAlbumCache } from '$lib/stores/albumFavoritesStore'; import { syncCache as syncArtistCache } from '$lib/stores/artistFavoritesStore'; import { categorizeAlbum, getQobuzImage, formatQuality } from '$lib/adapters/qobuzAdapters'; + import { getUserItem, setUserItem } from '$lib/utils/userStorage'; import GenreFilterButton from '../GenreFilterButton.svelte'; import { hasActiveFilter as hasGenreFilter, @@ -492,7 +493,7 @@ function loadStoredBool(key: string, fallback = false): boolean { try { - const value = localStorage.getItem(key); + const value = getUserItem(key); if (value === null) return fallback; return value === 'true'; } catch { @@ -502,7 +503,7 @@ function loadStoredString(key: string, fallback: T, options: T[]): T { try { - const value = localStorage.getItem(key); + const value = getUserItem(key); if (value && (options as string[]).includes(value)) { return value as T; } @@ -596,15 +597,15 @@ $effect(() => { try { - localStorage.setItem('qbz-favorites-album-view', albumViewMode); - localStorage.setItem('qbz-favorites-album-group', albumGroupMode); - localStorage.setItem('qbz-favorites-album-sort-by', albumSortBy); - localStorage.setItem('qbz-favorites-album-sort-dir', albumSortDirection); - localStorage.setItem('qbz-favorites-track-group', trackGroupMode); - localStorage.setItem('qbz-favorites-album-group-enabled', String(albumGroupingEnabled)); - localStorage.setItem('qbz-favorites-track-group-enabled', String(trackGroupingEnabled)); - localStorage.setItem('qbz-favorites-artist-group-enabled', String(artistGroupingEnabled)); - localStorage.setItem('qbz-favorites-artist-view-mode', artistViewMode); + setUserItem('qbz-favorites-album-view', albumViewMode); + setUserItem('qbz-favorites-album-group', albumGroupMode); + setUserItem('qbz-favorites-album-sort-by', albumSortBy); + setUserItem('qbz-favorites-album-sort-dir', albumSortDirection); + setUserItem('qbz-favorites-track-group', trackGroupMode); + setUserItem('qbz-favorites-album-group-enabled', String(albumGroupingEnabled)); + setUserItem('qbz-favorites-track-group-enabled', String(trackGroupingEnabled)); + setUserItem('qbz-favorites-artist-group-enabled', String(artistGroupingEnabled)); + setUserItem('qbz-favorites-artist-view-mode', artistViewMode); } catch { // localStorage not available } diff --git a/src/lib/components/views/LocalLibraryView.svelte b/src/lib/components/views/LocalLibraryView.svelte index 704b6c245..83c96d4c4 100644 --- a/src/lib/components/views/LocalLibraryView.svelte +++ b/src/lib/components/views/LocalLibraryView.svelte @@ -12,6 +12,7 @@ import LocalLibraryTagEditorModal from '../LocalLibraryTagEditorModal.svelte'; import ViewTransition from '../ViewTransition.svelte'; import { t } from '$lib/i18n'; + import { getUserItem } from '$lib/utils/userStorage'; import { downloadSettingsVersion } from '$lib/stores/downloadSettingsStore'; import { showToast } from '$lib/stores/toastStore'; import AlbumCard from '../AlbumCard.svelte'; @@ -1129,7 +1130,7 @@ // Load cached artist images from database await loadCachedArtistImages(); // Fetch missing images in background if enabled - const fetchEnabled = localStorage.getItem('qbz-fetch-artist-images') !== 'false'; + const fetchEnabled = getUserItem('qbz-fetch-artist-images') !== 'false'; if (fetchEnabled) { fetchMissingArtistImages(); } diff --git a/src/lib/components/views/PlaylistManagerView.svelte b/src/lib/components/views/PlaylistManagerView.svelte index 72b31ee87..eccb28c6b 100644 --- a/src/lib/components/views/PlaylistManagerView.svelte +++ b/src/lib/components/views/PlaylistManagerView.svelte @@ -32,6 +32,7 @@ getActiveMenuId, MENU_INACTIVITY_TIMEOUT } from '$lib/stores/floatingMenuStore'; + import { getUserItem, setUserItem } from '$lib/utils/userStorage'; interface Playlist { id: number; @@ -85,13 +86,13 @@ // Filter and sort state (persisted) let filter = $state( - (localStorage.getItem('qbz-pm-filter') as PlaylistFilter) || 'all' + (getUserItem('qbz-pm-filter') as PlaylistFilter) || 'all' ); let sort = $state( - (localStorage.getItem('qbz-pm-sort') as PlaylistSort) || 'name' + (getUserItem('qbz-pm-sort') as PlaylistSort) || 'name' ); let viewMode = $state( - (localStorage.getItem('qbz-pm-view') as ViewMode) || 'grid' + (getUserItem('qbz-pm-view') as ViewMode) || 'grid' ); // Search state @@ -128,9 +129,9 @@ let editingFolder = $state(null); // Persist preferences - $effect(() => { localStorage.setItem('qbz-pm-filter', filter); }); - $effect(() => { localStorage.setItem('qbz-pm-sort', sort); }); - $effect(() => { localStorage.setItem('qbz-pm-view', viewMode); }); + $effect(() => { setUserItem('qbz-pm-filter', filter); }); + $effect(() => { setUserItem('qbz-pm-sort', sort); }); + $effect(() => { setUserItem('qbz-pm-view', viewMode); }); // Helper functions for closing menus with global store function closeFilterMenu() { diff --git a/src/lib/components/views/SettingsView.svelte b/src/lib/components/views/SettingsView.svelte index 50e77bdce..6749fcaaf 100644 --- a/src/lib/components/views/SettingsView.svelte +++ b/src/lib/components/views/SettingsView.svelte @@ -36,6 +36,7 @@ import { get } from 'svelte/store'; import MigrationModal from '../MigrationModal.svelte'; import { getDevicePrettyName } from '$lib/utils/audioDeviceNames'; + import { getUserItem, setUserItem, removeUserItem } from '$lib/utils/userStorage'; import { ZOOM_OPTIONS, findZoomOption, getZoomLevelFromOption } from '$lib/utils/zoom'; import { getZoom, setZoom, subscribeZoom } from '$lib/stores/zoomStore'; import { @@ -611,7 +612,7 @@ 'split-lyrics', 'split-trackInfo', 'split-suggestions', 'split-queue' ] as const; let immersiveDefaultView = $state( - localStorage.getItem('qbz-immersive-default-view') || 'remember' + getUserItem('qbz-immersive-default-view') || 'remember' ); function getImmersiveViewOptions(): string[] { @@ -628,7 +629,7 @@ if (index >= 0) { const key = IMMERSIVE_VIEW_KEYS[index]; immersiveDefaultView = key; - localStorage.setItem('qbz-immersive-default-view', key); + setUserItem('qbz-immersive-default-view', key); } } @@ -685,7 +686,7 @@ applyTheme(savedTheme); // Load streaming quality preference - const savedQuality = localStorage.getItem('qbz-streaming-quality'); + const savedQuality = getUserItem('qbz-streaming-quality'); if (savedQuality) { streamingQuality = savedQuality; } @@ -709,7 +710,7 @@ const unsubscribeZoom = subscribeZoom(updateZoomLevel); // Load library settings - const savedFetchArtistImages = localStorage.getItem('qbz-fetch-artist-images'); + const savedFetchArtistImages = getUserItem('qbz-fetch-artist-images'); if (savedFetchArtistImages !== null) { fetchQobuzArtistImages = savedFetchArtistImages === 'true'; } @@ -838,11 +839,11 @@ hasEmbeddedCredentials = await invoke('lastfm_has_embedded_credentials'); // Load saved credentials from localStorage (for user-provided keys) - const savedApiKey = localStorage.getItem('qbz-lastfm-api-key'); - const savedApiSecret = localStorage.getItem('qbz-lastfm-api-secret'); - const savedSessionKey = localStorage.getItem('qbz-lastfm-session-key'); - const savedUsername = localStorage.getItem('qbz-lastfm-username'); - const savedScrobbling = localStorage.getItem('qbz-lastfm-scrobbling'); + const savedApiKey = getUserItem('qbz-lastfm-api-key'); + const savedApiSecret = getUserItem('qbz-lastfm-api-secret'); + const savedSessionKey = getUserItem('qbz-lastfm-session-key'); + const savedUsername = getUserItem('qbz-lastfm-username'); + const savedScrobbling = getUserItem('qbz-lastfm-scrobbling'); // If we have user-provided credentials, set them if (savedApiKey && savedApiSecret) { @@ -881,8 +882,8 @@ try { // If user provided credentials, save and set them if (lastfmApiKey && lastfmApiSecret) { - localStorage.setItem('qbz-lastfm-api-key', lastfmApiKey); - localStorage.setItem('qbz-lastfm-api-secret', lastfmApiSecret); + setUserItem('qbz-lastfm-api-key', lastfmApiKey); + setUserItem('qbz-lastfm-api-secret', lastfmApiSecret); await invoke('lastfm_set_credentials', { apiKey: lastfmApiKey, apiSecret: lastfmApiSecret @@ -929,8 +930,8 @@ lastfmAuthToken = ''; // Save session - localStorage.setItem('qbz-lastfm-session-key', session.key); - localStorage.setItem('qbz-lastfm-username', session.name); + setUserItem('qbz-lastfm-session-key', session.key); + setUserItem('qbz-lastfm-username', session.name); } catch (err) { console.error('Failed to complete Last.fm auth:', err); alert(`Authorization failed: ${err}`); @@ -946,8 +947,8 @@ lastfmUsername = ''; // Clear saved session - localStorage.removeItem('qbz-lastfm-session-key'); - localStorage.removeItem('qbz-lastfm-username'); + removeUserItem('qbz-lastfm-session-key'); + removeUserItem('qbz-lastfm-username'); } catch (err) { console.error('Failed to disconnect Last.fm:', err); } @@ -955,7 +956,7 @@ function handleScrobblingChange(enabled: boolean) { scrobbling = enabled; - localStorage.setItem('qbz-lastfm-scrobbling', String(enabled)); + setUserItem('qbz-lastfm-scrobbling', String(enabled)); } async function loadMusicBrainzState() { @@ -1197,7 +1198,7 @@ async function handleQualityChange(quality: string) { const previousQuality = streamingQuality; streamingQuality = quality; - localStorage.setItem('qbz-streaming-quality', quality); + setUserItem('qbz-streaming-quality', quality); // Clear playback cache when quality changes (issue #34) // This ensures cached tracks don't play at wrong quality @@ -2661,7 +2662,7 @@ { fetchQobuzArtistImages = v; - localStorage.setItem('qbz-fetch-artist-images', String(v)); + setUserItem('qbz-fetch-artist-images', String(v)); }} /> diff --git a/src/lib/services/playbackService.ts b/src/lib/services/playbackService.ts index ea567dbe9..da4f4305d 100644 --- a/src/lib/services/playbackService.ts +++ b/src/lib/services/playbackService.ts @@ -10,6 +10,7 @@ */ import { invoke } from '@tauri-apps/api/core'; +import { getUserItem, setUserItem } from '$lib/utils/userStorage'; /** * Get the preferred streaming quality from localStorage @@ -17,7 +18,7 @@ import { invoke } from '@tauri-apps/api/core'; */ function getStreamingQuality(): string { if (typeof localStorage === 'undefined') return 'Hi-Res+'; - return localStorage.getItem('qbz-streaming-quality') || 'Hi-Res+'; + return getUserItem('qbz-streaming-quality') || 'Hi-Res+'; } import { setCurrentTrack, @@ -322,7 +323,7 @@ let systemNotificationsEnabled = true; * Load system notifications preference from localStorage */ export function loadSystemNotificationsPreference(): void { - const saved = localStorage.getItem('qbz-system-notifications-enabled'); + const saved = getUserItem('qbz-system-notifications-enabled'); if (saved !== null) { systemNotificationsEnabled = saved === 'true'; } @@ -333,7 +334,7 @@ export function loadSystemNotificationsPreference(): void { */ export function setSystemNotificationsEnabled(enabled: boolean): void { systemNotificationsEnabled = enabled; - localStorage.setItem('qbz-system-notifications-enabled', String(enabled)); + setUserItem('qbz-system-notifications-enabled', String(enabled)); } /** @@ -568,8 +569,8 @@ export async function updateLastfmNowPlaying( trackId: number ): Promise { // Check if scrobbling is enabled - const scrobblingEnabled = localStorage.getItem('qbz-lastfm-scrobbling') !== 'false'; - const sessionKey = localStorage.getItem('qbz-lastfm-session-key'); + const scrobblingEnabled = getUserItem('qbz-lastfm-scrobbling') !== 'false'; + const sessionKey = getUserItem('qbz-lastfm-session-key'); if (!scrobblingEnabled || !sessionKey) return; @@ -634,8 +635,8 @@ export async function updateLastfmNowPlaying( */ export async function flushScrobbleQueue(): Promise<{ sent: number; failed: number }> { // Check if scrobbling is enabled - const scrobblingEnabled = localStorage.getItem('qbz-lastfm-scrobbling') !== 'false'; - const sessionKey = localStorage.getItem('qbz-lastfm-session-key'); + const scrobblingEnabled = getUserItem('qbz-lastfm-scrobbling') !== 'false'; + const sessionKey = getUserItem('qbz-lastfm-session-key'); if (!scrobblingEnabled || !sessionKey) { return { sent: 0, failed: 0 }; diff --git a/src/lib/stores/playerStore.ts b/src/lib/stores/playerStore.ts index ebb248183..3cfff0a2c 100644 --- a/src/lib/stores/playerStore.ts +++ b/src/lib/stores/playerStore.ts @@ -7,6 +7,7 @@ import { invoke } from '@tauri-apps/api/core'; import { saveSessionVolume } from '$lib/services/sessionService'; +import { getUserItem, setUserItem, removeUserItem } from '$lib/utils/userStorage'; /** * Get the preferred streaming quality from localStorage @@ -14,7 +15,7 @@ import { saveSessionVolume } from '$lib/services/sessionService'; */ function getStreamingQuality(): string { if (typeof localStorage === 'undefined') return 'Hi-Res+'; - const saved = localStorage.getItem('qbz-streaming-quality'); + const saved = getUserItem('qbz-streaming-quality'); // Log for debugging issue #34 console.log('[Quality] getStreamingQuality called, localStorage value:', saved); return saved || 'Hi-Res+'; @@ -100,7 +101,7 @@ interface QueueTrack { */ function loadPersistedVolume(): number { if (typeof localStorage === 'undefined') return 75; - const stored = localStorage.getItem('qbz-volume'); + const stored = getUserItem('qbz-volume'); if (stored) { const parsed = parseFloat(stored); if (!isNaN(parsed) && parsed >= 0 && parsed <= 100) { @@ -115,7 +116,7 @@ function loadPersistedVolume(): number { */ function persistVolume(vol: number): void { if (typeof localStorage === 'undefined') return; - localStorage.setItem('qbz-volume', String(vol)); + setUserItem('qbz-volume', String(vol)); } let currentTrack: PlayingTrack | null = null; @@ -420,19 +421,19 @@ export async function toggleMute(): Promise { // Mute: save current volume and set to 0 preMuteVolume = volume; if (typeof localStorage !== 'undefined') { - localStorage.setItem('qbz-pre-mute-volume', String(volume)); + setUserItem('qbz-pre-mute-volume', String(volume)); } await setVolume(0); } else { // Unmute: restore saved volume let restoreVolume = preMuteVolume; if (restoreVolume === null && typeof localStorage !== 'undefined') { - const stored = localStorage.getItem('qbz-pre-mute-volume'); + const stored = getUserItem('qbz-pre-mute-volume'); if (stored) restoreVolume = parseFloat(stored); } preMuteVolume = null; if (typeof localStorage !== 'undefined') { - localStorage.removeItem('qbz-pre-mute-volume'); + removeUserItem('qbz-pre-mute-volume'); } await setVolume(restoreVolume && restoreVolume > 0 ? restoreVolume : 75); } diff --git a/src/lib/stores/toastStore.ts b/src/lib/stores/toastStore.ts index f4b713190..d20b3c54d 100644 --- a/src/lib/stores/toastStore.ts +++ b/src/lib/stores/toastStore.ts @@ -4,6 +4,8 @@ * Manages toast notifications across the app with auto-hide and queue support. */ +import { getUserItem, setUserItem, removeUserItem } from '$lib/utils/userStorage'; + export type ToastType = 'success' | 'error' | 'info' | 'warning' | 'buffering'; export interface Toast { @@ -25,16 +27,16 @@ let toastsEnabled = true; * Load toasts preference from localStorage */ export function loadToastsPreference(): void { - const saved = localStorage.getItem('qbz-toasts-enabled'); + const saved = getUserItem('qbz-toasts-enabled'); if (saved !== null) { toastsEnabled = saved === 'true'; } else { // Migrate from old key if exists - const oldSaved = localStorage.getItem('qbz-notifications-enabled'); + const oldSaved = getUserItem('qbz-notifications-enabled'); if (oldSaved !== null) { toastsEnabled = oldSaved === 'true'; - localStorage.setItem('qbz-toasts-enabled', oldSaved); - localStorage.removeItem('qbz-notifications-enabled'); + setUserItem('qbz-toasts-enabled', oldSaved); + removeUserItem('qbz-notifications-enabled'); } } } @@ -44,7 +46,7 @@ export function loadToastsPreference(): void { */ export function setToastsEnabled(enabled: boolean): void { toastsEnabled = enabled; - localStorage.setItem('qbz-toasts-enabled', String(enabled)); + setUserItem('qbz-toasts-enabled', String(enabled)); if (!enabled) { hideToast(); } diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 83aa731c6..b71e760b4 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -97,7 +97,7 @@ getAuthState, type UserInfo } from '$lib/stores/authStore'; - import { setStorageUserId, migrateLocalStorage } from '$lib/utils/userStorage'; + import { setStorageUserId, migrateLocalStorage, getUserItem, setUserItem } from '$lib/utils/userStorage'; // Favorites state management import { loadFavorites } from '$lib/stores/favoritesStore'; @@ -1603,7 +1603,7 @@ infinitePlayEnabled = !infinitePlayEnabled; // Persist to localStorage try { - localStorage.setItem('qbz-infinite-play', JSON.stringify(infinitePlayEnabled)); + setUserItem('qbz-infinite-play', JSON.stringify(infinitePlayEnabled)); } catch { // Ignore storage errors } @@ -2505,7 +2505,7 @@ // Load infinite play preference try { - const stored = localStorage.getItem('qbz-infinite-play'); + const stored = getUserItem('qbz-infinite-play'); if (stored !== null) { infinitePlayEnabled = JSON.parse(stored); }