Skip to content

pick random song from tracklist #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rigellute merged 11 commits into from
Mar 20, 2020
Merged

pick random song from tracklist #339

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b368296
pick random song from playlist
BKitor Mar 16, 2020
122b554
play a random song from the current saved_tracks
BKitor Mar 16, 2020
392db76
shuffle for playlist search
BKitor Mar 16, 2020
9c0430c
shuffle pick from MadeForYou context
BKitor Mar 16, 2020
a1d1844
code review
BKitor Mar 17, 2020
bbff58d
help menu instructions
BKitor Mar 17, 2020
402483d
added help text
BKitor Mar 17, 2020
e63b213
Merge branch 'master' into pick-random-song-with-shift-s
BKitor Mar 17, 2020
8b855d4
replace .unwrap() with and_then
BKitor Mar 19, 2020
d4a639d
Merge branch 'master' into pick-random-song-with-shift-s
BKitor Mar 19, 2020
b93f5a5
update CHANGELOG
BKitor Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
shuffle pick from MadeForYou context
  • Loading branch information
@BKitor
BKitor committed Mar 16, 2020
commit 9c0430ca15b5eff57888bff17971edadb26f1a36
23 changes: 21 additions & 2 deletions src/handlers/track_table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,28 @@ fn play_random_song(app: &mut App) {
Some(thread_rng().gen_range(0, num_tracks)),
))
}
// let rand_playlist_idx = thread_rng().gen_range(0, )
}
TrackTableContext::MadeForYou => {}
TrackTableContext::MadeForYou => {
let (context_uri, track_json) = match app
Comment thread
Rigellute marked this conversation as resolved.
Outdated
.library
.made_for_you_playlists
.get_results(Some(0))
.unwrap()
Copy link
Copy Markdown
Owner

@Rigellute Rigellute Mar 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you able to remove these unwraps? Something like this?

TrackTableContext::MadeForYou => {
  if let Some(playlist) = &app
    .library
    .made_for_you_playlists
    .get_results(Some(0))
    .and_then(|playlist| playlist.items.get(app.made_for_you_index))
  {
    if let Some(num_tracks) = &playlist
      .tracks
      .get("total")
      .and_then(|total| -> Option<usize> { from_value(total.clone()).ok() })
    {
      let uri = Some(playlist.uri.clone());
      app.dispatch(IoEvent::StartPlayback(
        uri,
        None,
        Some(thread_rng().gen_range(0, num_tracks)),
      ));
    }
  };
}

Copy link
Copy Markdown
Contributor Author

@BKitor BKitor Mar 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works great! I didn't know and_then() existed. Thanks for the tip.

.items
.get(app.made_for_you_index)
.unwrap()
{
playlist => (Some(playlist.uri.to_owned()), playlist.tracks.get("total")),
};
if let Some(val) = track_json{
let num_tracks:usize = from_value(val.clone()).unwrap();
app.dispatch(IoEvent::StartPlayback(
context_uri,
None,
Some(thread_rng().gen_range(0, num_tracks))
))
}
}
},
None => {}
};
Expand Down