Skip to content

fix(connect): fall back to index when context unavailable resolving track #1747

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

Open
zeemawn wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(connect): fall back to index when context unavailable resolving track #1747

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 14 additions & 4 deletions connect/src/spirc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1384,12 +1384,22 @@ impl SpircTask {
Some(ref playing_track) => Some(match playing_track {
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)
match self.connect_state.get_context(ContextType::Default) {
Ok(ctx) => ConnectState::find_index_in_context(ctx, |t| &t.uri == uri),
Err(why) => {
warn!("context unavailable when resolving track by URI, using fallback index {fallback_index:?}: {why}");
Ok(fallback_index.unwrap_or_default())
}
}
}
PlayingTrack::Uid(uid) => {
let ctx = self.connect_state.get_context(ContextType::Default)?;
ConnectState::find_index_in_context(ctx, |t| &t.uid == uid)
match self.connect_state.get_context(ContextType::Default) {
Ok(ctx) => ConnectState::find_index_in_context(ctx, |t| &t.uid == uid),
Err(why) => {
warn!("context unavailable when resolving track by UID, using fallback index {fallback_index:?}: {why}");
Ok(fallback_index.unwrap_or_default())
Comment on lines +1399 to +1400
}
}
}
}),
}
Expand Down
Loading