Changeset 142

Timestamp:

2014-01-05 12:41:24 (11 years ago)

Author:

lolodomo

Message:

Fixed: media information for Sirius radio
Changed: new format (reduced size of the value) for the variables SavedQueues?, FavoritesRadios? and Queue

Location:

trunk

Files:

• I_Sonos1.xml (modified) (15 diffs)
• J_Sonos1.js (modified) (10 diffs)

trunk/I_Sonos1.xml ¶

@@ -280 +280 @@
               artist = upnp.decode(didlTable["r:albumArtist"] or didlTable["dc:creator"] or artist)
               album = upnp.decode(didlTable["upnp:album"] or album)
-              if (didlTable["dc:title"] == nil
-                      and didlTable["r:albumArtist"] == nil
-                      and didlTable["r:streamContent"] ~= nil) then
-                  local title2, artist2 = didlTable["r:streamContent"]:match(".*|TITLE ([^|]*)|ARTIST ([^|]*)")
-                  title = upnp.decode(title2 or title)
-                  artist = upnp.decode(artist2 or artist)
+              details = upnp.decode(didlTable["r:streamContent"] or details)
+              local title2, artist2 = details:match(".*|TITLE ([^|]*)|ARTIST ([^|]*)")
+              if (title2 ~= nil) then
+                  title = title2
+              end
+              if (artist2 ~= nil) then
+                  artist = artist2
               end
               if (didlTable["upnp:albumArtURI"] ~= nil) then
                   albumArt = upnp.decode(didlTable["upnp:albumArtURI"])
               end
-              if (artist ~= "" or album ~= "") then
+              if (artist ~= "" and album ~= "") then
                   complement = string.format(" (%s, %s)", artist, album)
+              elseif (artist ~= "") then
+                  complement = string.format(" (%s)", artist)
+              elseif (album ~= "") then
+                  complement = string.format(" (%s)", album)
               end
           elseif (didlTable["upnp:class"] == "object.item.audioItem.audioBroadcast") then
@@ -423 +428 @@
         changed = setData("Volume", "0", device, changed)
         changed = setData("Mute", "0", device, changed)
-        changed = setData("SavedQueues", "<DIDL-Lite></DIDL-Lite>", device, changed)
-        changed = setData("FavoritesRadios", "<DIDL-Lite></DIDL-Lite>", device, changed)
-        changed = setData("Queue", "<DIDL-Lite></DIDL-Lite>", device, changed)
+        changed = setData("SavedQueues", "", device, changed)
+        changed = setData("FavoritesRadios", "", device, changed)
+        changed = setData("Queue", "", device, changed)
         changed = setData("GroupCoordinator", "", device, changed)
         changed = setData("ZonePlayerUUIDsInGroup", "", device, changed)
@@ -623 +628 @@
   end
 
+  local function parseSavedQueues(xml)
+      local result = ""
+      local title, id
+      for title, id in xml:gmatch("<container%s?[^>]->.-<dc:title%s?[^>]->(.-)</dc:title>.-<res%s?[^>]->file:///jffs/settings/savedqueues.rsq#(%d+)</res>.-</container>") do
+          title = upnp.decode(title)
+          result = result .. id .. "@" .. title .. "\n"
+      end
+      return result
+  end
+
+  local function parseFavoritesRadios(xml)
+      local result = ""
+      local title, res
+      for title, res in xml:gmatch("<item%s?[^>]->.-<dc:title%s?[^>]->(.-)</dc:title>.-<res%s?[^>]->(.-)</res>.-</item>") do
+          title = upnp.decode(title)
+          result = result .. res .. "@" .. title .. "\n"
+      end
+      return result
+  end
+
+  local function parseQueue(xml)
+      local result = ""
+      local title
+      for title in xml:gmatch("<item%s?[^>]->.-<dc:title%s?[^>]->(.-)</dc:title>.-</item>") do
+          title = upnp.decode(title)
+          result = result .. title .. "\n"
+      end
+      return result
+  end
+
   local function refreshNow(device, force)
     debug("refreshNow: start")
 
     if (upnp.proxyVersionAtLeast(1) and force == false) then
-        return
+        return ""
     end
 
     local uuid = UUIDs[device]
     if (uuid == nil or uuid == "") then
-        return
+        return ""
     end
 
@@ -646 +681 @@
         if (status ~= true) then
             commsFailure(device, tmp)
-            return
+            return ""
         end
         if (deviceIsOnline(device)) then
@@ -664 +699 @@
         if (status ~= true) then
             commsFailure(device, tmp)
-            return
+            return ""
         end
         changed = setData("TransportState", upnp.extractElement("CurrentTransportState", tmp, ""), device, changed)
@@ -720 +755 @@
         if (status ~= true) then
             commsFailure(device, tmp)
-            return
+            return ""
         end
         changed = setData("Mute", upnp.extractElement("CurrentMute", tmp, ""), device, changed)
@@ -730 +765 @@
 
     -- Sonos queue
-    info = upnp.browseContent(uuid, UPNP_MR_CONTENT_DIRECTORY_SERVICE, "Q:0", false)
+    local queueContent = upnp.browseContent(uuid, UPNP_MR_CONTENT_DIRECTORY_SERVICE, "Q:0", false)
+    info = parseQueue(queueContent)
     changed = setData("Queue", info, device, changed)
 
@@ -736 +772 @@
         setVariableValue(HADEVICE_SID, "LastUpdate", os.time(), device)
     end
+
+    return queueContent
   end
 
@@ -858 +896 @@
         if (device2 ~= nil) then
             cxt[uuid] = {}
-            refreshNow(device2, true)
+            cxt[uuid].Queue = refreshNow(device2, true)
             cxt[uuid].TransportState = dataTable[uuid].TransportState
             cxt[uuid].TransportPlaySpeed = dataTable[uuid].TransportPlaySpeed
@@ -871 +909 @@
             cxt[uuid].Mute = dataTable[uuid].Mute
             cxt[uuid].Volume = dataTable[uuid].Volume
-            cxt[uuid].Queue = dataTable[uuid].Queue
             cxt[uuid].GroupCoordinator = dataTable[uuid].GroupCoordinator
         end
@@ -1033 +1070 @@
         end
     elseif (uri:sub(1, 3) == "SQ:") then
-        uri = getValueFromXML(dataTable[localUUID].SavedQueues, "container", "dc:title", uri:sub(4), "res")
         requireQueuing = true
+        local found = false
+        if (dataTable[localUUID].SavedQueues ~= nil) then
+            local line, id, title
+            for line in dataTable[localUUID].SavedQueues:gmatch("(.-)\n") do
+                id, title = line:match("^(%d+)@(.-)$")
+                if (id ~= nil and title == uri:sub(4)) then
+                    found = true
+                    uri = "file:///jffs/settings/savedqueues.rsq#" .. id
+                    break
+                end
+            end
+        end
+        if (found == false) then
+            uri = nil
+        end
     elseif (uri:sub(1, 38) == "file:///jffs/settings/savedqueues.rsq#") then
         requireQueuing = true
     elseif (uri:sub(1, 3) == "FR:") then
         station = uri:sub(4)
-        uri = getValueFromXML(dataTable[localUUID].FavoritesRadios, "item", "dc:title", station, "res")
+        local found = false
+        if (dataTable[localUUID].FavoritesRadios ~= nil) then
+            local line, res, title
+            for line in dataTable[localUUID].FavoritesRadios:gmatch("(.-)\n") do
+                res, title = line:match("^(.+)@(.-)$")
+                if (res ~= nil and title == uri:sub(4)) then
+                    found = true
+                    uri = res
+                    break
+                end
+            end
+        end
+        if (found == false) then
+            uri = nil
+        end
     elseif (uri:sub(1, 3) == "TR:") then
         serviceId = getSonosServiceId("TuneIn") or "254"
@@ -1046 +1111 @@
     elseif (uri:sub(1, 3) == "SR:") then
         station = uri:sub(4)
-        serviceId = getSonosServiceId("Sirius") or "37"
+        serviceId = getSonosServiceId("SiriusXM") or "37"
         uri = "x-sonosapi-hls:r%3a" .. station .. "?sid=" .. serviceId .. "&flags=288"
-log("Sirius URI: " .. uri)
     elseif (uri:sub(1, 3) == "GZ:") then
         controlByGroup = false
@@ -1069 +1133 @@
                               .. '</item></DIDL-Lite>'
             else
-log("Service name for serviceId: " .. serviceId .. ": " .. service)
                 uriMetaData = '<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/">'
                               .. '<item><dc:title>' .. station .. '</dc:title>'
@@ -1588 +1651 @@
         -- Sonos playlists
         info = upnp.browseContent(uuid, UPNP_MR_CONTENT_DIRECTORY_SERVICE, "SQ:", false)
+        info = parseSavedQueues(info)
         changed = setData("SavedQueues", info, device, changed)
 
         -- Favorites radio stations
         info = upnp.browseContent(uuid, UPNP_MR_CONTENT_DIRECTORY_SERVICE, "R:0/0", false)
+        info = parseFavoritesRadios(info)
         changed = setData("FavoritesRadios", info, device, changed)
     end
@@ -1689 +1754 @@
           -- Sonos playlists
           info = upnp.browseContent(uuid, UPNP_MR_CONTENT_DIRECTORY_SERVICE, "SQ:", false)
+          info = parseSavedQueues(info)
           changed = setData("SavedQueues", info, device, changed)
       elseif (id:find("R:0,") == 1) then
           -- Favorites radio stations
           info = upnp.browseContent(uuid, UPNP_MR_CONTENT_DIRECTORY_SERVICE, "R:0/0", false)
+          info = parseFavoritesRadios(info)
           changed = setData("FavoritesRadios", info, device, changed)
       elseif (id:find("Q:0,") == 1) then
           -- Sonos queue
           info = upnp.browseContent(uuid, UPNP_MR_CONTENT_DIRECTORY_SERVICE, "Q:0", false)
+          info = parseQueue(info)
           changed = setData("Queue", info, device, changed)
       end

trunk/J_Sonos1.js ¶

@@ -133 +133 @@
     html += '<select id="savedQueues"/>';
     html += '<button id="playSQ" type="button" style="margin-left: 10px; background-color:lightgrey; height: 25px; width: 50px" onclick="Sonos_playSQ('+device+');">Play</button>';
-    // html += '<button type="button" style="margin-left: 10px; background-color:lightgrey; height: 25px" onclick="Sonos_enqueueSQ('+device+');">Enqueue</button>';
-    // html += '<button type="button" style="margin-left: 10px; background-color:lightgrey; height: 25px" onclick="Sonos_enqueuePlaySQ('+device+');">Enqueue & Play</button>';
-    // html += '<button type="button" style="margin-left: 10px; background-color:lightgrey; height: 25px" onclick="Sonos_playNextSQ('+device+');">Play next</button>';
-    // html += '<button type="button" style="margin-left: 10px; background-color:lightgrey; height: 25px" onclick="Sonos_replaceQueueSQ('+device+');">Replace queue</button>';
     html += '</td>';
     html += '</tr>';
@@ -329 +325 @@
     var favRadios = get_device_state(device, CONTENT_DIRECTORY_SID, "FavoritesRadios", 1);
     if (favRadios != undefined && favRadios != "") {
-        var xmlFavRadios = Sonos_parseXml(favRadios);
-        if (typeof xmlFavRadios != 'undefined') {
-            var items = xmlFavRadios.getElementsByTagName("item");
-            for (i=0; i<items.length; i++) {
-                var title = Sonos_extractXmlTag(items[i], 'dc:title');
-                if (typeof title != 'undefined') {
-                    html += '<tr>';
-                    html += '<td>Favorite radio "' + title + '"</td>';
-                    html += '<td></td>';
-                    html += '<td>FR:' + title + '</td>';
-                    html += '</tr>';
-                    break;
-                }
-            }
-        }
+        var pos = favRadios.indexOf('\n', 0); 
+        if (pos >= 0) { 
+            var line = favRadios.substring(0, pos);
+            var pos2 = line.indexOf('@');
+            if (pos2 >= 0) {
+                var title = line.substr(pos2+1);
+                html += '<tr>';
+                html += '<td>Favorite radio "' + title + '"</td>';
+                html += '<td></td>';
+                html += '<td>FR:' + title + '</td>';
+                html += '</tr>';
+            }
+        } 
     }
 
     var savedQueues = get_device_state(device, CONTENT_DIRECTORY_SID, "SavedQueues", 1);
     if (savedQueues != undefined && savedQueues != "") {
-        var xmlSavedQueues = Sonos_parseXml(savedQueues);
-        if (typeof xmlSavedQueues != 'undefined') {
-            var containers = xmlSavedQueues.getElementsByTagName("container");
-            for (i=0; i<containers.length; i++) {
-                var title = Sonos_extractXmlTag(containers[i], 'dc:title');
-                var value = Sonos_extractXmlTag(containers[i], 'res');
-                if (typeof title != 'undefined' && typeof value != 'undefined') {
-                    html += '<tr>';
-                    html += '<td>Sonos playlist "' + title + '"</td>';
-                    html += '<td>' + value + '</td>';
-                    html += '<td>SQ:' + title + '</td>';
-                    html += '</tr>';
-                }
-            }
+        var pos1 = 0;
+        var pos2 = savedQueues.indexOf('\n', pos1); 
+        while (pos2 >= 0) { 
+            var line = savedQueues.substring(pos1, pos2);
+            var pos3 = line.indexOf('@');
+            if (pos3 >= 0) {
+                var value = line.substring(0, pos3);
+                var title = line.substr(pos3+1);
+                html += '<tr>';
+                html += '<td>Sonos playlist "' + title + '"</td>';
+                html += '<td>file:///jffs/settings/savedqueues.rsq#' + value + '</td>';
+                html += '<td>SQ:' + title + '</td>';
+                html += '</tr>';
+            }
+            pos1 = pos2+1;
+            pos2 = savedQueues.indexOf('\n', pos1); 
         }
     }
@@ -586 +582 @@
                     var title = name;
                     if (title.length > 60) {
-                        title = title.substr(0, 59) + '...';
+                        title = title.substr(0, 60) + '...';
                     }
                     html += '<option value="AI:' + name + '">' + title + '</option>';
@@ -601 +597 @@
     var savedQueues = get_device_state(device, CONTENT_DIRECTORY_SID, "SavedQueues", 1);
     if (savedQueues != undefined && savedQueues != "" && savedQueues != Sonos_prevSavedQueues) {
-        var xmlSavedQueues = Sonos_parseXml(savedQueues);
-        if (typeof xmlSavedQueues != 'undefined') {
-            var html = "";
-            var containers = xmlSavedQueues.getElementsByTagName("container");
-            for (i=0; i<containers.length; i++) {
-                var title = Sonos_extractXmlTag(containers[i], 'dc:title');
-                var value = Sonos_extractXmlTag(containers[i], 'res');
-                if (typeof title != 'undefined' && typeof value != 'undefined') {
-                    if (title.length > 60) {
-                        title = title.substr(0, 59) + '...';
-                    }
-                    html += '<option value="' + value + '">' + title + '</option>';
-                }
-            }
-            $('savedQueues').innerHTML = html;
-            if (Sonos_browserIE) {
-                $('savedQueues').outerHTML=$('savedQueues').outerHTML.replace($('savedQueues').innerHTML+'</select>',html+'</select>');
-            }
+        var html = "";
+        var pos1 = 0;
+        var pos2 = savedQueues.indexOf('\n', pos1); 
+        while (pos2 >= 0) { 
+            var line = savedQueues.substring(pos1, pos2);
+            var pos3 = line.indexOf('@');
+            if (pos3 >= 0) {
+                var value = line.substring(0, pos3);
+                var title = line.substr(pos3+1);
+                if (title.length > 60) {
+                    title = title.substr(0, 60) + '...';
+                }
+                html += '<option value="' + value + '">' + title + '</option>';
+            }
+            pos1 = pos2+1;
+            pos2 = savedQueues.indexOf('\n', pos1); 
+        } 
+        $('savedQueues').innerHTML = html;
+        if (Sonos_browserIE) {
+            $('savedQueues').outerHTML=$('savedQueues').outerHTML.replace($('savedQueues').innerHTML+'</select>',html+'</select>');
         }
         Sonos_prevSavedQueues = savedQueues;
@@ -625 +623 @@
     var queue = get_device_state(device, CONTENT_DIRECTORY_SID, "Queue", 1);
     if (queue != undefined && queue != "" && queue != Sonos_prevQueue) {
-        var xmlQueue = Sonos_parseXml(queue);
-        if (typeof xmlQueue != 'undefined') {
-            var html = "";
-            var items = xmlQueue.getElementsByTagName("item");
-            for (i=0; i<items.length; i++) {
-                var title = Sonos_extractXmlTag(items[i], 'dc:title');
-                var artist = Sonos_extractXmlTag(items[i], 'dc:creator');
-                var value = Sonos_extractXmlTag(items[i], 'res');
-                if (typeof title != 'undefined' && typeof value != 'undefined') {
-                    var title2 = title;
-                    if (typeof artist != 'undefined') {
-                        title2 += ' (' + artist + ')';
-                    }
-                    if (title2.length > 50) {
-                        title2 = title2.substr(0, 49) + '...';
-                    }
-                    html += '<option value="' + value + '">' + title2 + '</option>';
-                }
-            }
-            $('queue').innerHTML = html;
-            if (Sonos_browserIE) {
-                $('queue').outerHTML=$('queue').outerHTML.replace($('queue').innerHTML+'</select>',html+'</select>');
-            }
+        var html = "";
+        var pos1 = 0;
+        var pos2 = queue.indexOf('\n', pos1); 
+        while (pos2 >= 0) { 
+            var title = queue.substring(pos1, pos2); 
+            if (title.length > 50) {
+                title = title.substr(0, 50) + '...';
+            }
+            html += '<option>' + title + '</option>';
+            pos1 = pos2+1;
+            pos2 = queue.indexOf('\n', pos1); 
+        } 
+        $('queue').innerHTML = html;
+        if (Sonos_browserIE) {
+            $('queue').outerHTML=$('queue').outerHTML.replace($('queue').innerHTML+'</select>',html+'</select>');
         }
         Sonos_prevQueue = queue;
@@ -654 +644 @@
     var favRadios = get_device_state(device, CONTENT_DIRECTORY_SID, "FavoritesRadios", 1);
     if (favRadios != undefined && favRadios != "" && favRadios != Sonos_prevFavRadios) {
-        var xmlFavRadios = Sonos_parseXml(favRadios);
-        if (typeof xmlFavRadios != 'undefined') {
-            var html = "";
-            var items = xmlFavRadios.getElementsByTagName("item");
-            for (i=0; i<items.length; i++) {
-                var title = Sonos_extractXmlTag(items[i], 'dc:title');
-                if (typeof title != 'undefined') {
-                    var title2 = title;
-                    if (title2.length > 60) {
-                        title2 = title2.substr(0, 59) + '...';
-                    }
-                    html += '<option value="' + title + '">' + title2 + '</option>';
-                }
-            }
-            $('favRadios').innerHTML = html;
-            if (Sonos_browserIE) {
-                $('favRadios').outerHTML=$('favRadios').outerHTML.replace($('favRadios').innerHTML+'</select>',html+'</select>');
-            }
+        var html = "";
+        var pos1 = 0;
+        var pos2 = favRadios.indexOf('\n', pos1); 
+        while (pos2 >= 0) { 
+            var line = favRadios.substring(pos1, pos2);
+            var pos3 = line.indexOf('@');
+            if (pos3 >= 0) {
+                var value = line.substr(pos3+1);
+                var title = value;
+                if (title.length > 60) {
+                    title = title.substr(0, 60) + '...';
+                }
+                html += '<option value="' + value + '">' + title + '</option>';
+            }
+            pos1 = pos2+1;
+            pos2 = favRadios.indexOf('\n', pos1); 
+        } 
+        $('favRadios').innerHTML = html;
+        if (Sonos_browserIE) {
+            $('favRadios').outerHTML=$('favRadios').outerHTML.replace($('favRadios').innerHTML+'</select>',html+'</select>');
         }
         Sonos_prevFavRadios = favRadios;
@@ -906 +898 @@
                     || transportUri.indexOf('x-rincon-mp3radio:', 0) == 0
                     || transportUri.indexOf('x-sonosapi-stream:', 0) == 0
+                    || transportUri.indexOf('x-sonosapi-hls:', 0) == 0
                     || transportUri.indexOf('x-sonosapi-radio:', 0) == 0
                     || transportUri.indexOf('pndrradio:', 0) == 0) {
@@ -912 +905 @@
                         && title != '') {
                     $('titleLabel').innerHTML = 'Stream:';
+                }
+                else if (transportUri.indexOf('x-sonosapi-hls:', 0) == 0 && title != '') {
+                    $('titleLabel').innerHTML = 'Title:';
                 }
                 else if (transportUri.indexOf('x-rincon-stream:', 0) == 0 && title != '') {
@@ -1163 +1159 @@
 {
     if ($('savedQueues').selectedIndex >= 0) {
-        var uri = $('savedQueues').options[$('savedQueues').selectedIndex].value;
+        var uri = 'file:///jffs/settings/savedqueues.rsq#' + $('savedQueues').options[$('savedQueues').selectedIndex].value;
         //$('debug').innerHTML = uri;
         Sonos_callAction(device, SONOS_SID, 'PlayURI', {'URIToPlay':uri} );
@@ -1169 +1165 @@
 }
 
-// function Sonos_enqueueSQ(device)
-// {
-    // if ($('savedQueues').selectedIndex >= 0) {
-        // var uri = $('savedQueues').options[$('savedQueues').selectedIndex].value;
-        // Sonos_callAction(device, SONOS_SID, 'EnqueueURI', {'URIToEnqueue':uri, 'EnqueueMode':'ENQUEUE'} );
-    // }
-// }
-
-// function Sonos_enqueuePlaySQ(device)
-// {
-    // if ($('savedQueues').selectedIndex >= 0) {
-        // var uri = $('savedQueues').options[$('savedQueues').selectedIndex].value;
-        // Sonos_callAction(device, SONOS_SID, 'EnqueueURI', {'URIToEnqueue':uri, 'EnqueueMode':'ENQUEUE_AND_PLAY'} );
-    // }
-// }
-
-// function Sonos_playNextSQ(device)
-// {
-    // if ($('savedQueues').selectedIndex >= 0) {
-        // var uri = $('savedQueues').options[$('savedQueues').selectedIndex].value;
-        // Sonos_callAction(device, SONOS_SID, 'EnqueueURI', {'URIToEnqueue':uri, 'EnqueueMode':'ENQUEUE_AT_NEXT_PLAY'} );
-    // }
-// }
-
-// function Sonos_replaceQueueSQ(device)
-// {
-    // if ($('savedQueues').selectedIndex >= 0) {
-        // var uri = $('savedQueues').options[$('savedQueues').selectedIndex].value;
-        // Sonos_callAction(device, SONOS_SID, 'EnqueueURI', {'URIToEnqueue':uri, 'EnqueueMode':'REPLACE_QUEUE_AND_PLAY'} );
-    // }
-// }
 
 function Sonos_clearQueue(device)