From fe85655a6b3f962b464e164164ba05d9d1df7823 Mon Sep 17 00:00:00 2001
From: Henning Mosand Stephansen <henningmosand@outlook.com>
Date: Sat, 28 May 2016 15:20:29 +0200
Subject: [PATCH 1/3] Fixes DIDL metadata for Spotify

---
 lib/sonos/endpoint/a_v_transport.rb | 6 ++++--
 lib/sonos/version.rb                | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/sonos/endpoint/a_v_transport.rb b/lib/sonos/endpoint/a_v_transport.rb
index 5d25a1f..cb9ac8f 100644
--- a/lib/sonos/endpoint/a_v_transport.rb
+++ b/lib/sonos/endpoint/a_v_transport.rb
@@ -144,9 +144,11 @@ def add_spotify_to_queue(opts = {}, position = 0)
 
     # In order for the player to retrieve track duration, artist, album etc
     # we need to pass it some metadata ourselves.
-    didl_metadata = "&lt;DIDL-Lite xmlns:dc=&quot;http://purl.org/dc/elements/1.1/&quot; xmlns:upnp=&quot;urn:schemas-upnp-org:metadata-1-0/upnp/&quot; xmlns:r=&quot;urn:schemas-rinconnetworks-com:metadata-1-0/&quot; xmlns=&quot;urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/&quot;&gt;&lt;item id=&quot;#{rand(10000000..99999999)}spotify%3a#{opts[:type]}%3a#{opts[:id]}&quot; restricted=&quot;true&quot;&gt;&lt;dc:title&gt;&lt;/dc:title&gt;&lt;upnp:class&gt;object.item.audioItem.musicTrack&lt;/upnp:class&gt;&lt;desc id=&quot;cdudn&quot; nameSpace=&quot;urn:schemas-rinconnetworks-com:metadata-1-0/&quot;&gt;SA_RINCON2311_X_#Svc2311-0-Token&lt;/desc&gt;&lt;/item&gt;&lt;/DIDL-Lite&gt;"
+    didl_metadata = <<DIDL
+    lt;DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:r="urn:schemas-rinconnetworks-com:metadata-1-0/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/"&gt;&lt;item id="#{rand(10000000..19999999)}spotify%3a#{opts[:type]}%3a#{opts[:id]}" restricted="true"&gt;&lt;dc:title&gt;&lt;/dc:title&gt;&lt;upnp:class&gt;object.item.audioItem.musicTrack&lt;/upnp:class&gt;&lt;desc id="cdudn" nameSpace="urn:schemas-rinconnetworks-com:metadata-1-0/"&gt;SA_RINCON2311_X_#Svc2311-0-Token&lt;/desc&gt;&lt;/item&gt;&lt;/DIDL-Lite&gt;
+DIDL
 
-    r_id = rand(10000000..99999999)
+    r_id = rand(10000000..19999999)
 
     case opts[:type]
     when /playlist/
diff --git a/lib/sonos/version.rb b/lib/sonos/version.rb
index eefe653..013033d 100644
--- a/lib/sonos/version.rb
+++ b/lib/sonos/version.rb
@@ -1,3 +1,3 @@
 module Sonos
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

From 52ea5f439b4cde8ee26f5e5c1c6c9e9f1b869271 Mon Sep 17 00:00:00 2001
From: Henning Mosand Stephansen <henningmosand@outlook.com>
Date: Sat, 28 May 2016 15:36:59 +0200
Subject: [PATCH 2/3] Fixes metadata did not correctly show up in Sonos

---
 lib/sonos/endpoint/a_v_transport.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sonos/endpoint/a_v_transport.rb b/lib/sonos/endpoint/a_v_transport.rb
index cb9ac8f..ff9e3bb 100644
--- a/lib/sonos/endpoint/a_v_transport.rb
+++ b/lib/sonos/endpoint/a_v_transport.rb
@@ -145,7 +145,7 @@ def add_spotify_to_queue(opts = {}, position = 0)
     # In order for the player to retrieve track duration, artist, album etc
     # we need to pass it some metadata ourselves.
     didl_metadata = <<DIDL
-    lt;DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:r="urn:schemas-rinconnetworks-com:metadata-1-0/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/"&gt;&lt;item id="#{rand(10000000..19999999)}spotify%3a#{opts[:type]}%3a#{opts[:id]}" restricted="true"&gt;&lt;dc:title&gt;&lt;/dc:title&gt;&lt;upnp:class&gt;object.item.audioItem.musicTrack&lt;/upnp:class&gt;&lt;desc id="cdudn" nameSpace="urn:schemas-rinconnetworks-com:metadata-1-0/"&gt;SA_RINCON2311_X_#Svc2311-0-Token&lt;/desc&gt;&lt;/item&gt;&lt;/DIDL-Lite&gt;
+    &lt;DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:r="urn:schemas-rinconnetworks-com:metadata-1-0/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/"&gt;&lt;item id="#{rand(10000000..19999999)}spotify%3a#{opts[:type]}%3a#{opts[:id]}" restricted="true"&gt;&lt;dc:title&gt;&lt;/dc:title&gt;&lt;upnp:class&gt;object.item.audioItem.musicTrack&lt;/upnp:class&gt;&lt;desc id="cdudn" nameSpace="urn:schemas-rinconnetworks-com:metadata-1-0/"&gt;SA_RINCON2311_X_#Svc2311-0-Token&lt;/desc&gt;&lt;/item&gt;&lt;/DIDL-Lite&gt;
 DIDL
 
     r_id = rand(10000000..19999999)

From 6f82e5efa201dc7d5ee5dd9183fd1eedeae9edcc Mon Sep 17 00:00:00 2001
From: Henning Mosand Stephansen <henningmosand@outlook.com>
Date: Sat, 28 May 2016 16:10:45 +0200
Subject: [PATCH 3/3] Changes the UPNP Class based on sonos type

---
 lib/sonos/endpoint/a_v_transport.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/sonos/endpoint/a_v_transport.rb b/lib/sonos/endpoint/a_v_transport.rb
index ff9e3bb..bbc63f5 100644
--- a/lib/sonos/endpoint/a_v_transport.rb
+++ b/lib/sonos/endpoint/a_v_transport.rb
@@ -142,17 +142,13 @@ def add_spotify_to_queue(opts = {}, position = 0)
     return nil if opts[:type] == 'playlist' and opts[:user].nil?
     return nil if opts[:type] =~ /toplist_tracks/ and opts[:region].nil?
 
-    # In order for the player to retrieve track duration, artist, album etc
-    # we need to pass it some metadata ourselves.
-    didl_metadata = <<DIDL
-    &lt;DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:r="urn:schemas-rinconnetworks-com:metadata-1-0/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/"&gt;&lt;item id="#{rand(10000000..19999999)}spotify%3a#{opts[:type]}%3a#{opts[:id]}" restricted="true"&gt;&lt;dc:title&gt;&lt;/dc:title&gt;&lt;upnp:class&gt;object.item.audioItem.musicTrack&lt;/upnp:class&gt;&lt;desc id="cdudn" nameSpace="urn:schemas-rinconnetworks-com:metadata-1-0/"&gt;SA_RINCON2311_X_#Svc2311-0-Token&lt;/desc&gt;&lt;/item&gt;&lt;/DIDL-Lite&gt;
-DIDL
-
     r_id = rand(10000000..19999999)
-
+    upnp_class = 'object.item.audioItem.musicTrack'
+    
     case opts[:type]
     when /playlist/
       uri = "x-rincon-cpcontainer:#{r_id}spotify%3auser%3a#{opts[:user]}%3aplaylist%3a#{opts[:id]}"
+      upnp_class = 'object.container.playlistContainer'
     when /toplist_(tracks)/
       subtype = opts[:type].sub('toplist_', '') # only 'tracks' are supported right now by Sonos.
       uri = "x-rincon-cpcontainer:#{r_id}toplist%2f#{subtype}%2fregion%2f#{opts[:region]}"
@@ -167,6 +163,12 @@ def add_spotify_to_queue(opts = {}, position = 0)
     else
       return nil
     end
+    
+    # In order for the player to retrieve track duration, artist, album etc
+    # we need to pass it some metadata ourselves.
+    didl_metadata = <<DIDL
+    &lt;DIDL-Lite xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/" xmlns:r="urn:schemas-rinconnetworks-com:metadata-1-0/" xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/"&gt;&lt;item id="#{rand(10000000..19999999)}spotify%3a#{opts[:type]}%3a#{opts[:id]}" restricted="true"&gt;&lt;dc:title&gt;&lt;/dc:title&gt;&lt;upnp:class&gt;#{upnp_class}&lt;/upnp:class&gt;&lt;desc id="cdudn" nameSpace="urn:schemas-rinconnetworks-com:metadata-1-0/"&gt;SA_RINCON2311_X_#Svc2311-0-Token&lt;/desc&gt;&lt;/item&gt;&lt;/DIDL-Lite&gt;
+DIDL
 
     add_to_queue(uri, didl_metadata, position)
    end
@@ -261,6 +263,8 @@ def transport_client
   def send_transport_message(name, part = '<Speed>1</Speed>')
     action = "#{TRANSPORT_XMLNS}##{name}"
     message = %Q{<u:#{name} xmlns:u="#{TRANSPORT_XMLNS}"><InstanceID>0</InstanceID>#{part}</u:#{name}>}
+    
+    puts message
     transport_client.call(name, soap_action: action, message: message)
   end
 end