From eb9ab4885f08d5ecee7b4e15530e555e8b016cfe Mon Sep 17 00:00:00 2001
From: HEnquist <henrik.enquist@gmail.com>
Date: Tue, 6 Aug 2019 23:16:30 +0200
Subject: [PATCH] Make standard metadata get handle also playlists

---
 metadata/src/lib.rs | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/metadata/src/lib.rs b/metadata/src/lib.rs
index 1c05f48c..b0a57fba 100644
--- a/metadata/src/lib.rs
+++ b/metadata/src/lib.rs
@@ -124,11 +124,16 @@ impl AudioFiles for Episode {
 pub trait Metadata: Send + Sized + 'static {
     type Message: protobuf::Message;
 
-    fn base_url() -> &'static str;
+    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();
@@ -203,8 +208,8 @@ pub struct Artist {
 impl Metadata for Track {
     type Message = protocol::metadata::Track;
 
-    fn base_url() -> &'static str {
-        "hm://metadata/3/track"
+    fn request_url(id: SpotifyId) -> String {
+        format!("hm://metadata/3/track/{}", id.to_base16())
     }
 
     fn parse(msg: &Self::Message, session: &Session) -> Self {
@@ -248,8 +253,8 @@ impl Metadata for Track {
 impl Metadata for Album {
     type Message = protocol::metadata::Album;
 
-    fn base_url() -> &'static str {
-        "hm://metadata/3/album"
+    fn request_url(id: SpotifyId) -> String {
+        format!("hm://metadata/3/album/{}", id.to_base16())
     }
 
     fn parse(msg: &Self::Message, _: &Session) -> Self {
@@ -293,21 +298,8 @@ impl Metadata for Album {
 impl Metadata for Playlist {
     type Message = protocol::playlist4changes::SelectedListContent;
 
-    fn base_url() -> &'static str {
-        "hm://playlist/v2/playlist"
-    }
-
-    fn get(session: &Session, id: SpotifyId) -> Box<Future<Item = Self, Error = MercuryError>> {
-        let uri = format!("{}/{}", Self::base_url(), id.to_base62());
-        let request = session.mercury().get(uri);
-
-        let session = session.clone();
-        Box::new(request.and_then(move |response| {
-            let data = response.payload.first().expect("Empty payload");
-            let msg: Self::Message = protobuf::parse_from_bytes(data).unwrap();
-
-            Ok(Self::parse(&msg, &session))
-        }))
+    fn request_url(id: SpotifyId) -> String {
+        format!("hm://playlist/v2/playlist/{}", id.to_base62())
     }
 
     fn parse(msg: &Self::Message, _: &Session) -> Self {
@@ -337,8 +329,8 @@ impl Metadata for Playlist {
 impl Metadata for Artist {
     type Message = protocol::metadata::Artist;
 
-    fn base_url() -> &'static str {
-        "hm://metadata/3/artist"
+    fn request_url(id: SpotifyId) -> String {
+        format!("hm://metadata/3/artist/{}", id.to_base16())
     }
 
     fn parse(msg: &Self::Message, session: &Session) -> Self {