github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-09-19 16:08:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing merge requests

Browse source
This commit is contained in:
henenq 2019-12-16 11:56:34 +01:00
parent 4f0033e81c
commit 5d2897f6f6
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
metadata/src/lib.rs
View file

@ -130,13 +130,8 @@ pub trait Metadata: Send + Sized + 'static {
fn request_url(id: SpotifyId) -> String;
fn parse(msg: &Self::Message, session: &Session) -> Self;
<<<<<<< HEAD
fn get(session: &Session, id: SpotifyId) -> Box<dyn Future<Item = Self, Error = MercuryError>> {
let uri = format!("{}/{}", Self::base_url(), id.to_base16());
=======
fn get(session: &Session, id: SpotifyId) -> Box<Future<Item = Self, Error = MercuryError>> {
let uri = Self::request_url(id);
>>>>>>> Make standard metadata get handle also playlists
let request = session.mercury().get(uri);
let session = session.clone();