From a219a1dcb6fba15ae2d76edeecb07bdeb85e3f53 Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Thu, 15 Jan 2026 23:33:24 -0600 Subject: [PATCH] fix(offline): edge cases and code cleanup - Fix online transition callback not triggering on manual mode disable - Fix $derived pattern in DownloadButton (use $derived.by) - Remove unused OptionalExtension import in offline/mod.rs --- src-tauri/src/offline/mod.rs | 2 +- src/lib/components/DownloadButton.svelte | 4 ++-- src/lib/stores/offlineStore.ts | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src-tauri/src/offline/mod.rs b/src-tauri/src/offline/mod.rs index aa9c39ec5..0923055f5 100644 --- a/src-tauri/src/offline/mod.rs +++ b/src-tauri/src/offline/mod.rs @@ -7,7 +7,7 @@ //! - Offline settings persistence //! - Pending playlist sync queue (playlists created offline) -use rusqlite::{Connection, params, OptionalExtension}; +use rusqlite::{Connection, params}; use serde::{Deserialize, Serialize}; use std::sync::{Arc, Mutex}; use std::time::Duration; diff --git a/src/lib/components/DownloadButton.svelte b/src/lib/components/DownloadButton.svelte index c4d25ebbe..7bf46b3aa 100644 --- a/src/lib/components/DownloadButton.svelte +++ b/src/lib/components/DownloadButton.svelte @@ -49,7 +49,7 @@ } } - const title = $derived(() => { + const title = $derived.by(() => { // Show offline message when trying to download while offline if (isOffline && (status === 'none' || status === 'failed')) { return $t('offline.featureDisabled'); @@ -77,7 +77,7 @@ class:failed={status === 'failed'} class:offline={isOffline && status !== 'ready'} onclick={handleClick} - title={title()} + title={title} disabled={isDisabled} > {#if status === 'ready'} diff --git a/src/lib/stores/offlineStore.ts b/src/lib/stores/offlineStore.ts index 40b5e2dd5..f38eb54de 100644 --- a/src/lib/stores/offlineStore.ts +++ b/src/lib/stores/offlineStore.ts @@ -137,10 +137,16 @@ async function fetchSettings(): Promise { */ export async function setManualOffline(enabled: boolean): Promise { try { + const wasOffline = status.isOffline; const newStatus = await invoke('set_manual_offline', { enabled }); status = newStatus; settings.manualOfflineMode = enabled; notifyListeners(); + // Check for offline -> online transition when disabling manual mode + if (wasOffline && !newStatus.isOffline && onOnlineTransitionCallback) { + console.log('[Offline] Transitioning to online after disabling manual mode'); + onOnlineTransitionCallback(); + } } catch (error) { console.error('Failed to set manual offline mode:', error); throw error;