Skip to content

use track's id of linked_from if exists #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aome510 merged 1 commit into from
Nov 12, 2023
Merged

use track's id of linked_from if exists #286

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions spotify_player/src/state/model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<Self> {
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,
Expand All @@ -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<Self> {
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),
Expand Down