Add compatability with librespot PR #1622 (and related API changes)

- Update spotify_id_to_playable_id to use SpotifyUri enum
- Update lyrics method to extract SpotifyId from SpotifyUri

Related: librespot-org/librespot#1622

Author: OneTrueJASH

spotify_player/src/client/mod.rs

@@ -638,7 +638,11 @@ impl AppClient {
     /// Get lyrics of a given track, return None if no lyrics is available
     pub async fn lyrics(&self, track_id: TrackId<'static>) -> Result<Option<Lyrics>> {
         let session = self.session().await;
-        let id = librespot_core::spotify_id::SpotifyId::from_uri(&track_id.uri())?;
+        let uri = librespot_core::SpotifyUri::from_uri(&track_id.uri())?;
+        let id = match uri {
+            librespot_core::SpotifyUri::Track { id } => id,
+            _ => anyhow::bail!("Expected track URI, got {uri:?}"),
+        };
         match librespot_metadata::Lyrics::get(&session, &id).await {
             Ok(lyrics) => Ok(Some(lyrics.into())),
             Err(err) => {

spotify_player/src/streaming.rs

@@ -3,7 +3,7 @@ use anyhow::Context;
 use librespot_connect::{ConnectConfig, Spirc};
 use librespot_core::authentication::Credentials;
 use librespot_core::Session;
-use librespot_core::{config::DeviceType, spotify_id};
+use librespot_core::{config::DeviceType, SpotifyUri};
 use librespot_playback::mixer::MixerConfig;
 use librespot_playback::{
     audio_backend,
@@ -85,17 +85,17 @@ impl PlayerEvent {
     }
 }
 
-fn spotify_id_to_playable_id(id: spotify_id::SpotifyId) -> anyhow::Result<PlayableId<'static>> {
-    match id.item_type {
-        spotify_id::SpotifyItemType::Track => {
-            let uri = id.to_uri()?;
-            Ok(TrackId::from_uri(&uri)?.into_static().into())
+fn spotify_id_to_playable_id(uri: SpotifyUri) -> anyhow::Result<PlayableId<'static>> {
+    match uri {
+        SpotifyUri::Track { .. } => {
+            let uri_str = uri.to_uri()?;
+            Ok(TrackId::from_uri(&uri_str)?.into_static().into())
         }
-        spotify_id::SpotifyItemType::Episode => {
-            let uri = id.to_uri()?;
-            Ok(EpisodeId::from_uri(&uri)?.into_static().into())
+        SpotifyUri::Episode { .. } => {
+            let uri_str = uri.to_uri()?;
+            Ok(EpisodeId::from_uri(&uri_str)?.into_static().into())
         }
-        _ => anyhow::bail!("unexpected spotify_id {id:?}"),
+        _ => anyhow::bail!("unexpected spotify_uri {uri:?}"),
     }
 }