From 0ae66ee57ca9f4097442d6d8d92858f1b8b73152 Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Tue, 19 May 2026 12:27:57 -0600 Subject: [PATCH] feat(slint): progressive artwork loading for search results The artwork module gains SearchAlbum/Track/Artist/Playlist targets; navigate_search and load-more build cover-download jobs and hand them to spawn_loads. Covers resolve through the shared qbz_cache image cache (disk-backed, never re-downloaded) and apply per row, so a late arrival never resets a list. cc --- crates/qbz-slint/src/artwork.rs | 38 +++++++++++++- crates/qbz-slint/src/main.rs | 8 ++- crates/qbz-slint/src/search.rs | 91 +++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 2 deletions(-) diff --git a/crates/qbz-slint/src/artwork.rs b/crates/qbz-slint/src/artwork.rs index 6a1f62660..298b88197 100644 --- a/crates/qbz-slint/src/artwork.rs +++ b/crates/qbz-slint/src/artwork.rs @@ -12,7 +12,7 @@ use qbz_cache::ImageCacheService; use slint::{ComponentHandle, Model}; use tokio::sync::Semaphore; -use crate::{AppWindow, HomeState}; +use crate::{AppWindow, HomeState, SearchState}; /// Cap on simultaneous artwork downloads. const MAX_CONCURRENT: usize = 16; @@ -39,6 +39,14 @@ pub enum ArtworkTarget { Recent { idx: usize }, /// A card in `HomeState.recent-albums[idx]`. RecentAlbum { idx: usize }, + /// A row in `SearchState.albums[idx]`. + SearchAlbum { idx: usize }, + /// A row in `SearchState.tracks[idx]`. + SearchTrack { idx: usize }, + /// A row in `SearchState.artists[idx]`. + SearchArtist { idx: usize }, + /// A row in `SearchState.playlists[idx]`. + SearchPlaylist { idx: usize }, } /// An artwork download job: which card, and the image URL. @@ -258,5 +266,33 @@ fn apply_artwork( item.artwork = image; albums.set_row_data(idx, item); } + ArtworkTarget::SearchAlbum { idx } => { + let model = window.global::().get_albums(); + if let Some(mut item) = model.row_data(idx) { + item.artwork = image; + model.set_row_data(idx, item); + } + } + ArtworkTarget::SearchTrack { idx } => { + let model = window.global::().get_tracks(); + if let Some(mut item) = model.row_data(idx) { + item.artwork = image; + model.set_row_data(idx, item); + } + } + ArtworkTarget::SearchArtist { idx } => { + let model = window.global::().get_artists(); + if let Some(mut item) = model.row_data(idx) { + item.artwork = image; + model.set_row_data(idx, item); + } + } + ArtworkTarget::SearchPlaylist { idx } => { + let model = window.global::().get_playlists(); + if let Some(mut item) = model.row_data(idx) { + item.artwork = image; + model.set_row_data(idx, item); + } + } } } diff --git a/crates/qbz-slint/src/main.rs b/crates/qbz-slint/src/main.rs index f481a4209..c364c4497 100644 --- a/crates/qbz-slint/src/main.rs +++ b/crates/qbz-slint/src/main.rs @@ -263,7 +263,7 @@ fn navigate_search( runtime: Arc>, weak: slint::Weak, handle: &tokio::runtime::Handle, - _image_cache: artwork::ImageCache, + image_cache: artwork::ImageCache, query: String, ) { // Capture a version so a slow, stale load cannot overwrite a newer @@ -276,12 +276,14 @@ fn navigate_search( }); match search::load_search(&runtime, &query).await { Ok(data) => { + let jobs = search::artwork_jobs(&data); let _ = weak.upgrade_in_event_loop(move |w| { if search::is_current_version(version) { search::apply_search(&w, data); w.global::().set_loading(false); } }); + artwork::spawn_loads(jobs, weak.clone(), image_cache); } Err(e) => { log::error!("[qbz-slint] search load failed: {e}"); @@ -597,6 +599,7 @@ fn main() -> Result<(), Box> { let runtime = app_runtime.clone(); let weak = window.as_weak(); let handle = tokio_rt.handle().clone(); + let image_cache = image_cache.clone(); window.global::().on_load_more(move |tab| { let Some(w) = weak.upgrade() else { return; @@ -614,12 +617,15 @@ fn main() -> Result<(), Box> { } as u32; let runtime = runtime.clone(); let weak = weak.clone(); + let image_cache = image_cache.clone(); handle.spawn(async move { match search::load_more(&runtime, &query, category, offset).await { Ok(more) => { + let jobs = search::artwork_jobs_for_more(&more, offset as usize); let _ = weak.upgrade_in_event_loop(move |w| { search::append_results(&w, more); }); + artwork::spawn_loads(jobs, weak.clone(), image_cache); } Err(e) => log::error!("[qbz-slint] search load-more failed: {e}"), } diff --git a/crates/qbz-slint/src/search.rs b/crates/qbz-slint/src/search.rs index c72bc46d3..fd7e80041 100644 --- a/crates/qbz-slint/src/search.rs +++ b/crates/qbz-slint/src/search.rs @@ -12,6 +12,7 @@ use qbz_core::FrontendAdapter; use qbz_models::{Album, Artist, MostPopularItem, Playlist, SearchAllResults, Track}; use slint::{ComponentHandle, Model, ModelRc, VecModel}; +use crate::artwork::{ArtworkJob, ArtworkTarget}; use crate::{AlbumCardItem, AppWindow, SearchPlaylistItem, SearchState, SearchTrackItem, SlimItem}; thread_local! { @@ -515,6 +516,96 @@ pub fn append_results(window: &AppWindow, more: MoreRows) { } } +// ==================== Artwork jobs ==================== + +/// Build artwork download jobs for a freshly applied `SearchData` — one +/// per result row that carries a cover URL. +pub fn artwork_jobs(data: &SearchData) -> Vec { + let mut jobs = Vec::new(); + for (idx, row) in data.albums.iter().enumerate() { + if !row.artwork_url.is_empty() { + jobs.push(ArtworkJob { + target: ArtworkTarget::SearchAlbum { idx }, + url: row.artwork_url.clone(), + }); + } + } + for (idx, row) in data.tracks.iter().enumerate() { + if !row.artwork_url.is_empty() { + jobs.push(ArtworkJob { + target: ArtworkTarget::SearchTrack { idx }, + url: row.artwork_url.clone(), + }); + } + } + for (idx, row) in data.artists.iter().enumerate() { + if !row.artwork_url.is_empty() { + jobs.push(ArtworkJob { + target: ArtworkTarget::SearchArtist { idx }, + url: row.artwork_url.clone(), + }); + } + } + for (idx, row) in data.playlists.iter().enumerate() { + if !row.artwork_url.is_empty() { + jobs.push(ArtworkJob { + target: ArtworkTarget::SearchPlaylist { idx }, + url: row.artwork_url.clone(), + }); + } + } + jobs +} + +/// Build artwork jobs for a load-more page, targeting the rows that were +/// just appended (`start` is the index of the first appended row). +pub fn artwork_jobs_for_more(more: &MoreRows, start: usize) -> Vec { + let mut jobs = Vec::new(); + match more { + MoreRows::Albums(rows) => { + for (i, row) in rows.iter().enumerate() { + if !row.artwork_url.is_empty() { + jobs.push(ArtworkJob { + target: ArtworkTarget::SearchAlbum { idx: start + i }, + url: row.artwork_url.clone(), + }); + } + } + } + MoreRows::Tracks(rows) => { + for (i, row) in rows.iter().enumerate() { + if !row.artwork_url.is_empty() { + jobs.push(ArtworkJob { + target: ArtworkTarget::SearchTrack { idx: start + i }, + url: row.artwork_url.clone(), + }); + } + } + } + MoreRows::Artists(rows) => { + for (i, row) in rows.iter().enumerate() { + if !row.artwork_url.is_empty() { + jobs.push(ArtworkJob { + target: ArtworkTarget::SearchArtist { idx: start + i }, + url: row.artwork_url.clone(), + }); + } + } + } + MoreRows::Playlists(rows) => { + for (i, row) in rows.iter().enumerate() { + if !row.artwork_url.is_empty() { + jobs.push(ArtworkJob { + target: ArtworkTarget::SearchPlaylist { idx: start + i }, + url: row.artwork_url.clone(), + }); + } + } + } + } + jobs +} + #[cfg(test)] mod tests { use super::*;