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

Gracefully handle tracks without IDs

Browse Source 
As reported in #1231:

Local files in playlists have no IDs. When trying to delete them ncspot crashes
as it tries to extract a track ID.
This commit is contained in:
Henrik Friedrichsen
2023-07-22 13:39:04 +02:00
parent 2786c6ba34
commit 90b4560a2d
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/model/playable.rs
View File

@@ -139,15 +139,17 @@ impl From<&PlayableItem> for Playable {
}
}
impl From<&Playable> for rspotify::prelude::PlayableId<'_> {
impl From<&Playable> for Option<rspotify::prelude::PlayableId<'_>> {
fn from(p: &Playable) -> Self {
match p {
Playable::Track(t) => rspotify::prelude::PlayableId::Track(
rspotify::model::TrackId::from_id(t.id.clone().unwrap()).unwrap(),
),
Playable::Episode(e) => rspotify::prelude::PlayableId::Episode(
rspotify::model::EpisodeId::from_id(e.id.clone()).unwrap(),
),
Playable::Track(t) => {
t.id.clone()
.and_then(|id| rspotify::model::TrackId::from_id(id).ok())
.map(rspotify::prelude::PlayableId::Track)
}
Playable::Episode(e) => rspotify::model::EpisodeId::from_id(e.id.clone())
.map(rspotify::prelude::PlayableId::Episode)
.ok(),
}
}
}