From d47f89c6b2acfad6f36d9ae2689d2dbdf54cf8c1 Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Fri, 20 Feb 2026 21:32:23 -0600 Subject: [PATCH] feat(radio): add RadioResponse model, API method, and v2_create_album_radio command Add /radio/album Qobuz API endpoint support: - RadioResponse struct in models.rs with lenient deserialization - get_radio_album() client method - v2_create_album_radio command that calls the API directly (no RadioPoolBuilder/RadioDb), filters blacklisted artists, populates queue, and sets Radio playback context - Register command in lib.rs invoke handler --- src-tauri/src/api/client.rs | 34 ++++++++++++++++++ src-tauri/src/api/endpoints.rs | 3 ++ src-tauri/src/api/models.rs | 13 +++++++ src-tauri/src/commands_v2.rs | 63 ++++++++++++++++++++++++++++++++++ src-tauri/src/lib.rs | 1 + 5 files changed, 114 insertions(+) diff --git a/src-tauri/src/api/client.rs b/src-tauri/src/api/client.rs index 83d6fee23..df757f713 100644 --- a/src-tauri/src/api/client.rs +++ b/src-tauri/src/api/client.rs @@ -1048,6 +1048,40 @@ impl QobuzClient { Ok(http_response.json().await?) } + /// Fetch radio tracks for an album (`/radio/album`). + pub async fn get_radio_album( + &self, + album_id: &str, + ) -> Result { + let url = endpoints::build_url(paths::RADIO_ALBUM); + + let http_response = self + .http + .get(&url) + .headers(self.authenticated_headers().await?) + .query(&[("album_id", album_id)]) + .send() + .await?; + + let status = http_response.status(); + log::debug!("[API] get_radio_album({}) status={}", album_id, status); + + if !status.is_success() { + log::error!( + "[API] get_radio_album({}) unexpected status={}", + album_id, + status + ); + return Err(ApiError::ApiResponse(format!( + "get_radio_album({}) status {}", + album_id, status + ))); + } + + let response: Value = http_response.json().await?; + Ok(serde_json::from_value(response)?) + } + /// Get playlist by ID (paginates automatically to fetch all tracks) /// /// After the first page, remaining pages are fetched concurrently diff --git a/src-tauri/src/api/endpoints.rs b/src-tauri/src/api/endpoints.rs index 35d34402f..914260928 100644 --- a/src-tauri/src/api/endpoints.rs +++ b/src-tauri/src/api/endpoints.rs @@ -56,6 +56,9 @@ pub mod paths { // Catalog (combined search) pub const CATALOG_SEARCH: &str = "/catalog/search"; + // Radio + pub const RADIO_ALBUM: &str = "/radio/album"; + // Discover (home page content) pub const DISCOVER_INDEX: &str = "/discover/index"; pub const DISCOVER_PLAYLISTS: &str = "/discover/playlists"; diff --git a/src-tauri/src/api/models.rs b/src-tauri/src/api/models.rs index ac0d170b2..1cb78ed86 100644 --- a/src-tauri/src/api/models.rs +++ b/src-tauri/src/api/models.rs @@ -678,6 +678,19 @@ pub struct DynamicSuggestTrack { pub streamable: bool, } +/// Response from `/radio/album` endpoint +#[derive(Debug, Clone, Deserialize)] +pub struct RadioResponse { + #[serde(rename = "type")] + pub radio_type: Option, + pub algorithm: Option, + pub title: Option, + pub duration: Option, + pub track_count: Option, + #[serde(default, deserialize_with = "lenient_page_flexible")] + pub tracks: SearchResultsPage, +} + /// Favorites container #[derive(Debug, Clone, Serialize, Deserialize)] pub struct Favorites { diff --git a/src-tauri/src/commands_v2.rs b/src-tauri/src/commands_v2.rs index e902cb3e0..7349d308d 100644 --- a/src-tauri/src/commands_v2.rs +++ b/src-tauri/src/commands_v2.rs @@ -4311,6 +4311,69 @@ pub async fn v2_create_track_radio( Ok(session_id) } +/// Create album radio using the Qobuz `/radio/album` API endpoint. +/// +/// Unlike artist/track radio (which uses RadioPoolBuilder + RadioDb), +/// album radio calls the Qobuz API directly — the endpoint returns +/// recommended tracks in a single GET response. +#[tauri::command] +pub async fn v2_create_album_radio( + album_id: String, + album_name: String, + state: State<'_, AppState>, + blacklist_state: State<'_, BlacklistState>, + bridge: State<'_, CoreBridgeState>, + runtime: State<'_, RuntimeManagerState>, +) -> Result { + runtime + .manager() + .check_requirements(CommandRequirement::RequiresCoreBridgeAuth) + .await + .map_err(|e| e.to_string())?; + + let client = state.client.read().await.clone(); + let radio_response = client + .get_radio_album(&album_id) + .await + .map_err(|e| format!("Failed to fetch album radio: {}", e))?; + + let tracks: Vec = radio_response + .tracks + .items + .into_iter() + .filter(|track| { + if let Some(ref performer) = track.performer { + !blacklist_state.is_blacklisted(performer.id) + } else { + true + } + }) + .collect(); + + if tracks.is_empty() { + return Err("No radio tracks returned for this album".to_string()); + } + + let queue_tracks: Vec = + tracks.iter().map(track_to_queue_track_from_api).collect(); + let bridge = bridge.get().await; + bridge.set_queue(queue_tracks, Some(0)).await; + + let queue_track_ids: Vec = tracks.iter().map(|track| track.id).collect(); + let context_id = format!("album_radio_{}_{}", album_id, chrono::Utc::now().timestamp()); + let context = PlaybackContext::new( + ContextType::Radio, + context_id.clone(), + album_name, + ContentSource::Qobuz, + queue_track_ids, + 0, + ); + state.context.set_context(context); + + Ok(context_id) +} + fn track_to_queue_track_from_api(track: &crate::api::Track) -> CoreQueueTrack { let artwork_url = track .album diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 2f0ad98dc..f4b1b9e9a 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -836,6 +836,7 @@ pub fn run() { commands_v2::v2_library_set_album_hidden, commands_v2::v2_create_artist_radio, commands_v2::v2_create_track_radio, + commands_v2::v2_create_album_radio, commands_v2::v2_delete_playlist_folder, commands_v2::v2_reorder_playlist_folders, commands_v2::v2_move_playlist_to_folder,