Squeezebox scene fixes (#38214)

* Support for playlist in media_content_id

* Support include playlist index in content_id

* Add media_player.media_stop support to squeezebox

homeassistant/components/squeezebox/manifest.json

@@ -6,7 +6,7 @@
     "@rajlaud"
   ],
   "requirements": [
-    "pysqueezebox==0.2.4"
+    "pysqueezebox==0.3.1"
   ],
   "config_flow": true
 }

homeassistant/components/squeezebox/media_player.py

@@ -1,5 +1,6 @@
 """Support for interfacing to the Logitech SqueezeBox API."""
 import asyncio
+import json
 import logging
 
 from pysqueezebox import Server, async_discover
@@ -10,6 +11,7 @@ from homeassistant.components.media_player import PLATFORM_SCHEMA, MediaPlayerEn
 from homeassistant.components.media_player.const import (
     ATTR_MEDIA_ENQUEUE,
     MEDIA_TYPE_MUSIC,
+    MEDIA_TYPE_PLAYLIST,
     SUPPORT_CLEAR_PLAYLIST,
     SUPPORT_NEXT_TRACK,
     SUPPORT_PAUSE,
@@ -18,6 +20,7 @@ from homeassistant.components.media_player.const import (
     SUPPORT_PREVIOUS_TRACK,
     SUPPORT_SEEK,
     SUPPORT_SHUFFLE_SET,
+    SUPPORT_STOP,
     SUPPORT_TURN_OFF,
     SUPPORT_TURN_ON,
     SUPPORT_VOLUME_MUTE,
@@ -80,6 +83,7 @@ SUPPORT_SQUEEZEBOX = (
     | SUPPORT_PLAY
     | SUPPORT_SHUFFLE_SET
     | SUPPORT_CLEAR_PLAYLIST
+    | SUPPORT_STOP
 )
 
 PLATFORM_SCHEMA = vol.All(
@@ -334,11 +338,20 @@ class SqueezeBoxEntity(MediaPlayerEntity):
     @property
     def media_content_id(self):
         """Content ID of current playing media."""
+        if not self._player.playlist:
+            return None
+        if len(self._player.playlist) > 1:
+            urls = [{"url": track["url"]} for track in self._player.playlist]
+            return json.dumps({"index": self._player.current_index, "urls": urls})
         return self._player.url
 
     @property
     def media_content_type(self):
         """Content type of current playing media."""
+        if not self._player.playlist:
+            return None
+        if len(self._player.playlist) > 1:
+            return MEDIA_TYPE_PLAYLIST
         return MEDIA_TYPE_MUSIC
 
     @property
@@ -424,6 +437,10 @@ class SqueezeBoxEntity(MediaPlayerEntity):
         """Mute (true) or unmute (false) media player."""
         await self._player.async_set_muting(mute)
 
+    async def async_media_stop(self):
+        """Send stop command to media player."""
+        await self._player.async_stop()
+
     async def async_media_play_pause(self):
         """Send pause command to media player."""
         await self._player.async_toggle_pause()
@@ -462,7 +479,12 @@ class SqueezeBoxEntity(MediaPlayerEntity):
         if kwargs.get(ATTR_MEDIA_ENQUEUE):
             cmd = "add"
 
-        await self._player.async_load_url(media_id, cmd)
+        if media_type == MEDIA_TYPE_PLAYLIST:
+            content = json.loads(media_id)
+            await self._player.async_load_playlist(content["urls"], cmd)
+            await self._player.async_index(content["index"])
+        else:
+            await self._player.async_load_url(media_id, cmd)
 
     async def async_set_shuffle(self, shuffle):
         """Enable/disable shuffle mode."""

requirements_all.txt

@@ -1652,7 +1652,7 @@ pysonos==0.0.32
 pyspcwebgw==0.4.0
 
 # homeassistant.components.squeezebox
-pysqueezebox==0.2.4
+pysqueezebox==0.3.1
 
 # homeassistant.components.stiebel_eltron
 pystiebeleltron==0.0.1.dev2

requirements_test_all.txt

@@ -797,7 +797,7 @@ pysonos==0.0.32
 pyspcwebgw==0.4.0
 
 # homeassistant.components.squeezebox
-pysqueezebox==0.2.4
+pysqueezebox==0.3.1
 
 # homeassistant.components.syncthru
 pysyncthru==0.7.0