From 4c2b641cadb4adcf1b15ac03e2d94f394c4f135a Mon Sep 17 00:00:00 2001 From: awiouy Date: Mon, 12 Feb 2018 21:02:27 +0100 Subject: [PATCH] core API: move spotify_id to lib.rs --- audio/src/fetch.rs | 4 +- connect/src/spirc.rs | 3 +- core/src/audio_key.rs | 2 +- core/src/cache.rs | 2 +- core/src/lib.rs | 1 + core/src/{util => }/spotify_id.rs | 0 core/src/util/mod.rs | 2 - examples/play.rs | 2 +- metadata/src/cover.rs | 2 +- metadata/src/lib.rs | 116 +++++++++++++++--------------- playback/src/player.rs | 2 +- 11 files changed, 67 insertions(+), 69 deletions(-) rename core/src/{util => }/spotify_id.rs (100%) diff --git a/audio/src/fetch.rs b/audio/src/fetch.rs index f9bd11a9..1455f21b 100644 --- a/audio/src/fetch.rs +++ b/audio/src/fetch.rs @@ -11,7 +11,7 @@ use tempfile::NamedTempFile; use core::channel::{Channel, ChannelData, ChannelError, ChannelHeaders}; use core::session::Session; -use core::util::FileId; +use core::spotify_id::FileId; const CHUNK_SIZE: usize = 0x20000; @@ -115,7 +115,7 @@ impl Future for AudioFileOpenStreaming { if id == 0x3 { let size = BigEndian::read_u32(&data) as usize * 4; let file = self.finish(size); - + return Ok(Async::Ready(file)); } } diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index 704472d7..2b88249c 100644 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -6,7 +6,8 @@ use protobuf::{self, Message}; use core::config::ConnectConfig; use core::mercury::MercuryError; use core::session::Session; -use core::util::{SeqGenerator, SpotifyId}; +use core::spotify_id::SpotifyId; +use core::util::SeqGenerator; use core::version; use protocol; diff --git a/core/src/audio_key.rs b/core/src/audio_key.rs index 2d4fb2ab..021b1dc8 100644 --- a/core/src/audio_key.rs +++ b/core/src/audio_key.rs @@ -5,7 +5,7 @@ use futures::sync::oneshot; use std::collections::HashMap; use std::io::Write; -use util::{FileId, SpotifyId}; +use spotify_id::{FileId, SpotifyId}; use util::SeqGenerator; #[derive(Debug, Hash, PartialEq, Eq, Copy, Clone)] diff --git a/core/src/cache.rs b/core/src/cache.rs index fb59c729..a5f89d5e 100644 --- a/core/src/cache.rs +++ b/core/src/cache.rs @@ -6,7 +6,7 @@ use std::path::Path; use std::path::PathBuf; use authentication::Credentials; -use util::FileId; +use spotify_id::FileId; #[derive(Clone)] pub struct Cache { diff --git a/core/src/lib.rs b/core/src/lib.rs index 207c7656..3c9be131 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -44,5 +44,6 @@ pub mod diffie_hellman; pub mod keymaster; pub mod mercury; pub mod session; +pub mod spotify_id; pub mod util; pub mod version; diff --git a/core/src/util/spotify_id.rs b/core/src/spotify_id.rs similarity index 100% rename from core/src/util/spotify_id.rs rename to core/src/spotify_id.rs diff --git a/core/src/util/mod.rs b/core/src/util/mod.rs index 66f2fe3f..32b058ad 100644 --- a/core/src/util/mod.rs +++ b/core/src/util/mod.rs @@ -6,10 +6,8 @@ use std::mem; use std::ops::{Mul, Rem, Shr}; mod int128; -mod spotify_id; pub use util::int128::u128; -pub use util::spotify_id::{FileId, SpotifyId}; pub fn rand_vec(rng: &mut G, size: usize) -> Vec { rng.gen_iter().take(size).collect() diff --git a/examples/play.rs b/examples/play.rs index 8c88ddbe..2c0b3282 100644 --- a/examples/play.rs +++ b/examples/play.rs @@ -7,7 +7,7 @@ use tokio_core::reactor::Core; use librespot::core::authentication::Credentials; use librespot::playback::config::{PlayerConfig, SessionConfig}; use librespot::core::session::Session; -use librespot::core::util::SpotifyId; +use librespot::core::spotify_id::SpotifyId; use librespot::audio_backend; use librespot::player::Player; diff --git a/metadata/src/cover.rs b/metadata/src/cover.rs index ea3c197b..0ef186a0 100644 --- a/metadata/src/cover.rs +++ b/metadata/src/cover.rs @@ -3,7 +3,7 @@ use std::io::Write; use core::channel::ChannelData; use core::session::Session; -use core::util::FileId; +use core::spotify_id::FileId; pub fn get(session: &Session, file: FileId) -> ChannelData { let (channel_id, channel) = session.channel().allocate(); diff --git a/metadata/src/lib.rs b/metadata/src/lib.rs index 2439ded6..664d9a22 100644 --- a/metadata/src/lib.rs +++ b/metadata/src/lib.rs @@ -13,7 +13,8 @@ use linear_map::LinearMap; use core::mercury::MercuryError; use core::session::Session; -use core::util::{SpotifyId, FileId, StrChunksExt}; +use core::spotify_id::{FileId, SpotifyId}; +use core::util::StrChunksExt; pub use protocol::metadata::AudioFile_Format as FileFormat; @@ -22,7 +23,8 @@ fn countrylist_contains(list: &str, country: &str) -> bool { } fn parse_restrictions<'s, I>(restrictions: I, country: &str, catalogue: &str) -> bool - where I: IntoIterator +where + I: IntoIterator, { let mut forbidden = "".to_string(); let mut has_forbidden = false; @@ -30,9 +32,9 @@ fn parse_restrictions<'s, I>(restrictions: I, country: &str, catalogue: &str) -> let mut allowed = "".to_string(); let mut has_allowed = false; - let rs = restrictions.into_iter().filter(|r| - r.get_catalogue_str().contains(&catalogue.to_owned()) - ); + let rs = restrictions + .into_iter() + .filter(|r| r.get_catalogue_str().contains(&catalogue.to_owned())); for r in rs { if r.has_countries_forbidden() { @@ -46,12 +48,12 @@ fn parse_restrictions<'s, I>(restrictions: I, country: &str, catalogue: &str) -> } } - (has_forbidden || has_allowed) && - (!has_forbidden || !countrylist_contains(forbidden.as_str(), country)) && - (!has_allowed || countrylist_contains(allowed.as_str(), country)) + (has_forbidden || has_allowed) + && (!has_forbidden || !countrylist_contains(forbidden.as_str(), country)) + && (!has_allowed || countrylist_contains(allowed.as_str(), country)) } -pub trait Metadata : Send + Sized + 'static { +pub trait Metadata: Send + Sized + 'static { type Message: protobuf::MessageStatic; fn base_url() -> &'static str; @@ -110,20 +112,20 @@ impl Metadata for Track { let country = session.country(); let artists = msg.get_artist() - .iter() - .filter(|artist| artist.has_gid()) - .map(|artist| SpotifyId::from_raw(artist.get_gid())) - .collect::>(); + .iter() + .filter(|artist| artist.has_gid()) + .map(|artist| SpotifyId::from_raw(artist.get_gid())) + .collect::>(); let files = msg.get_file() - .iter() - .filter(|file| file.has_file_id()) - .map(|file| { - let mut dst = [0u8; 20]; - dst.clone_from_slice(file.get_file_id()); - (file.get_format(), FileId(dst)) - }) - .collect(); + .iter() + .filter(|file| file.has_file_id()) + .map(|file| { + let mut dst = [0u8; 20]; + dst.clone_from_slice(file.get_file_id()); + (file.get_format(), FileId(dst)) + }) + .collect(); Track { id: SpotifyId::from_raw(msg.get_gid()), @@ -133,12 +135,10 @@ impl Metadata for Track { artists: artists, files: files, alternatives: msg.get_alternative() - .iter() - .map(|alt| SpotifyId::from_raw(alt.get_gid())) - .collect(), - available: parse_restrictions(msg.get_restriction(), - &country, - "premium"), + .iter() + .map(|alt| SpotifyId::from_raw(alt.get_gid())) + .collect(), + available: parse_restrictions(msg.get_restriction(), &country, "premium"), } } } @@ -152,28 +152,28 @@ impl Metadata for Album { fn parse(msg: &Self::Message, _: &Session) -> Self { let artists = msg.get_artist() - .iter() - .filter(|artist| artist.has_gid()) - .map(|artist| SpotifyId::from_raw(artist.get_gid())) - .collect::>(); + .iter() + .filter(|artist| artist.has_gid()) + .map(|artist| SpotifyId::from_raw(artist.get_gid())) + .collect::>(); let tracks = msg.get_disc() - .iter() - .flat_map(|disc| disc.get_track()) - .filter(|track| track.has_gid()) - .map(|track| SpotifyId::from_raw(track.get_gid())) - .collect::>(); + .iter() + .flat_map(|disc| disc.get_track()) + .filter(|track| track.has_gid()) + .map(|track| SpotifyId::from_raw(track.get_gid())) + .collect::>(); let covers = msg.get_cover_group() - .get_image() - .iter() - .filter(|image| image.has_file_id()) - .map(|image| { - let mut dst = [0u8; 20]; - dst.clone_from_slice(image.get_file_id()); - FileId(dst) - }) - .collect::>(); + .get_image() + .iter() + .filter(|image| image.has_file_id()) + .map(|image| { + let mut dst = [0u8; 20]; + dst.clone_from_slice(image.get_file_id()); + FileId(dst) + }) + .collect::>(); Album { id: SpotifyId::from_raw(msg.get_gid()), @@ -185,7 +185,6 @@ impl Metadata for Album { } } - impl Metadata for Artist { type Message = protocol::metadata::Artist; @@ -197,23 +196,22 @@ impl Metadata for Artist { let country = session.country(); let top_tracks: Vec = match msg.get_top_track() - .iter() - .find(|tt| !tt.has_country() || countrylist_contains(tt.get_country(), &country)) { - Some(tracks) => { - tracks.get_track() - .iter() - .filter(|track| track.has_gid()) - .map(|track| SpotifyId::from_raw(track.get_gid())) - .collect::>() - }, - None => Vec::new() - }; - + .iter() + .find(|tt| !tt.has_country() || countrylist_contains(tt.get_country(), &country)) + { + Some(tracks) => tracks + .get_track() + .iter() + .filter(|track| track.has_gid()) + .map(|track| SpotifyId::from_raw(track.get_gid())) + .collect::>(), + None => Vec::new(), + }; Artist { id: SpotifyId::from_raw(msg.get_gid()), name: msg.get_name().to_owned(), - top_tracks: top_tracks + top_tracks: top_tracks, } } } diff --git a/playback/src/player.rs b/playback/src/player.rs index 48f7f307..e5497365 100644 --- a/playback/src/player.rs +++ b/playback/src/player.rs @@ -11,7 +11,7 @@ use std::time::Duration; use config::{Bitrate, PlayerConfig}; use core::session::Session; -use core::util::SpotifyId; +use core::spotify_id::SpotifyId; use audio_backend::Sink; use audio::{AudioFile, AudioDecrypt};