fix(tidal): skipping songs with null album

Author: SilentVoid13

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "sync_dis_boi"
-version = "0.6.1"
+version = "0.6.2"
 edition = "2024"
 license-file = "LICENSE.txt"
 description = "a music streaming platform synchronization tool"

Cargo.toml

@@ -7,7 +7,7 @@ pub struct SpotifyEmptyResponse {}
 #[allow(dead_code)]
 pub struct SpotifyUserResponse {
     pub country: String,
-    pub display_name: String,
+    pub display_name: Option<String>,
     pub email: String,
 }
 
@@ -52,7 +52,7 @@ pub struct SpotifyPlaylistResponse {
     pub id: String,
     pub name: String,
     #[allow(dead_code)]
-    pub public: bool,
+    pub public: Option<bool>,
 }
 
 #[derive(Deserialize, Debug)]

src/spotify/model.rs

@@ -106,10 +106,11 @@ impl TryInto<Song> for SpotifySongResponse {
         let artists = self
             .artists
             .into_iter()
-            .filter(|a| a.id.is_some())
-            .map(|i| Artist {
-                id: Some(i.id.unwrap()),
-                name: i.name,
+            .filter_map(|i| {
+                Some(Artist {
+                    id: Some(i.id?),
+                    name: i.name,
+                })
             })
             .collect();
         let album = Album {

src/spotify/response.rs

@@ -88,7 +88,7 @@ impl TidalApi {
             config.debug,
         )
         .await?;
-        let country_code = me_res.data.attributes.country.unwrap();
+        let country_code = me_res.data.attributes.country.unwrap_or("US".into());
 
         Ok(Self {
             client,

src/tidal/mod.rs

@@ -19,6 +19,7 @@ pub struct TidalOAuthDeviceRes {
 #[serde(rename_all = "camelCase")]
 pub struct TidalPageResponse<T> {
     pub items: Vec<T>,
+    #[allow(dead_code)]
     pub offset: usize,
     pub total_number_of_items: usize,
 }
@@ -41,10 +42,10 @@ pub struct TidalSongItemResponse {
 pub struct TidalSongResponse {
     pub id: usize,
     pub title: String,
-    pub isrc: String,
+    pub isrc: Option<String>,
     pub duration: usize,
     pub artists: Vec<TidalArtistResponse>,
-    pub album: TidalAlbumResponse,
+    pub album: Option<TidalAlbumResponse>,
 }
 
 #[derive(Deserialize, Debug)]

src/tidal/model.rs

@@ -56,7 +56,10 @@ impl TryInto<Songs> for TidalSearchResponse {
             match track.try_into() {
                 Ok(s) => res.push(s),
                 Err(e) => {
-                    error!("failed to parse song in response, skipping it: {}", e);
+                    error!(
+                        "failed to parse song in response, skipping it. error log: `{}`",
+                        e
+                    );
                     continue;
                 }
             }
@@ -81,9 +84,12 @@ impl TryInto<Playlist> for TidalPlaylistResponse {
 impl TryInto<Song> for TidalSongResponse {
     type Error = Error;
     fn try_into(self) -> Result<Song, Self::Error> {
+        let Some(album) = self.album else {
+            return Err(eyre!("{}: missing song album data", self.title));
+        };
         let album = Album {
-            id: Some(self.album.id.to_string()),
-            name: self.album.title,
+            id: Some(album.id.to_string()),
+            name: album.title,
         };
         let artists = self
             .artists
@@ -98,7 +104,7 @@ impl TryInto<Song> for TidalSongResponse {
             source: MusicApiType::Tidal,
             id: self.id.to_string(),
             sid: None,
-            isrc: Some(self.isrc.to_uppercase()),
+            isrc: self.isrc.map(|i| i.to_uppercase()),
             name: self.title,
             album: Some(album),
             artists,
@@ -175,7 +181,9 @@ fn media_data_to_song(data: TidalMediaData, included: &[TidalMediaData]) -> Resu
         if album_rel.len() != 1 {
             return Err(eyre!("invalid song with multiple albums"));
         }
-        let album_rel = album_rel.first().unwrap();
+        let Some(album_rel) = album_rel.first() else {
+            return Err(eyre!("missing song album data"));
+        };
         let album_data = included
             .iter()
             .find(|i| i.id == album_rel.id)
@@ -217,7 +225,7 @@ fn media_data_to_song(data: TidalMediaData, included: &[TidalMediaData]) -> Resu
         source: MusicApiType::Tidal,
         id: data.id,
         sid: None,
-        isrc: Some(data.attributes.isrc.ok_or_eyre("missing song isrc")?),
+        isrc: data.attributes.isrc.map(|i| i.to_uppercase()),
         name: data.attributes.title.ok_or_eyre("missing song title")?,
         album,
         artists,

src/tidal/response.rs

@@ -188,8 +188,7 @@ impl YtMusicApi {
                 .proxy(reqwest::Proxy::all(proxy)?)
                 .danger_accept_invalid_certs(true)
         }
-
-        let client = client.build().unwrap();
+        let client = client.build()?;
 
         Ok(YtMusicApi { client, config })
     }