github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

connect: make playing_track optional and handle it correctly

Browse source
This commit is contained in:
Felix Prillwitz 2024-12-17 21:01:35 +01:00
parent f59b43b9c4
commit dfbac73136
No known key found for this signature in database
GPG key ID: DE334B43606D1455
2 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
connect/src/model.rs
View file

@ -9,7 +9,11 @@ pub struct SpircLoadCommand {
pub shuffle: bool,
pub repeat: bool,
pub repeat_track: bool,
pub playing_track: PlayingTrack,
/// Decides the starting position in the given context
///
/// ## Remarks:
/// If none is provided and shuffle true, a random track is played, otherwise the first
pub playing_track: Option<PlayingTrack>,
}
#[derive(Debug)]
@ -19,19 +23,20 @@ pub enum PlayingTrack {
Uid(String),
}
impl From<SkipTo> for PlayingTrack {
fn from(value: SkipTo) -> Self {
impl TryFrom<SkipTo> for PlayingTrack {
type Error = ();
fn try_from(value: SkipTo) -> Result<Self, ()> {
// order of checks is important, as the index can be 0, but still has an uid or uri provided,
// so we only use the index as last resort
if let Some(uri) = value.track_uri {
PlayingTrack::Uri(uri)
Ok(PlayingTrack::Uri(uri))
} else if let Some(uid) = value.track_uid {
PlayingTrack::Uid(uid)
Ok(PlayingTrack::Uid(uid))
} else if let Some(index) = value.track_index {
Ok(PlayingTrack::Index(index))
} else {
PlayingTrack::Index(value.track_index.unwrap_or_else(|| {
warn!("SkipTo didn't provided any point to skip to, falling back to index 0");
0
}))
Err(())
}
}
}

22
connect/src/spirc.rs
View file

@ -918,7 +918,7 @@ impl SpircTask {
context_uri: play.context.uri.clone(),
start_playing: true,
seek_to: play.options.seek_to.unwrap_or_default(),
playing_track: play.options.skip_to.into(),
playing_track: play.options.skip_to.try_into().ok(),
shuffle,
repeat,
repeat_track,
@ -1141,16 +1141,21 @@ impl SpircTask {
debug!("play track <{:?}>", cmd.playing_track);
let index = match cmd.playing_track {
PlayingTrack::Index(i) => i as usize,
let index = cmd.playing_track.map(|p| match p {
PlayingTrack::Index(i) => Ok(i as usize),
PlayingTrack::Uri(uri) => {
let ctx = self.connect_state.get_context(ContextType::Default)?;
ConnectState::find_index_in_context(ctx, |t| t.uri == uri)?
ConnectState::find_index_in_context(ctx, |t| t.uri == uri)
}
PlayingTrack::Uid(uid) => {
let ctx = self.connect_state.get_context(ContextType::Default)?;
ConnectState::find_index_in_context(ctx, |t| t.uid == uid)?
ConnectState::find_index_in_context(ctx, |t| t.uid == uid)
}
});
let index = match index {
Some(value) => Some(value?),
None => None,
};
debug!(
@ -1163,7 +1168,9 @@ impl SpircTask {
self.connect_state.set_repeat_track(cmd.repeat_track);
if cmd.shuffle {
if index.is_none() {
self.connect_state.set_current_track_random()?;
}
if self.context_resolver.has_next() {
self.connect_state.update_queue_revision()
@ -1172,8 +1179,9 @@ impl SpircTask {
self.add_autoplay_resolving_when_required();
}
} else {
self.connect_state.set_current_track(index)?;
self.connect_state.reset_playback_to_position(Some(index))?;
self.connect_state
.set_current_track(index.unwrap_or_default())?;
self.connect_state.reset_playback_to_position(index)?;
self.add_autoplay_resolving_when_required();
}