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

cargo fmt/clippy all the things + make them mandatory in CI

Browse Source
This commit is contained in:
Henrik Friedrichsen
2019-04-03 14:13:40 +02:00
parent 25fbdb8bde
commit 1c26c7bcee
9 changed files with 86 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/album.rs
View File

@@ -16,7 +16,7 @@ pub struct Album {
pub year: String,
pub cover_url: Option<String>,
pub url: String,
pub tracks: Option<Vec<Track>>
pub tracks: Option<Vec<Track>>,
}
impl Album {
@@ -26,10 +26,12 @@ impl Album {
}
if let Some(fa) = spotify.full_album(&self.id) {
self.tracks = Some(fa.tracks.items
.iter()
.map(|st| Track::from_simplified_track(&st, &fa))
.collect()
self.tracks = Some(
fa.tracks
.items
.iter()
.map(|st| Track::from_simplified_track(&st, &fa))
.collect(),
);
}
}
@@ -41,30 +43,32 @@ impl From<&SimplifiedAlbum> for Album {
id: sa.id.clone(),
title: sa.name.clone(),
artists: sa.artists.iter().map(|sa| sa.name.clone()).collect(),
year: sa.release_date.split("-").next().unwrap().into(),
year: sa.release_date.split('-').next().unwrap().into(),
cover_url: sa.images.get(0).map(|i| i.url.clone()),
url: sa.uri.clone(),
tracks: None
tracks: None,
}
}
}
impl From<&FullAlbum> for Album {
fn from(fa: &FullAlbum) -> Self {
let tracks = Some(fa.tracks.items
.iter()
.map(|st| Track::from_simplified_track(&st, &fa))
.collect()
let tracks = Some(
fa.tracks
.items
.iter()
.map(|st| Track::from_simplified_track(&st, &fa))
.collect(),
);
Self {
id: fa.id.clone(),
title: fa.name.clone(),
artists: fa.artists.iter().map(|sa| sa.name.clone()).collect(),
year: fa.release_date.split("-").next().unwrap().into(),
year: fa.release_date.split('-').next().unwrap().into(),
cover_url: fa.images.get(0).map(|i| i.url.clone()),
url: fa.uri.clone(),
tracks: tracks
tracks,
}
}
}