From 0aecda77e5d0b4c06dae3849ddacdf42d0058775 Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Mon, 16 Feb 2026 03:53:24 -0600 Subject: [PATCH] refactor(v2): migrate remaining unknown frontend invokes to v2 commands cx --- src-tauri/src/commands_v2.rs | 96 ++++++++++++++++++++ src-tauri/src/lib.rs | 13 +++ src/lib/components/LogsModal.svelte | 4 +- src/lib/components/views/SettingsView.svelte | 6 +- src/lib/services/updatesService.ts | 2 +- src/lib/stores/qobuzLegalStore.ts | 6 +- src/lib/stores/titleBarStore.ts | 2 +- src/lib/stores/updatesStore.ts | 10 +- 8 files changed, 124 insertions(+), 15 deletions(-) diff --git a/src-tauri/src/commands_v2.rs b/src-tauri/src/commands_v2.rs index 2b9732fdb..8bba1d95e 100644 --- a/src-tauri/src/commands_v2.rs +++ b/src-tauri/src/commands_v2.rs @@ -4949,3 +4949,99 @@ pub async fn v2_factory_reset( ) .await } + +#[tauri::command] +pub fn v2_set_qobuz_tos_accepted( + state: State<'_, crate::config::legal_settings::LegalSettingsState>, + accepted: bool, +) -> Result<(), String> { + crate::config::legal_settings::set_qobuz_tos_accepted(state, accepted) +} + +#[tauri::command] +pub fn v2_set_update_check_on_launch( + enabled: bool, + state: State<'_, crate::updates::UpdatesState>, +) -> Result<(), String> { + crate::updates::set_update_check_on_launch(enabled, state) +} + +#[tauri::command] +pub fn v2_set_show_whats_new_on_launch( + enabled: bool, + state: State<'_, crate::updates::UpdatesState>, +) -> Result<(), String> { + crate::updates::set_show_whats_new_on_launch(enabled, state) +} + +#[tauri::command] +pub fn v2_acknowledge_release( + version: String, + state: State<'_, crate::updates::UpdatesState>, +) -> Result<(), String> { + crate::updates::acknowledge_release(version, state) +} + +#[tauri::command] +pub fn v2_ignore_release( + version: String, + state: State<'_, crate::updates::UpdatesState>, +) -> Result<(), String> { + crate::updates::ignore_release(version, state) +} + +#[tauri::command] +pub fn v2_mark_whats_new_shown( + version: String, + state: State<'_, crate::updates::UpdatesState>, +) -> Result<(), String> { + crate::updates::mark_whats_new_shown(version, state) +} + +#[tauri::command] +pub fn v2_mark_flatpak_welcome_shown( + state: State<'_, crate::updates::UpdatesState>, +) -> Result<(), String> { + crate::updates::mark_flatpak_welcome_shown(state) +} + +#[tauri::command] +pub fn v2_get_backend_logs() -> Vec { + crate::logging::get_backend_logs() +} + +#[tauri::command] +pub async fn v2_upload_logs_to_paste(content: String) -> Result { + crate::logging::upload_logs_to_paste(content).await +} + +#[tauri::command] +pub fn v2_set_show_downloads_in_library( + show: bool, + state: State<'_, crate::config::download_settings::DownloadSettingsState>, +) -> Result<(), String> { + crate::config::download_settings::set_show_downloads_in_library(show, state) +} + +#[tauri::command] +pub fn v2_set_device_sample_rate_limit( + state: State<'_, crate::config::audio_settings::AudioSettingsState>, + device_id: String, + rate: Option, +) -> Result<(), String> { + crate::config::audio_settings::set_device_sample_rate_limit(state, device_id, rate) +} + +#[tauri::command] +pub fn v2_set_force_x11( + state: State<'_, crate::config::graphics_settings::GraphicsSettingsState>, + enabled: bool, +) -> Result<(), String> { + crate::config::graphics_settings::set_force_x11(state, enabled) +} + +#[tauri::command] +pub fn v2_restart_app(app: tauri::AppHandle) { + log::info!("[V2] App restart requested by user"); + app.restart(); +} diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 11b0472f5..be7552a93 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -1241,6 +1241,19 @@ pub fn run() { commands_v2::v2_library_write_album_metadata_to_files, commands_v2::v2_library_refresh_album_metadata_from_files, commands_v2::v2_factory_reset, + commands_v2::v2_set_qobuz_tos_accepted, + commands_v2::v2_set_update_check_on_launch, + commands_v2::v2_set_show_whats_new_on_launch, + commands_v2::v2_acknowledge_release, + commands_v2::v2_ignore_release, + commands_v2::v2_mark_whats_new_shown, + commands_v2::v2_mark_flatpak_welcome_shown, + commands_v2::v2_get_backend_logs, + commands_v2::v2_upload_logs_to_paste, + commands_v2::v2_set_show_downloads_in_library, + commands_v2::v2_set_device_sample_rate_limit, + commands_v2::v2_set_force_x11, + commands_v2::v2_restart_app, // Queue (V2) commands_v2::v2_get_queue_state, commands_v2::v2_set_repeat_mode, diff --git a/src/lib/components/LogsModal.svelte b/src/lib/components/LogsModal.svelte index 21e216c4f..264ab6fba 100644 --- a/src/lib/components/LogsModal.svelte +++ b/src/lib/components/LogsModal.svelte @@ -30,7 +30,7 @@ terminalUrl = ''; consoleUrl = ''; try { - const lines: string[] = await invoke('get_backend_logs'); + const lines: string[] = await invoke('v2_get_backend_logs'); terminalLogs = lines.join('\n'); } catch (e) { terminalLogs = `Error loading logs: ${e}`; @@ -49,7 +49,7 @@ else isUploadingConsole = true; try { - const url: string = await invoke('upload_logs_to_paste', { content }); + const url: string = await invoke('v2_upload_logs_to_paste', { content }); if (tab === 'terminal') terminalUrl = url; else consoleUrl = url; await copyToClipboard(url); diff --git a/src/lib/components/views/SettingsView.svelte b/src/lib/components/views/SettingsView.svelte index ff4a1ae4e..27ed73dac 100644 --- a/src/lib/components/views/SettingsView.svelte +++ b/src/lib/components/views/SettingsView.svelte @@ -1797,7 +1797,7 @@ async function handleShowDownloadsChange(enabled: boolean) { try { - await invoke('set_show_downloads_in_library', { show: enabled }); + await invoke('v2_set_show_downloads_in_library', { show: enabled }); showQobuzDownloadsInLibrary = enabled; // Notify LocalLibraryView to refresh notifyDownloadSettingsChanged(); @@ -2369,7 +2369,7 @@ const deviceId = outputDevice === 'System Default' ? 'default' : device?.id ?? 'default'; try { - await invoke('set_device_sample_rate_limit', { deviceId, rate }); + await invoke('v2_set_device_sample_rate_limit', { deviceId, rate }); console.log('[Audio] Device max sample rate changed:', deviceId, rate); } catch (err) { console.error('[Audio] Failed to change device max sample rate:', err); @@ -2814,7 +2814,7 @@ async function handleForceX11Change(enabled: boolean) { try { - await invoke('set_force_x11', { enabled }); + await invoke('v2_set_force_x11', { enabled }); forceX11 = enabled; showToast($t('settings.developer.restartRequired'), 'info'); } catch (err) { diff --git a/src/lib/services/updatesService.ts b/src/lib/services/updatesService.ts index c3cba014b..f1d1c4c4d 100644 --- a/src/lib/services/updatesService.ts +++ b/src/lib/services/updatesService.ts @@ -154,7 +154,7 @@ async function shouldShowFlatpakWelcome(): Promise { */ export async function markFlatpakWelcomeShown(): Promise { try { - await invoke('mark_flatpak_welcome_shown'); + await invoke('v2_mark_flatpak_welcome_shown'); } catch (error) { console.debug('[Updates] Failed to mark flatpak welcome shown:', error); } diff --git a/src/lib/stores/qobuzLegalStore.ts b/src/lib/stores/qobuzLegalStore.ts index 7e9f3dadb..50bfca4fa 100644 --- a/src/lib/stores/qobuzLegalStore.ts +++ b/src/lib/stores/qobuzLegalStore.ts @@ -27,7 +27,7 @@ export async function loadTosAcceptance(): Promise { if (localValue) { // Migrate to Rust storage try { - await invoke('set_qobuz_tos_accepted', { accepted: true }); + await invoke('v2_set_qobuz_tos_accepted', { accepted: true }); qobuzTosAccepted.set(true); localStorage.removeItem('qbz-qobuz-tos-accepted'); console.log('Migrated ToS acceptance to Rust storage'); @@ -48,7 +48,7 @@ export async function setTosAcceptance(accepted: boolean): Promise { if (!browser) return; try { - await invoke('set_qobuz_tos_accepted', { accepted }); + await invoke('v2_set_qobuz_tos_accepted', { accepted }); qobuzTosAccepted.set(accepted); } catch (err) { console.error('Failed to save ToS acceptance:', err); @@ -72,7 +72,7 @@ if (browser) { lastValue = value; // Persist to Rust (fire and forget, errors logged in setTosAcceptance) - invoke('set_qobuz_tos_accepted', { accepted: value }).catch((err) => { + invoke('v2_set_qobuz_tos_accepted', { accepted: value }).catch((err) => { console.debug('Failed to persist ToS acceptance:', err); }); }); diff --git a/src/lib/stores/titleBarStore.ts b/src/lib/stores/titleBarStore.ts index e3933bc3b..b9ad855bd 100644 --- a/src/lib/stores/titleBarStore.ts +++ b/src/lib/stores/titleBarStore.ts @@ -119,7 +119,7 @@ export async function setUseSystemTitleBar(value: boolean): Promise { } try { await invoke('v2_set_use_system_titlebar', { value }); - await invoke('restart_app'); + await invoke('v2_restart_app'); } catch (e) { console.error('[TitleBarStore] Failed to apply system titlebar change:', e); } diff --git a/src/lib/stores/updatesStore.ts b/src/lib/stores/updatesStore.ts index de20804ea..6b58c7c0c 100644 --- a/src/lib/stores/updatesStore.ts +++ b/src/lib/stores/updatesStore.ts @@ -100,7 +100,7 @@ export async function refreshUpdatePreferences(): Promise { export async function setCheckOnLaunch(enabled: boolean): Promise { try { - await invoke('set_update_check_on_launch', { enabled }); + await invoke('v2_set_update_check_on_launch', { enabled }); preferences.checkOnLaunch = enabled; notify(); } catch (error) { @@ -111,7 +111,7 @@ export async function setCheckOnLaunch(enabled: boolean): Promise { export async function setShowWhatsNewOnLaunch(enabled: boolean): Promise { try { - await invoke('set_show_whats_new_on_launch', { enabled }); + await invoke('v2_set_show_whats_new_on_launch', { enabled }); preferences.showWhatsNewOnLaunch = enabled; notify(); } catch (error) { @@ -139,11 +139,11 @@ export async function fetchReleaseForVersion(version: string): Promise { - await invoke('acknowledge_release', { version }); + await invoke('v2_acknowledge_release', { version }); } export async function ignoreRelease(version: string): Promise { - await invoke('ignore_release', { version }); + await invoke('v2_ignore_release', { version }); } export async function hasWhatsNewBeenShown(version: string): Promise { @@ -157,7 +157,7 @@ export async function hasWhatsNewBeenShown(version: string): Promise { export async function markWhatsNewShown(version: string): Promise { try { - await invoke('mark_whats_new_shown', { version }); + await invoke('v2_mark_whats_new_shown', { version }); } catch (error) { console.debug('[Updates] Failed to mark whats_new_shown:', version, error); }