From 613a3f009b8fb9d312a2ea8bc4bbc548bfb5f798 Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Mon, 15 Jun 2026 12:56:33 -0600 Subject: [PATCH] feat(slint/discover): favoriteAlbums row in For You MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add the missing For You "Favorite Albums" carousel (Tauri's favoriteAlbums), the user's favorited albums capped at 18 in favorite order, self-hiding when empty. Reuses the album fav-fetch already done in albums_branch — no new endpoint. - state.slint: ForYouState.favorite-albums: DiscoverSection. - foryou.rs: build_favorite_albums (cap 18, unfiltered) + apply_favorite_albums (mirrors apply_rediscover); wired into albums_branch right after fav_albums resolves, painting in the same layer as rediscover/radio. - artwork.rs: ForYouFavoriteAlbum { index } variant + apply arm. - ForYouView.slint: mount the Carousel after Your Top Artists, before More From Your Library, gated on favorite-albums.albums.length > 0. Titled "Favorite Albums" (not Tauri's literal "More From Your Library") to avoid the label collision with similarAlbums. cc --- crates/qbz-slint/src/artwork.rs | 9 +++++++++ crates/qbz-slint/src/foryou.rs | 18 ++++++++++++++++++ crates/qbz-slint/ui/discover/ForYouView.slint | 11 +++++++++++ crates/qbz-slint/ui/state.slint | 2 ++ 4 files changed, 40 insertions(+) diff --git a/crates/qbz-slint/src/artwork.rs b/crates/qbz-slint/src/artwork.rs index 2e8e1771e..a0cd38230 100644 --- a/crates/qbz-slint/src/artwork.rs +++ b/crates/qbz-slint/src/artwork.rs @@ -129,6 +129,8 @@ pub enum ArtworkTarget { ForYouMoreFromLibrary { index: usize }, /// A card in ForYouState.rediscover.albums[index]. ForYouRediscover { index: usize }, + /// A card in ForYouState.favorite-albums.albums[index]. + ForYouFavoriteAlbum { index: usize }, /// The Spotlight artist portrait. ForYouSpotlightArtist, /// A card in ForYouState.spotlight-albums[index]. @@ -1022,6 +1024,13 @@ fn apply_artwork( model.set_row_data(index, item); } } + ArtworkTarget::ForYouFavoriteAlbum { index } => { + let model = window.global::().get_favorite_albums().albums; + if let Some(mut item) = model.row_data(index) { + item.artwork = image; + model.set_row_data(index, item); + } + } ArtworkTarget::ForYouSpotlightArtist => { window .global::() diff --git a/crates/qbz-slint/src/foryou.rs b/crates/qbz-slint/src/foryou.rs index 12ff96bb9..f61d82e79 100644 --- a/crates/qbz-slint/src/foryou.rs +++ b/crates/qbz-slint/src/foryou.rs @@ -395,6 +395,13 @@ fn build_rediscover(fav_albums: &[Album], recent_ids: &HashSet) -> Vec Vec { + fav_albums.iter().take(18).cloned().map(map_album).collect() +} + /// Radio Stations — album-seeded tiles from recent + favorite albums, /// deduped, capped at 12. fn build_radio( @@ -628,6 +635,16 @@ fn apply_rediscover(weak: &slint::Weak, cache: &ImageCache, cards: Ve crate::artwork::spawn_loads(jobs, weak.clone(), cache.clone()); } +fn apply_favorite_albums(weak: &slint::Weak, cache: &ImageCache, cards: Vec) { + let jobs = album_jobs(&cards, |i| ArtworkTarget::ForYouFavoriteAlbum { index: i }); + let w = weak.clone(); + let _ = w.upgrade_in_event_loop(move |w| { + w.global::() + .set_favorite_albums(section("Favorite Albums", &cards)); + }); + crate::artwork::spawn_loads(jobs, weak.clone(), cache.clone()); +} + fn apply_more_from_library( weak: &slint::Weak, cache: &ImageCache, @@ -787,6 +804,7 @@ pub fn spawn_for_you( let recent_ids = recent_ids.clone(); Box::pin(async move { let fav_albums = fetch_fav_albums(&runtime).await; + apply_favorite_albums(&weak, &cache, build_favorite_albums(&fav_albums)); apply_rediscover(&weak, &cache, build_rediscover(&fav_albums, &recent_ids)); apply_radio(&weak, &cache, build_radio(&recent_album_list, &fav_albums)); diff --git a/crates/qbz-slint/ui/discover/ForYouView.slint b/crates/qbz-slint/ui/discover/ForYouView.slint index 8102c3b0d..51c0f8ea6 100644 --- a/crates/qbz-slint/ui/discover/ForYouView.slint +++ b/crates/qbz-slint/ui/discover/ForYouView.slint @@ -134,6 +134,17 @@ export component ForYouView inherits VerticalLayout { } } + // 6. Favorite Albums. + if ForYouState.favorite-albums.albums.length > 0: Carousel { + section: ForYouState.favorite-albums; + album-clicked(id) => { + root.open-album(id); + } + media-action(kind, id, action) => { + root.media-action(kind, id, action); + } + } + // 5. More From Your Library. if ForYouState.more-from-library.albums.length > 0: Carousel { section: ForYouState.more-from-library; diff --git a/crates/qbz-slint/ui/state.slint b/crates/qbz-slint/ui/state.slint index 7c86e5abc..aa5c46379 100644 --- a/crates/qbz-slint/ui/state.slint +++ b/crates/qbz-slint/ui/state.slint @@ -159,6 +159,8 @@ export global ForYouState { in property release-watch; in property <[RadioStationItem]> radio-stations: []; in property recent-albums; + // Favorite Albums — the user's favorited albums (For You #6). + in property favorite-albums; in property <[SlimItem]> recent-tracks: []; in property <[SlimItem]> top-artists: []; in property <[SlimItem]> artists-to-follow: [];