Clean up clippy warnings
This commit is contained in:
@@ -250,8 +250,7 @@ impl ListItem for Album {
|
|||||||
.tracks
|
.tracks
|
||||||
.as_ref()?
|
.as_ref()?
|
||||||
.iter()
|
.iter()
|
||||||
.map(|t| t.id.as_deref())
|
.filter_map(|t| t.id.as_deref())
|
||||||
.flatten()
|
|
||||||
// spotify allows at max 5 seed items, so choose 4 random tracks...
|
// spotify allows at max 5 seed items, so choose 4 random tracks...
|
||||||
.choose_multiple(&mut thread_rng(), MAX_SEEDS - 1);
|
.choose_multiple(&mut thread_rng(), MAX_SEEDS - 1);
|
||||||
|
|
||||||
|
|||||||
@@ -287,8 +287,7 @@ impl ListItem for Playlist {
|
|||||||
.tracks
|
.tracks
|
||||||
.as_ref()?
|
.as_ref()?
|
||||||
.iter()
|
.iter()
|
||||||
.map(|t| t.id())
|
.filter_map(|t| t.id())
|
||||||
.flatten()
|
|
||||||
// only select unique tracks
|
// only select unique tracks
|
||||||
.collect::<HashSet<_>>()
|
.collect::<HashSet<_>>()
|
||||||
.into_iter()
|
.into_iter()
|
||||||
|
|||||||
@@ -606,7 +606,7 @@ fn run_dbus_server(
|
|||||||
if let Some(tracks) = &playlist.tracks {
|
if let Some(tracks) = &playlist.tracks {
|
||||||
let should_shuffle = queue.get_shuffle();
|
let should_shuffle = queue.get_shuffle();
|
||||||
queue.clear();
|
queue.clear();
|
||||||
let index = queue.append_next(&tracks.to_vec());
|
let index = queue.append_next(tracks);
|
||||||
queue.play(index, should_shuffle, should_shuffle)
|
queue.play(index, should_shuffle, should_shuffle)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ impl<I: ListItem> ListView<I> {
|
|||||||
.map(|t| Playable::Track(t.clone()))
|
.map(|t| Playable::Track(t.clone()))
|
||||||
.collect::<Vec<Playable>>()
|
.collect::<Vec<Playable>>()
|
||||||
});
|
});
|
||||||
if let Some(tracks) = playables.or_else(|| tracks.as_ref()) {
|
if let Some(tracks) = playables.or(tracks.as_ref()) {
|
||||||
let index = self.queue.append_next(tracks);
|
let index = self.queue.append_next(tracks);
|
||||||
self.queue.play(index + self.selected, true, false);
|
self.queue.play(index + self.selected, true, false);
|
||||||
true
|
true
|
||||||
|
|||||||
Reference in New Issue
Block a user