jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-17 02:07:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

sonos set coordinator after join/unjoin (#5584)

Browse Source 
* sonos set coordinator after join/unjoin

* fix unittest
This commit is contained in:
Pascal Vizeli 2017-01-27 15:37:16 +01:00 committed by GitHub
parent 5a7a84fad1
commit 1d4e967106
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
homeassistant/components/media_player/sonos.py
View File

@ -71,7 +71,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
}) })
SONOS_SCHEMA = vol.Schema({ SONOS_SCHEMA = vol.Schema({
ATTR_ENTITY_ID: cv.entity_ids, vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
}) })
SONOS_JOIN_SCHEMA = SONOS_SCHEMA.extend({ SONOS_JOIN_SCHEMA = SONOS_SCHEMA.extend({
@ -923,17 +923,22 @@ class SonosDevice(MediaPlayerDevice):
def join(self, master): def join(self, master):
"""Join the player to a group.""" """Join the player to a group."""
coord = [device.soco_device for device in self.hass.data[DATA_SONOS] coord = [device for device in self.hass.data[DATA_SONOS]
if device.entity_id == master] if device.entity_id == master]
if coord and master != self.entity_id: if coord and master != self.entity_id:
self._player.join(coord[0]) coord = coord[0]
if coord.soco_device.group.coordinator != coord.soco_device:
coord.soco_device.unjoin()
self._player.join(coord.soco_device)
self._coordinator = coord
else: else:
_LOGGER.error("Master not found %s", master) _LOGGER.error("Master not found %s", master)
def unjoin(self): def unjoin(self):
"""Unjoin the player from a group.""" """Unjoin the player from a group."""
self._player.unjoin() self._player.unjoin()
self._coordinator = None
def snapshot(self, with_group=True): def snapshot(self, with_group=True):
"""Snapshot the player.""" """Snapshot the player."""

2
tests/components/media_player/test_sonos.py
View File

@ -251,7 +251,7 @@ class TestSonosMediaPlayer(unittest.TestCase):
device_master = mock.MagicMock() device_master = mock.MagicMock()
device_master.entity_id = "media_player.test" device_master.entity_id = "media_player.test"
device_master.soco_device = device device_master.soco_device = mock.MagicMock()
self.hass.data[sonos.DATA_SONOS].append(device_master) self.hass.data[sonos.DATA_SONOS].append(device_master)
join_mock.return_value = True join_mock.return_value = True