diff --git a/Cargo.lock b/Cargo.lock index 3de78e4..c6dd9b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -436,9 +436,9 @@ dependencies = [ [[package]] name = "cookie_store" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55b4ac5559dd39f7bdc516f769cb412b151585d8886d216871a8435ed7f862cd" +checksum = "b3f7034c0932dc36f5bd8ec37368d971346809435824f277cb3b8299fc56167c" dependencies = [ "cookie", "idna", @@ -1108,9 +1108,9 @@ checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" [[package]] name = "httpdate" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" @@ -1284,9 +1284,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.107" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" +checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119" [[package]] name = "libdbus-sys" @@ -1734,9 +1734,9 @@ dependencies = [ [[package]] name = "ndk-sys" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d" +checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" [[package]] name = "nix" @@ -2203,9 +2203,9 @@ checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" [[package]] name = "priority-queue" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf40e51ccefb72d42720609e1d3c518de8b5800d723a09358d4a6d6245e1f8ca" +checksum = "00ba480ac08d3cfc40dea10fd466fd2c14dee3ea6fc7873bc4079eda2727caf0" dependencies = [ "autocfg", "indexmap", @@ -2479,9 +2479,9 @@ dependencies = [ [[package]] name = "rspotify" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b25341ebdad57994f7dbf1c0d84ef0aec165adbb2a06977ad4aa0a1433413cd" +checksum = "3cebf0080b78317b3208858454cb744b05ccf296d975f47d72624b8032a05875" dependencies = [ "base64", "chrono", @@ -2500,9 +2500,9 @@ dependencies = [ [[package]] name = "rspotify-http" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a463b12a9b73da057d88be95cdf8f70871f233a2a6f8ef3569a67645c9af5c15" +checksum = "9328d4a8bb0863212dc93fdfc2c8c07eae4c9295f854f4453c25818faf767a10" dependencies = [ "log", "maybe-async", @@ -2513,20 +2513,20 @@ dependencies = [ [[package]] name = "rspotify-macros" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1087d00b5e342189fb541dc1ef2fead32462be9004913dce3edf61bf4d38e817" +checksum = "9fbdbcf984d771b418eafcebecad34f65d02f1db64c8a3db49ec0cf599775b5a" [[package]] name = "rspotify-model" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dadf60b6d8136859dad4d37e1ca0a416f2576265143fd797dd87858067864975" +checksum = "fe4b795e0173f15e732fe14b60dda53530e6e4c3d5b7f9441d02c7740e9168d2" dependencies = [ "chrono", "serde", "serde_json", - "strum 0.22.0", + "strum 0.23.0", "thiserror", ] @@ -2580,9 +2580,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac4581f0fc0e0efd529d069e8189ec7b90b8e7680e21beb35141bdc45f36040" +checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84" dependencies = [ "log", "ring", @@ -2598,9 +2598,9 @@ checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088" [[package]] name = "ryu" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568" [[package]] name = "same-file" @@ -2953,6 +2953,9 @@ name = "strum" version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" +dependencies = [ + "strum_macros 0.23.1", +] [[package]] name = "strum_macros" @@ -2987,9 +2990,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" +checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" dependencies = [ "proc-macro2", "quote", @@ -3729,9 +3732,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1a9373dead84d640ccf5798f2928917e6aa1ab3f130751406bb13e0a9dd9913" +checksum = "a68c7b55f2074489b7e8e07d2d0a6ee6b4f233867a653c664d8020ba53692525" dependencies = [ "byteorder", "enumflags2", @@ -3743,9 +3746,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46ee71e0e88747ec582d290dbe98ff7907ff28770c7a35f16da41e5e6f1f4fa3" +checksum = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9" dependencies = [ "proc-macro-crate 1.1.0", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 6c7d5fa..3814a7d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,7 @@ serde_cbor = "0.11.2" pancurses = { version = "0.17.0", features = ["win32"] } [dependencies.rspotify] -version = "0.11.2" +version = "0.11.3" default-features = false features = ["client-ureq", "ureq-rustls-tls"] diff --git a/src/library.rs b/src/library.rs index 29d680f..144dee2 100644 --- a/src/library.rs +++ b/src/library.rs @@ -439,7 +439,7 @@ impl Library { .items .iter() .enumerate() - .any(|(i, t)| Some(t.track.id.id().to_string()) != store[i].id) + .any(|(i, t)| t.track.id.as_ref().map(|id| id.to_string()) != store[i].id) { return; } diff --git a/src/model/track.rs b/src/model/track.rs index 01356be..4a662ee 100644 --- a/src/model/track.rs +++ b/src/model/track.rs @@ -130,8 +130,8 @@ impl From<&FullTrack> for Track { .collect::>(); Self { - id: Some(track.id.id().to_string()), - uri: track.id.uri(), + id: track.id.as_ref().map(|id| id.to_string()), + uri: track.id.as_ref().map(|id| id.uri()).unwrap_or_default(), title: track.name.clone(), track_number: track.track_number, disc_number: track.disc_number, @@ -142,7 +142,7 @@ impl From<&FullTrack> for Track { album_id: track.album.id.as_ref().map(|a| a.id().to_string()), album_artists, cover_url: track.album.images.get(0).map(|img| img.url.clone()), - url: track.id.url(), + url: track.id.as_ref().map(|id| id.url()).unwrap_or_default(), added_at: None, list_index: 0, } diff --git a/src/spotify_api.rs b/src/spotify_api.rs index 51fe5f7..307e393 100644 --- a/src/spotify_api.rs +++ b/src/spotify_api.rs @@ -562,7 +562,7 @@ impl WebApi { pub fn current_user_saved_albums(&self, offset: u32) -> Option> { self.api_with_retry(|api| { - api.current_user_saved_albums_manual(None, Some(50), Some(offset)) + api.current_user_saved_albums_manual(Some(&Market::FromToken), Some(50), Some(offset)) }) }