From 85a203c8d81105d68b072328e4bdde83237d5c39 Mon Sep 17 00:00:00 2001 From: Thang Pham Date: Sat, 11 Nov 2023 20:32:57 -0500 Subject: [PATCH] use track's id of `linked_from` if exists --- spotify_player/src/state/model.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/spotify_player/src/state/model.rs b/spotify_player/src/state/model.rs index 5a59a984..2b2ef9ec 100644 --- a/spotify_player/src/state/model.rs +++ b/spotify_player/src/state/model.rs @@ -254,8 +254,12 @@ impl Track { /// tries to convert from a `rspotify_model::SimplifiedTrack` into `Track` pub fn try_from_simplified_track(track: rspotify_model::SimplifiedTrack) -> Option { if track.is_playable.unwrap_or(true) { + let id = match track.linked_from { + Some(d) => d.id, + None => track.id?, + }; Some(Self { - id: track.id?, + id, name: track.name, artists: from_simplified_artists_to_artists(track.artists), album: None, @@ -271,8 +275,12 @@ impl Track { /// tries to convert from a `rspotify_model::FullTrack` into `Track` pub fn try_from_full_track(track: rspotify_model::FullTrack) -> Option { if track.is_playable.unwrap_or(true) { + let id = match track.linked_from { + Some(d) => d.id, + None => track.id?, + }; Some(Self { - id: track.id?, + id, name: track.name, artists: from_simplified_artists_to_artists(track.artists), album: Album::try_from_simplified_album(track.album),