lostecho/ncspot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed MPRIS OpenUri function not respecting ncspot's shuffle setting.

Browse Source
This commit is contained in:
Bettehem
2021-12-01 10:28:40 +02:00
committed by Henrik Friedrichsen
parent 2551cd9528
commit 3808adced6
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mpris.rs
View File

@@ -582,13 +582,14 @@ fn run_dbus_server(
Some(UriType::Album) => { Some(UriType::Album) => {
if let Some(a) = spotify.api.album(id) { if let Some(a) = spotify.api.album(id) {
if let Some(t) = &Album::from(&a).tracks { if let Some(t) = &Album::from(&a).tracks {
let should_shuffle = queue.get_shuffle();
queue.clear(); queue.clear();
let index = queue.append_next( let index = queue.append_next(
&t.iter() &t.iter()
.map(|track| Playable::Track(track.clone())) .map(|track| Playable::Track(track.clone()))
.collect(), .collect(),
); );
queue.play(index, false, false) queue.play(index, should_shuffle, should_shuffle)
} }
} }
} }
@@ -604,10 +605,11 @@ fn run_dbus_server(
let mut playlist = Playlist::from(&p); let mut playlist = Playlist::from(&p);
let spotify = spotify.clone(); let spotify = spotify.clone();
playlist.load_tracks(spotify); playlist.load_tracks(spotify);
if let Some(t) = &playlist.tracks { if let Some(tracks) = &playlist.tracks {
let should_shuffle = queue.get_shuffle();
queue.clear(); queue.clear();
let index = queue.append_next(&t.iter().cloned().collect()); let index = queue.append_next(&tracks.iter().cloned().collect());
queue.play(index, false, false) queue.play(index, should_shuffle, should_shuffle)
} }
} }
} }
@@ -617,6 +619,7 @@ fn run_dbus_server(
let spotify = spotify.clone(); let spotify = spotify.clone();
show.load_all_episodes(spotify); show.load_all_episodes(spotify);
if let Some(e) = &show.episodes { if let Some(e) = &show.episodes {
let should_shuffle = queue.get_shuffle();
queue.clear(); queue.clear();
let mut ep = e.clone(); let mut ep = e.clone();
ep.reverse(); ep.reverse();
@@ -625,7 +628,7 @@ fn run_dbus_server(
.map(|episode| Playable::Episode(episode.clone())) .map(|episode| Playable::Episode(episode.clone()))
.collect(), .collect(),
); );
queue.play(index, false, false) queue.play(index, should_shuffle, should_shuffle)
} }
} }
} }
@@ -638,9 +641,10 @@ fn run_dbus_server(
} }
Some(UriType::Artist) => { Some(UriType::Artist) => {
if let Some(a) = spotify.api.artist_top_tracks(id) { if let Some(a) = spotify.api.artist_top_tracks(id) {
let should_shuffle = queue.get_shuffle();
queue.clear(); queue.clear();
queue.append_next(&a.iter().map(|track| Playable::Track(track.clone())).collect()); let index = queue.append_next(&a.iter().map(|track| Playable::Track(track.clone())).collect());
queue.play(0, false, false) queue.play(index, should_shuffle, should_shuffle)
} }
} }
None => {} None => {}