feat: play similar tracks from the track menu
"Play similar tracks" in any track's menu asks Yandex for tracks like it (about 20) and plays them as a list, saying how many it found or that there were none. The probe example prints history and similar tracks.
This commit is contained in:
1 parent
b099946fb3
commit
52ad4a2e90
4 files changed
+58
-1
No files matched your search
@@ -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::<Vec<_>>()),
|
||||||
|
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::<Vec<_>>()),
|
||||||
|
Err(e) => println!("similar: ERROR {e}"),
|
||||||
|
}
|
||||||
match client.artist_clips(675068).await {
|
match client.artist_clips(675068).await {
|
||||||
Ok(c) => println!(
|
Ok(c) => println!(
|
||||||
"artist clips: {} {:?}",
|
"artist clips: {} {:?}",
|
||||||
|
|||||||
@@ -149,6 +149,9 @@ pub enum Message {
|
|||||||
/// "Next track" in the menu of the track playing now.
|
/// "Next track" in the menu of the track playing now.
|
||||||
SkipFromMenu,
|
SkipFromMenu,
|
||||||
AddToQueue(Track),
|
AddToQueue(Track),
|
||||||
|
/// Plays the tracks Yandex finds similar to this one.
|
||||||
|
PlaySimilar(Track),
|
||||||
|
SimilarLoaded(Track, Result<Vec<Track>, Error>),
|
||||||
AddToPlaylist(PlaylistId, Track),
|
AddToPlaylist(PlaylistId, Track),
|
||||||
CreatePlaylist,
|
CreatePlaylist,
|
||||||
RenamePlaylist,
|
RenamePlaylist,
|
||||||
@@ -507,6 +510,30 @@ impl App {
|
|||||||
self.toast(format!("Added “{}” to the queue", track.full_title()));
|
self.toast(format!("Added “{}” to the queue", track.full_title()));
|
||||||
return self.update(Message::Player(player::Msg::Append(track)));
|
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) => {
|
Message::OpenSheet(sheet) => {
|
||||||
let focus = matches!(sheet, Sheet::NewPlaylist { .. } | Sheet::Rename { .. });
|
let focus = matches!(sheet, Sheet::NewPlaylist { .. } | Sheet::Rename { .. });
|
||||||
self.sheet = Some(sheet);
|
self.sheet = Some(sheet);
|
||||||
@@ -1253,6 +1280,21 @@ mod tests {
|
|||||||
assert!(!app.likes.clips.contains(&1));
|
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]
|
#[test]
|
||||||
fn recently_played_shows_on_home_and_survives_a_failed_reload() {
|
fn recently_played_shows_on_home_and_survives_a_failed_reload() {
|
||||||
let mut app = signed_in();
|
let mut app = signed_in();
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ fn body<'a>(t: &'static Tokens, sheet: &'a Sheet, ctx: Ctx<'a>) -> Element<'a, M
|
|||||||
"Add to playlist…",
|
"Add to playlist…",
|
||||||
Some(Message::OpenSheet(Sheet::Track { track: track.clone(), playlist: *playlist, choosing: true })),
|
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 {
|
if let Some(album) = &track.album {
|
||||||
items.push(item(t, Icon::Disc, "Go to album", Some(Message::Navigate(Route::Album(album.id)))));
|
items.push(item(t, Icon::Disc, "Go to album", Some(Message::Navigate(Route::Album(album.id)))));
|
||||||
@@ -299,7 +300,7 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn menu_items_send_their_action_and_not_close() {
|
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);
|
let messages = click(label);
|
||||||
assert!(messages.first().is_some_and(|m| m.starts_with(expected)), "{label}: {messages:?}");
|
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:?}");
|
assert!(!messages.iter().any(|m| m.starts_with("CloseSheet")), "{label} also closed the sheet: {messages:?}");
|
||||||
|
|||||||
@@ -166,6 +166,12 @@ impl YmClient {
|
|||||||
Ok(tracks.into_iter().filter_map(Track::from_yamuse).collect())
|
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<Vec<Track>> {
|
||||||
|
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.
|
/// 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<u32>) -> Result<Stream> {
|
pub async fn stream(&self, track_id: &str, max_kbps: Option<u32>) -> Result<Stream> {
|
||||||
let variants = self.inner.track_download_info(track_id).await?;
|
let variants = self.inner.track_download_info(track_id).await?;
|
||||||
|
|||||||
Reference in new issue
Block a user