From 4e9bfa16a2a57d8e65218b5902be0f4336436dc6 Mon Sep 17 00:00:00 2001 From: Henrik Friedrichsen Date: Thu, 25 Jun 2020 21:09:12 +0200 Subject: [PATCH] Revert "migrate to rspotify 0.9-dev" This reverts commit acc333460bd0eaafe58da242c9dfb153c0ed085c. --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- src/album.rs | 2 +- src/artist.rs | 2 +- src/library.rs | 2 +- src/playlist.rs | 6 ++---- src/spotify.rs | 20 +++++++++++--------- src/track.rs | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d1562ff..fab4b2e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1682,7 +1682,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", - "rspotify 0.9.0 (git+https://github.com/ramsayleung/rspotify?rev=b857a6e685d6b3b43e4ab1802b618cdbb21f3f2c)", + "rspotify 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.111 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", "strum 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2436,8 +2436,8 @@ dependencies = [ [[package]] name = "rspotify" -version = "0.9.0" -source = "git+https://github.com/ramsayleung/rspotify?rev=b857a6e685d6b3b43e4ab1802b618cdbb21f3f2c#b857a6e685d6b3b43e4ab1802b618cdbb21f3f2c" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3765,7 +3765,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum reqwest 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)" = "3b82c9238b305f26f53443e3a4bc8528d64b8d0bee408ec949eb7bf5635ec680" "checksum reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab" "checksum rodio 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d0f961b254e66d147a7b550c78b01308934c97d807a34b417fd0f5a0a0f3a2d" -"checksum rspotify 0.9.0 (git+https://github.com/ramsayleung/rspotify?rev=b857a6e685d6b3b43e4ab1802b618cdbb21f3f2c)" = "" +"checksum rspotify 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a924a166cfb1315c8d9c89148e438a1337feb655ce052fc6dc952af8018bad93" "checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" "checksum rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" diff --git a/Cargo.toml b/Cargo.toml index 53fc5c1..60d8bfb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ librespot-core = "0.1.1" librespot-playback = "0.1.1" librespot-protocol = "0.1.1" log = "0.4.0" -rspotify = { git = "https://github.com/ramsayleung/rspotify", rev = "b857a6e685d6b3b43e4ab1802b618cdbb21f3f2c", features = ["blocking"] } +rspotify = "0.8" serde = "1.0" serde_json = "1.0" toml = "0.5" diff --git a/src/album.rs b/src/album.rs index be24925..a55d705 100644 --- a/src/album.rs +++ b/src/album.rs @@ -2,7 +2,7 @@ use std::fmt; use std::sync::Arc; use chrono::{DateTime, Utc}; -use rspotify::model::album::{FullAlbum, SavedAlbum, SimplifiedAlbum}; +use rspotify::spotify::model::album::{FullAlbum, SavedAlbum, SimplifiedAlbum}; use crate::artist::Artist; use crate::library::Library; diff --git a/src/artist.rs b/src/artist.rs index eb45754..26c24d4 100644 --- a/src/artist.rs +++ b/src/artist.rs @@ -1,7 +1,7 @@ use std::fmt; use std::sync::Arc; -use rspotify::model::artist::{FullArtist, SimplifiedArtist}; +use rspotify::spotify::model::artist::{FullArtist, SimplifiedArtist}; use crate::album::Album; use crate::library::Library; diff --git a/src/library.rs b/src/library.rs index 4a75c4e..a59c97b 100644 --- a/src/library.rs +++ b/src/library.rs @@ -5,7 +5,7 @@ use std::path::PathBuf; use std::sync::{Arc, RwLock, RwLockReadGuard}; use std::thread; -use rspotify::model::playlist::SimplifiedPlaylist; +use rspotify::spotify::model::playlist::SimplifiedPlaylist; use serde::de::DeserializeOwned; use serde::Serialize; diff --git a/src/playlist.rs b/src/playlist.rs index a9cd2d9..8b46dc9 100644 --- a/src/playlist.rs +++ b/src/playlist.rs @@ -1,7 +1,7 @@ use std::iter::Iterator; use std::sync::Arc; -use rspotify::model::playlist::{FullPlaylist, SimplifiedPlaylist}; +use rspotify::spotify::model::playlist::{FullPlaylist, SimplifiedPlaylist}; use crate::library::Library; use crate::queue::Queue; @@ -31,9 +31,7 @@ impl Playlist { let mut tracks_result = spotify.user_playlist_tracks(&self.id, 100, 0); while let Some(ref tracks) = tracks_result.clone() { for listtrack in &tracks.items { - if let Some(track) = &listtrack.track { - collected_tracks.push(track.into()); - } + collected_tracks.push((&listtrack.track).into()); } debug!("got {} tracks", tracks.items.len()); diff --git a/src/spotify.rs b/src/spotify.rs index 12e5e36..5bf0f7d 100644 --- a/src/spotify.rs +++ b/src/spotify.rs @@ -12,15 +12,17 @@ use librespot_playback::config::Bitrate; use librespot_playback::mixer::Mixer; use librespot_playback::player::{Player, PlayerEvent as LibrespotPlayerEvent}; -use rspotify::blocking::client::ApiError; -use rspotify::blocking::client::Spotify as SpotifyAPI; -use rspotify::model::album::{FullAlbum, SavedAlbum, SimplifiedAlbum}; -use rspotify::model::artist::FullArtist; -use rspotify::model::page::{CursorBasedPage, Page}; -use rspotify::model::playlist::{FullPlaylist, PlaylistTrack, SimplifiedPlaylist}; -use rspotify::model::search::{SearchAlbums, SearchArtists, SearchPlaylists, SearchTracks}; -use rspotify::model::track::{FullTrack, SavedTrack}; -use rspotify::model::user::PrivateUser; +use rspotify::spotify::client::ApiError; +use rspotify::spotify::client::Spotify as SpotifyAPI; +use rspotify::spotify::model::album::{FullAlbum, SavedAlbum, SimplifiedAlbum}; +use rspotify::spotify::model::artist::FullArtist; +use rspotify::spotify::model::page::{CursorBasedPage, Page}; +use rspotify::spotify::model::playlist::{FullPlaylist, PlaylistTrack, SimplifiedPlaylist}; +use rspotify::spotify::model::search::{ + SearchAlbums, SearchArtists, SearchPlaylists, SearchTracks, +}; +use rspotify::spotify::model::track::{FullTrack, SavedTrack}; +use rspotify::spotify::model::user::PrivateUser; use failure::Error; diff --git a/src/track.rs b/src/track.rs index e87e8a0..9c1c93e 100644 --- a/src/track.rs +++ b/src/track.rs @@ -2,8 +2,8 @@ use std::fmt; use std::sync::Arc; use chrono::{DateTime, Utc}; -use rspotify::model::album::FullAlbum; -use rspotify::model::track::{FullTrack, SavedTrack, SimplifiedTrack}; +use rspotify::spotify::model::album::FullAlbum; +use rspotify::spotify::model::track::{FullTrack, SavedTrack, SimplifiedTrack}; use crate::album::Album; use crate::artist::Artist;