From b930fa11ba389edd16de613786b9eabd5b03e809 Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Sat, 14 Feb 2026 19:46:16 -0600 Subject: [PATCH] fix(v2-commands): return SearchResultsPage for search commands Update search commands to return full SearchResultsPage with pagination info instead of just Vec. This makes V2 commands compatible with the frontend's expected response format. --- crates/qbz-core/src/core.rs | 12 +++++------- src-tauri/src/commands_v2.rs | 8 ++++---- src-tauri/src/core_bridge.rs | 8 ++++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/crates/qbz-core/src/core.rs b/crates/qbz-core/src/core.rs index 5b2bd3c70..2ac693dee 100644 --- a/crates/qbz-core/src/core.rs +++ b/crates/qbz-core/src/core.rs @@ -7,7 +7,8 @@ use std::sync::Arc; use tokio::sync::RwLock; use qbz_models::{ - Album, Artist, CoreEvent, FrontendAdapter, QueueState, RepeatMode, Track, UserSession, + Album, Artist, CoreEvent, FrontendAdapter, QueueState, RepeatMode, SearchResultsPage, Track, + UserSession, }; use qbz_player::QueueManager; use qbz_qobuz::QobuzClient; @@ -156,14 +157,13 @@ impl QbzCore { query: &str, limit: u32, offset: u32, - ) -> Result, CoreError> { + ) -> Result, CoreError> { let client = self.client.read().await; let client = client.as_ref().ok_or(CoreError::NotInitialized)?; client .search_albums(query, limit, offset, None) .await - .map(|r| r.items) .map_err(CoreError::Api) } @@ -173,14 +173,13 @@ impl QbzCore { query: &str, limit: u32, offset: u32, - ) -> Result, CoreError> { + ) -> Result, CoreError> { let client = self.client.read().await; let client = client.as_ref().ok_or(CoreError::NotInitialized)?; client .search_tracks(query, limit, offset, None) .await - .map(|r| r.items) .map_err(CoreError::Api) } @@ -190,14 +189,13 @@ impl QbzCore { query: &str, limit: u32, offset: u32, - ) -> Result, CoreError> { + ) -> Result, CoreError> { let client = self.client.read().await; let client = client.as_ref().ok_or(CoreError::NotInitialized)?; client .search_artists(query, limit, offset, None) .await - .map(|r| r.items) .map_err(CoreError::Api) } diff --git a/src-tauri/src/commands_v2.rs b/src-tauri/src/commands_v2.rs index cd6c92385..07bb71b73 100644 --- a/src-tauri/src/commands_v2.rs +++ b/src-tauri/src/commands_v2.rs @@ -5,7 +5,7 @@ use tauri::State; -use qbz_models::{Album, Artist, QueueState, RepeatMode, Track, UserSession}; +use qbz_models::{Album, Artist, QueueState, RepeatMode, SearchResultsPage, Track, UserSession}; use crate::core_bridge::CoreBridgeState; @@ -90,7 +90,7 @@ pub async fn v2_search_albums( limit: u32, offset: u32, bridge: State<'_, CoreBridgeState>, -) -> Result, String> { +) -> Result, String> { let bridge = bridge.get().await; bridge.search_albums(&query, limit, offset).await } @@ -102,7 +102,7 @@ pub async fn v2_search_tracks( limit: u32, offset: u32, bridge: State<'_, CoreBridgeState>, -) -> Result, String> { +) -> Result, String> { let bridge = bridge.get().await; bridge.search_tracks(&query, limit, offset).await } @@ -114,7 +114,7 @@ pub async fn v2_search_artists( limit: u32, offset: u32, bridge: State<'_, CoreBridgeState>, -) -> Result, String> { +) -> Result, String> { let bridge = bridge.get().await; bridge.search_artists(&query, limit, offset).await } diff --git a/src-tauri/src/core_bridge.rs b/src-tauri/src/core_bridge.rs index 8875c8b24..0207d1e83 100644 --- a/src-tauri/src/core_bridge.rs +++ b/src-tauri/src/core_bridge.rs @@ -8,7 +8,7 @@ use std::sync::Arc; use tokio::sync::RwLock; use qbz_core::QbzCore; -use qbz_models::{Album, Artist, QueueState, RepeatMode, Track, UserSession}; +use qbz_models::{Album, Artist, QueueState, RepeatMode, SearchResultsPage, Track, UserSession}; use crate::tauri_adapter::TauriAdapter; @@ -83,7 +83,7 @@ impl CoreBridge { query: &str, limit: u32, offset: u32, - ) -> Result, String> { + ) -> Result, String> { self.core .search_albums(query, limit, offset) .await @@ -96,7 +96,7 @@ impl CoreBridge { query: &str, limit: u32, offset: u32, - ) -> Result, String> { + ) -> Result, String> { self.core .search_tracks(query, limit, offset) .await @@ -109,7 +109,7 @@ impl CoreBridge { query: &str, limit: u32, offset: u32, - ) -> Result, String> { + ) -> Result, String> { self.core .search_artists(query, limit, offset) .await