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

Revert #122676 Yamaha discovery (#125216)

Browse Source 
Revert Yamaha discovery
This commit is contained in:
Joost Lekkerkerker 2024-09-06 15:42:56 +02:00 committed by GitHub
parent 73f04e3ede
commit 1e6b6fef7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@
from __future__ import annotations from __future__ import annotations
import contextlib
import logging import logging
from typing import Any from typing import Any
@ -130,34 +129,7 @@ def _discovery(config_info):
zones.extend(recv.zone_controllers()) zones.extend(recv.zone_controllers())
else: else:
_LOGGER.debug("Config Zones") _LOGGER.debug("Config Zones")
zones = None zones = rxv.RXV(config_info.ctrl_url, config_info.name).zone_controllers()
# Fix for upstream issues in rxv.find() with some hardware.
with contextlib.suppress(AttributeError, ValueError):
for recv in rxv.find(DISCOVER_TIMEOUT):
_LOGGER.debug(
"Found Serial %s %s %s",
recv.serial_number,
recv.ctrl_url,
recv.zone,
)
if recv.ctrl_url == config_info.ctrl_url:
_LOGGER.debug(
"Config Zones Matched Serial %s: %s",
recv.ctrl_url,
recv.serial_number,
)
zones = rxv.RXV(
config_info.ctrl_url,
friendly_name=config_info.name,
serial_number=recv.serial_number,
model_name=recv.model_name,
).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