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

Fix yamaha uid where host in config is defined (#122676)

Browse Source 
Fix for uid where host in config is defined
This commit is contained in:
Phill (pssc) 2024-07-27 07:23:41 +01:00 committed by GitHub
parent bfbd01a4e5
commit 13c320902e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
homeassistant/components/yamaha/media_player.py
View File

@ -126,8 +126,16 @@ def _discovery(config_info):
for recv in rxv.find(): for recv in rxv.find():
zones.extend(recv.zone_controllers()) zones.extend(recv.zone_controllers())
else: else:
_LOGGER.debug("Config Zones Fallback") _LOGGER.debug("Config Zones")
zones = rxv.RXV(config_info.ctrl_url, config_info.name).zone_controllers() zones = None
for recv in rxv.find():
if recv.ctrl_url == config_info.ctrl_url:
_LOGGER.debug("Config Zones Matched %s", config_info.ctrl_url)
zones = recv.zone_controllers()
break
if not zones:
_LOGGER.debug("Config Zones Fallback")
zones = rxv.RXV(config_info.ctrl_url, config_info.name).zone_controllers()
_LOGGER.debug("Returned _discover zones: %s", zones) _LOGGER.debug("Returned _discover zones: %s", zones)
return zones return zones
@ -153,7 +161,7 @@ async def async_setup_platform(
entities = [] entities = []
for zctrl in zone_ctrls: for zctrl in zone_ctrls:
_LOGGER.info("Receiver zone: %s", zctrl.zone) _LOGGER.debug("Receiver zone: %s", zctrl.zone)
if config_info.zone_ignore and zctrl.zone in config_info.zone_ignore: if config_info.zone_ignore and zctrl.zone in config_info.zone_ignore:
_LOGGER.debug("Ignore receiver zone: %s %s", config_info.name, zctrl.zone) _LOGGER.debug("Ignore receiver zone: %s %s", config_info.name, zctrl.zone)
continue continue
@ -220,7 +228,6 @@ class YamahaDeviceZone(MediaPlayerEntity):
# Since not all receivers will have a serial number and set a unique id # Since not all receivers will have a serial number and set a unique id
# the default name of the integration may not be changed # the default name of the integration may not be changed
# to avoid a breaking change. # to avoid a breaking change.
# Prefix as MusicCast could have used this
self._attr_unique_id = f"{self.zctrl.serial_number}_{self._zone}" self._attr_unique_id = f"{self.zctrl.serial_number}_{self._zone}"
_LOGGER.debug( _LOGGER.debug(
"Receiver zone: %s zone %s uid %s", "Receiver zone: %s zone %s uid %s",
@ -241,7 +248,7 @@ class YamahaDeviceZone(MediaPlayerEntity):
try: try:
self._play_status = self.zctrl.play_status() self._play_status = self.zctrl.play_status()
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError:
_LOGGER.info("Receiver is offline: %s", self._name) _LOGGER.debug("Receiver is offline: %s", self._name)
self._attr_available = False self._attr_available = False
return return
@ -288,11 +295,6 @@ class YamahaDeviceZone(MediaPlayerEntity):
if source not in self._source_ignore if source not in self._source_ignore
) )
@property
def unique_id(self) -> str:
"""Return the unique ID for this media_player."""
return self._attr_unique_id or ""
@property @property
def name(self): def name(self):
"""Return the name of the device.""" """Return the name of the device."""