github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #783 from roderickvd/remove-fallback-accesspoint

Browse source 
Remove feature gate around `apresolve`

See: hrkfdn/ncspot#535
This commit is contained in:
Roderick van Domburg 2021-06-05 23:53:31 +02:00 committed by GitHub
commit 5764f1f1a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -31,7 +31,6 @@ version = "0.2.0"
[dependencies.librespot-core]
path = "core"
version = "0.2.0"
features = ["apresolve"]
[dependencies.librespot-discovery]
path = "discovery"

7
core/Cargo.toml
View file

@ -23,8 +23,8 @@ futures-util = { version = "0.3", default-features = false, features = ["alloc",
hmac = "0.11"
httparse = "1.3"
http = "0.2"
hyper = { version = "0.14", optional = true, features = ["client", "tcp", "http1"] }
hyper-proxy = { version = "0.9.1", optional = true, default-features = false }
hyper = { version = "0.14", features = ["client", "tcp", "http1"] }
hyper-proxy = { version = "0.9.1", default-features = false }
log = "0.4"
num-bigint = { version = "0.4", features = ["rand"] }
num-integer = "0.1"
@ -52,6 +52,3 @@ vergen = "3.0.4"
[dev-dependencies]
env_logger = "0.8"
tokio = {version = "1.0", features = ["macros"] }
[features]
apresolve = ["hyper", "hyper-proxy"]

3
core/src/apresolve.rs
View file

@ -6,9 +6,8 @@ use hyper_proxy::{Intercept, Proxy, ProxyConnector};
use serde::Deserialize;
use url::Url;
use super::AP_FALLBACK;
const APRESOLVE_ENDPOINT: &str = "http://apresolve.spotify.com:80";
const AP_FALLBACK: &str = "ap.spotify.com:443";
#[derive(Clone, Debug, Deserialize)]
struct ApResolveData {

13
core/src/lib.rs
View file

@ -8,6 +8,7 @@ use librespot_protocol as protocol;
#[macro_use]
mod component;
mod apresolve;
pub mod audio_key;
pub mod authentication;
pub mod cache;
@ -24,15 +25,3 @@ pub mod spotify_id;
#[doc(hidden)]
pub mod util;
pub mod version;
const AP_FALLBACK: &str = "ap.spotify.com:443";
#[cfg(feature = "apresolve")]
mod apresolve;
#[cfg(not(feature = "apresolve"))]
mod apresolve {
pub async fn apresolve(_: Option<&url::Url>, _: Option<u16>) -> String {
return super::AP_FALLBACK.into();
}
}