evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Sonos join/unjoin in scripts (#13248)

Browse source
This commit is contained in:
Anders Melchiorsen 2018-03-16 00:12:43 +01:00 • committed by Paulus Schoutsen
parent d13bcf8412
commit de1ff1e952
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
homeassistant/components/media_player/sonos.py
View file

@ -188,13 +188,18 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
master = [device for device in hass.data[DATA_SONOS].devices master = [device for device in hass.data[DATA_SONOS].devices
if device.entity_id == service.data[ATTR_MASTER]] if device.entity_id == service.data[ATTR_MASTER]]
if master: if master:
master[0].join(devices) with hass.data[DATA_SONOS].topology_lock:
master[0].join(devices)
return
if service.service == SERVICE_UNJOIN:
with hass.data[DATA_SONOS].topology_lock:
for device in devices:
device.unjoin()
return return
for device in devices: for device in devices:
if service.service == SERVICE_UNJOIN: if service.service == SERVICE_SNAPSHOT:
device.unjoin()
elif service.service == SERVICE_SNAPSHOT:
device.snapshot(service.data[ATTR_WITH_GROUP]) device.snapshot(service.data[ATTR_WITH_GROUP])
elif service.service == SERVICE_RESTORE: elif service.service == SERVICE_RESTORE:
device.restore(service.data[ATTR_WITH_GROUP]) device.restore(service.data[ATTR_WITH_GROUP])
@ -887,16 +892,19 @@ class SonosDevice(MediaPlayerDevice):
def join(self, slaves): def join(self, slaves):
"""Form a group with other players.""" """Form a group with other players."""
if self._coordinator: if self._coordinator:
self.soco.unjoin() self.unjoin()
for slave in slaves: for slave in slaves:
if slave.unique_id != self.unique_id: if slave.unique_id != self.unique_id:
slave.soco.join(self.soco) slave.soco.join(self.soco)
# pylint: disable=protected-access
slave._coordinator = self
@soco_error() @soco_error()
def unjoin(self): def unjoin(self):
"""Unjoin the player from a group.""" """Unjoin the player from a group."""
self.soco.unjoin() self.soco.unjoin()
self._coordinator = None
@soco_error() @soco_error()
def snapshot(self, with_group=True): def snapshot(self, with_group=True):