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

Replace all .filter.map chains with .filter_map

Browse Source
This commit is contained in:
Qluxzz
2021-03-15 23:57:42 +01:00
committed by Henrik Friedrichsen
parent c5e6c2c79a
commit 46899ace8b
6 changed files with 18 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/album.rs
View File

@@ -69,12 +69,7 @@ impl From<&SimplifiedAlbum> for Album {
id: sa.id.clone(),
title: sa.name.clone(),
artists: sa.artists.iter().map(|sa| sa.name.clone()).collect(),
artist_ids: sa
.artists
.iter()
.filter(|a| a.id.is_some())
.map(|sa| sa.id.clone().unwrap())
.collect(),
artist_ids: sa.artists.iter().filter_map(|a| a.id.clone()).collect(),
year: sa
.release_date
.clone()
@@ -105,12 +100,7 @@ impl From<&FullAlbum> for Album {
id: Some(fa.id.clone()),
title: fa.name.clone(),
artists: fa.artists.iter().map(|sa| sa.name.clone()).collect(),
artist_ids: fa
.artists
.iter()
.filter(|a| a.id.is_some())
.map(|sa| sa.id.clone().unwrap())
.collect(),
artist_ids: fa.artists.iter().filter_map(|a| a.id.clone()).collect(),
year: fa.release_date.split('-').next().unwrap().into(),
cover_url: fa.images.get(0).map(|i| i.url.clone()),
url: Some(fa.uri.clone()),
@@ -154,14 +144,10 @@ impl ListItem for Album {
.read()
.unwrap()
.iter()
.filter(|t| t.id().is_some())
.map(|t| t.id().unwrap())
.collect();
let ids: Vec<String> = tracks
.iter()
.filter(|t| t.id.is_some())
.map(|t| t.id.clone().unwrap())
.filter_map(|t| t.id())
.collect();
let ids: Vec<String> = tracks.iter().filter_map(|t| t.id.clone()).collect();
!ids.is_empty() && playing == ids
} else {
false

9
src/artist.rs
View File

@@ -135,14 +135,9 @@ impl ListItem for Artist {
.read()
.unwrap()
.iter()
.filter(|t| t.id().is_some())
.map(|t| t.id().unwrap())
.collect();
let ids: Vec<String> = tracks
.iter()
.filter(|t| t.id.is_some())
.map(|t| t.id.clone().unwrap())
.filter_map(|t| t.id())
.collect();
let ids: Vec<String> = tracks.iter().filter_map(|t| t.id.clone()).collect();
!ids.is_empty() && playing == ids
} else {
false

14
src/library.rs
View File

@@ -551,13 +551,7 @@ impl Library {
if api
&& self
.spotify
.current_user_saved_tracks_add(
tracks
.iter()
.filter(|t| t.id.is_some())
.map(|t| t.id.clone().unwrap())
.collect(),
)
.current_user_saved_tracks_add(tracks.iter().filter_map(|t| t.id.clone()).collect())
.is_none()
{
return;
@@ -591,11 +585,7 @@ impl Library {
&& self
.spotify
.current_user_saved_tracks_delete(
tracks
.iter()
.filter(|t| t.id.is_some())
.map(|t| t.id.clone().unwrap())
.collect(),
tracks.iter().filter_map(|t| t.id.clone()).collect(),
)
.is_none()
{

12
src/playlist.rs
View File

@@ -101,8 +101,7 @@ impl Playlist {
let track_ids: Vec<String> = new_tracks
.to_vec()
.iter()
.filter(|t| t.id.is_some())
.map(|t| t.id.clone().unwrap())
.filter_map(|t| t.id.clone())
.collect();
let mut has_modified = false;
@@ -214,14 +213,9 @@ impl ListItem for Playlist {
.read()
.unwrap()
.iter()
.filter(|t| t.id().is_some())
.map(|t| t.id().unwrap())
.collect();
let ids: Vec<String> = tracks
.iter()
.filter(|t| t.id.is_some())
.map(|t| t.id.clone().unwrap())
.filter_map(|t| t.id())
.collect();
let ids: Vec<String> = tracks.iter().filter_map(|t| t.id.clone()).collect();
!ids.is_empty() && playing == ids
} else {
false

6
src/spotify.rs
View File

@@ -594,11 +594,7 @@ impl Spotify {
pub fn overwrite_playlist(&self, id: &str, tracks: &[Playable]) {
// extract only track IDs
let mut tracks: Vec<String> = tracks
.iter()
.filter(|track| track.id().is_some())
.map(|track| track.id().unwrap())
.collect();
let mut tracks: Vec<String> = tracks.iter().filter_map(|track| track.id()).collect();
// we can only send 100 tracks per request
let mut remainder = if tracks.len() > 100 {

13
src/track.rs
View File

@@ -37,18 +37,17 @@ impl Track {
let artists = track
.artists
.iter()
.map(|ref artist| artist.name.clone())
.map(|artist| artist.name.clone())
.collect::<Vec<String>>();
let artist_ids = track
.artists
.iter()
.filter(|a| a.id.is_some())
.map(|ref artist| artist.id.clone().unwrap())
.filter_map(|a| a.id.clone())
.collect::<Vec<String>>();
let album_artists = album
.artists
.iter()
.map(|ref artist| artist.name.clone())
.map(|artist| artist.name.clone())
.collect::<Vec<String>>();
Self {
@@ -87,8 +86,7 @@ impl From<&SimplifiedTrack> for Track {
let artist_ids = track
.artists
.iter()
.filter(|a| a.id.is_some())
.map(|ref artist| artist.id.clone().unwrap())
.filter_map(|a| a.id.clone())
.collect::<Vec<String>>();
Self {
@@ -121,8 +119,7 @@ impl From<&FullTrack> for Track {
let artist_ids = track
.artists
.iter()
.filter(|a| a.id.is_some())
.map(|ref artist| artist.id.clone().unwrap())
.filter_map(|a| a.id.clone())
.collect::<Vec<String>>();
let album_artists = track
.album