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

Fix: do not crash DBus on invalid Spotify URIs

Browse Source 
Fixes #795
This commit is contained in:
Henrik Friedrichsen
2022-04-27 22:38:15 +02:00
parent 52e2a53839
commit d1a44a613f
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/spotify_api.rs
View File

@@ -282,40 +282,33 @@ impl WebApi {
} }
pub fn album(&self, album_id: &str) -> Option<FullAlbum> { pub fn album(&self, album_id: &str) -> Option<FullAlbum> {
self.api_with_retry(|api| api.album(&AlbumId::from_id(album_id).unwrap())) let aid = AlbumId::from_id(album_id).ok()?;
self.api_with_retry(|api| api.album(&aid))
} }
pub fn artist(&self, artist_id: &str) -> Option<FullArtist> { pub fn artist(&self, artist_id: &str) -> Option<FullArtist> {
self.api_with_retry(|api| api.artist(&ArtistId::from_id(artist_id).unwrap())) let aid = ArtistId::from_id(artist_id).ok()?;
self.api_with_retry(|api| api.artist(&aid))
} }
pub fn playlist(&self, playlist_id: &str) -> Option<FullPlaylist> { pub fn playlist(&self, playlist_id: &str) -> Option<FullPlaylist> {
self.api_with_retry(|api| { let pid = PlaylistId::from_id(playlist_id).ok()?;
api.playlist( self.api_with_retry(|api| api.playlist(&pid, None, Some(&Market::FromToken)))
&PlaylistId::from_id(playlist_id).unwrap(),
None,
Some(&Market::FromToken),
)
})
} }
pub fn track(&self, track_id: &str) -> Option<FullTrack> { pub fn track(&self, track_id: &str) -> Option<FullTrack> {
self.api_with_retry(|api| api.track(&TrackId::from_id(track_id).unwrap())) let tid = TrackId::from_id(track_id).ok()?;
self.api_with_retry(|api| api.track(&tid))
} }
pub fn get_show(&self, show_id: &str) -> Option<FullShow> { pub fn get_show(&self, show_id: &str) -> Option<FullShow> {
self.api_with_retry(|api| { let sid = ShowId::from_id(show_id).ok()?;
api.get_a_show(&ShowId::from_id(show_id).unwrap(), Some(&Market::FromToken)) self.api_with_retry(|api| api.get_a_show(&sid, Some(&Market::FromToken)))
})
} }
pub fn episode(&self, episode_id: &str) -> Option<FullEpisode> { pub fn episode(&self, episode_id: &str) -> Option<FullEpisode> {
self.api_with_retry(|api| { let eid = EpisodeId::from_id(episode_id).ok()?;
api.get_an_episode( self.api_with_retry(|api| api.get_an_episode(&eid, Some(&Market::FromToken)))
&EpisodeId::from_id(episode_id).unwrap(),
Some(&Market::FromToken),
)
})
} }
pub fn recommendations( pub fn recommendations(