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

Use ssdp udn uuid as Samsung TV unique id (#18022)

Browse source
This commit is contained in:
Ville Skyttä 2018-11-02 11:50:07 +02:00 • committed by Johann Kellerman
parent 6eba7c4ff3
commit a4c0c34028
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
homeassistant/components/media_player/samsungtv.py
View file

@ -51,6 +51,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
known_devices = set() known_devices = set()
hass.data[KNOWN_DEVICES_KEY] = known_devices hass.data[KNOWN_DEVICES_KEY] = known_devices
uuid = None
# Is this a manual configuration? # Is this a manual configuration?
if config.get(CONF_HOST) is not None: if config.get(CONF_HOST) is not None:
host = config.get(CONF_HOST) host = config.get(CONF_HOST)
@ -66,6 +67,9 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
port = DEFAULT_PORT port = DEFAULT_PORT
timeout = DEFAULT_TIMEOUT timeout = DEFAULT_TIMEOUT
mac = None mac = None
udn = discovery_info.get('udn')
if udn and udn.startswith('uuid:'):
uuid = udn[len('uuid:'):]
else: else:
_LOGGER.warning("Cannot determine device") _LOGGER.warning("Cannot determine device")
return return
@ -75,7 +79,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
ip_addr = socket.gethostbyname(host) ip_addr = socket.gethostbyname(host)
if ip_addr not in known_devices: if ip_addr not in known_devices:
known_devices.add(ip_addr) known_devices.add(ip_addr)
add_entities([SamsungTVDevice(host, port, name, timeout, mac)]) add_entities([SamsungTVDevice(host, port, name, timeout, mac, uuid)])
_LOGGER.info("Samsung TV %s:%d added as '%s'", host, port, name) _LOGGER.info("Samsung TV %s:%d added as '%s'", host, port, name)
else: else:
_LOGGER.info("Ignoring duplicate Samsung TV %s:%d", host, port) _LOGGER.info("Ignoring duplicate Samsung TV %s:%d", host, port)
@ -84,7 +88,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
class SamsungTVDevice(MediaPlayerDevice): class SamsungTVDevice(MediaPlayerDevice):
"""Representation of a Samsung TV.""" """Representation of a Samsung TV."""
def __init__(self, host, port, name, timeout, mac): def __init__(self, host, port, name, timeout, mac, uuid):
"""Initialize the Samsung device.""" """Initialize the Samsung device."""
from samsungctl import exceptions from samsungctl import exceptions
from samsungctl import Remote from samsungctl import Remote
@ -94,6 +98,7 @@ class SamsungTVDevice(MediaPlayerDevice):
self._remote_class = Remote self._remote_class = Remote
self._name = name self._name = name
self._mac = mac self._mac = mac
self._uuid = uuid
self._wol = wakeonlan self._wol = wakeonlan
# Assume that the TV is not muted # Assume that the TV is not muted
self._muted = False self._muted = False
@ -166,6 +171,11 @@ class SamsungTVDevice(MediaPlayerDevice):
return self._end_of_power_off is not None and \ return self._end_of_power_off is not None and \
self._end_of_power_off > dt_util.utcnow() self._end_of_power_off > dt_util.utcnow()
@property
def unique_id(self) -> str:
"""Return the unique ID of the device."""
return self._uuid
@property @property
def name(self): def name(self):
"""Return the name of the device.""" """Return the name of the device."""

3
tests/components/media_player/test_samsungtv.py
View file

@ -23,7 +23,8 @@ WORKING_CONFIG = {
CONF_NAME: 'fake', CONF_NAME: 'fake',
CONF_PORT: 8001, CONF_PORT: 8001,
CONF_TIMEOUT: 10, CONF_TIMEOUT: 10,
CONF_MAC: 'fake' CONF_MAC: 'fake',
'uuid': None,
} }
DISCOVERY_INFO = { DISCOVERY_INFO = {