diff --git a/crates/musyx/examples/api_probe.rs b/crates/musyx/examples/api_probe.rs index ad8b32b..16c7db5 100644 --- a/crates/musyx/examples/api_probe.rs +++ b/crates/musyx/examples/api_probe.rs @@ -97,6 +97,14 @@ async fn main() { } } } + match client.recently_played(10).await { + Ok(r) => println!("recently played: {} {:?}", r.len(), r.iter().take(3).map(|t| t.full_title()).collect::>()), + Err(e) => println!("recently played: ERROR {e}"), + } + match client.similar_tracks("85507364").await { + Ok(s) => println!("similar: {} {:?}", s.len(), s.iter().take(3).map(|t| format!("{} — {}", t.artist_line(), t.title)).collect::>()), + Err(e) => println!("similar: ERROR {e}"), + } match client.artist_clips(675068).await { Ok(c) => println!( "artist clips: {} {:?}", diff --git a/crates/musyx/src/app.rs b/crates/musyx/src/app.rs index 8757123..52e0131 100644 --- a/crates/musyx/src/app.rs +++ b/crates/musyx/src/app.rs @@ -149,6 +149,9 @@ pub enum Message { /// "Next track" in the menu of the track playing now. SkipFromMenu, AddToQueue(Track), + /// Plays the tracks Yandex finds similar to this one. + PlaySimilar(Track), + SimilarLoaded(Track, Result, Error>), AddToPlaylist(PlaylistId, Track), CreatePlaylist, RenamePlaylist, @@ -507,6 +510,30 @@ impl App { self.toast(format!("Added “{}” to the queue", track.full_title())); return self.update(Message::Player(player::Msg::Append(track))); } + Message::PlaySimilar(track) => { + self.sheet = None; + let Some(client) = self.client().cloned() else { return Task::none() }; + self.toast(format!("Finding tracks like “{}”…", track.full_title())); + return Task::future(async move { + let result = client.similar_tracks(&track.id).await; + Message::SimilarLoaded(track, result) + }); + } + Message::SimilarLoaded(track, result) => match result { + Ok(tracks) if tracks.is_empty() => { + self.toast(format!("Yandex has no similar tracks for “{}”", track.full_title())); + } + Ok(tracks) => { + self.toast(format!("Playing {} like “{}”", crate::ui::tracks_word(tracks.len()), track.full_title())); + return self.update(Message::PlayTracks { tracks: tracks.into(), start: 0, shuffle: false }); + } + Err(e) => { + if let Some(task) = self.failed("similar tracks", &e) { + return task; + } + self.toast("Couldn't find similar tracks. Try again."); + } + }, Message::OpenSheet(sheet) => { let focus = matches!(sheet, Sheet::NewPlaylist { .. } | Sheet::Rename { .. }); self.sheet = Some(sheet); @@ -1253,6 +1280,21 @@ mod tests { assert!(!app.likes.clips.contains(&1)); } + #[test] + fn similar_tracks_replace_the_queue_and_say_so() { + let mut app = signed_in(); + let _ = app.update(Message::PlayTracks { tracks: vec![track("a"), track("b")].into(), start: 0, shuffle: false }); + let _ = app.update(Message::OpenSheet(Sheet::Track { track: track("a"), playlist: None, choosing: false })); + let _ = app.update(Message::PlaySimilar(track("a"))); + assert!(app.sheet.is_none()); + let _ = app.update(Message::SimilarLoaded(track("a"), Ok(vec![track("s1"), track("s2")]))); + assert_eq!(app.player.track().unwrap().id, "s1"); + assert_eq!(upcoming(&app), ["s2"]); + assert!(app.toast.as_ref().is_some_and(|(t, _)| t.starts_with("Playing 2 tracks like"))); + let _ = app.update(Message::SimilarLoaded(track("b"), Ok(vec![]))); + assert_eq!(app.player.track().unwrap().id, "s1", "an empty answer leaves playback alone"); + } + #[test] fn recently_played_shows_on_home_and_survives_a_failed_reload() { let mut app = signed_in(); diff --git a/crates/musyx/src/widgets/sheet.rs b/crates/musyx/src/widgets/sheet.rs index 828ebbb..dacb71f 100644 --- a/crates/musyx/src/widgets/sheet.rs +++ b/crates/musyx/src/widgets/sheet.rs @@ -84,6 +84,7 @@ fn body<'a>(t: &'static Tokens, sheet: &'a Sheet, ctx: Ctx<'a>) -> Element<'a, M "Add to playlist…", Some(Message::OpenSheet(Sheet::Track { track: track.clone(), playlist: *playlist, choosing: true })), ), + item(t, Icon::Wave, "Play similar tracks", Some(Message::PlaySimilar(track.clone()))), ]; if let Some(album) = &track.album { items.push(item(t, Icon::Disc, "Go to album", Some(Message::Navigate(Route::Album(album.id))))); @@ -299,7 +300,7 @@ mod tests { #[test] fn menu_items_send_their_action_and_not_close() { - for (label, expected) in [("Play next", "PlayNext("), ("Add to queue", "AddToQueue("), ("Go to album", "Navigate(Album(5))")] { + for (label, expected) in [("Play next", "PlayNext("), ("Add to queue", "AddToQueue("), ("Go to album", "Navigate(Album(5))"), ("Play similar tracks", "PlaySimilar(")] { let messages = click(label); assert!(messages.first().is_some_and(|m| m.starts_with(expected)), "{label}: {messages:?}"); assert!(!messages.iter().any(|m| m.starts_with("CloseSheet")), "{label} also closed the sheet: {messages:?}"); diff --git a/crates/ym-api/src/client.rs b/crates/ym-api/src/client.rs index 46bd23f..7e3aec2 100644 --- a/crates/ym-api/src/client.rs +++ b/crates/ym-api/src/client.rs @@ -166,6 +166,12 @@ impl YmClient { Ok(tracks.into_iter().filter_map(Track::from_yamuse).collect()) } + /// Tracks Yandex considers similar to `track_id` (about 20), best match first. + pub async fn similar_tracks(&self, track_id: &str) -> Result> { + let similar = self.inner.track_similar(track_id).await?; + Ok(similar.similar_tracks.into_iter().filter_map(Track::from_yamuse).collect()) + } + /// Resolves a signed, short-lived audio URL for a track, at most `max_kbps` when set. pub async fn stream(&self, track_id: &str, max_kbps: Option) -> Result { let variants = self.inner.track_download_info(track_id).await?;