James Mackay
75ebeb40b0
The two address fields were the same Shield spelled twice, and every bug in the zeroconf/IP-change path came from keeping them in sync. One field now: * const.CONF_HOST replaces CONF_ADB_HOST / CONF_PROTOCOL_HOST in the setup form, the options page, the pairing forms, the reconfigure/reauth seeding and the description copy. ADB port 5555 stays the only port field; * helpers.entry_host(entry) is the single resolver (options first, then data); resolve_adb_config and the protocol settings both go through it, so both transports read the same value at call time (the t32 F1 factory re-read keeps working: the NEXT built poller sees the new address); * helpers.seed_host / seed_adb_enabled own the YAML seed's shape rule. A block may use `host` or the legacy protocol_host/adb_host keys — t41 keeps the old spelling working — and t32 F4's outcome is unchanged: a protocol-only block leaves ADB off, an address (or an explicit adb_enabled) turns it on; * the zeroconf IP-change path collapses the t21-F2 per-host dance into one rule: the discovery address IS the entry's address, so the entry is updated when it differs and left alone when it matches. The blank-self-heal and deliberately-different-ADB-host cases are gone with the duplication — a second address field cannot express them anymore, and the tests now pin that (previously "an explicit override is never clobbered"); * the options page exposes the protocol toggle it never had (the page could turn ADB off but not the protocol); * button.py (granted to this task) reads the entry's own address instead of another integration's entity. The v3 entry migration that maps existing adb_host/protocol_host onto CONF_HOST and drops the androidtv key lands in the next commit; HA runs migrations before setup, so an existing entry is never read with the old shape. Verified: 311 passed / 2 skipped, 312 / 1 with androidtvremote2, ruff clean, drift engine exit 0 on HEAD. The UI-copy contract tests (every rendered field has a label in strings.json AND translations/en.json, key trees identical, host errors name the field) drove the string edits.
88 lines
2.8 KiB
Python
88 lines
2.8 KiB
Python
"""Button entities for NVIDIA Shield."""
|
|
|
|
import logging
|
|
|
|
from homeassistant.components.button import ButtonEntity
|
|
from homeassistant.config_entries import ConfigEntry
|
|
from homeassistant.core import HomeAssistant
|
|
from homeassistant.helpers.entity import DeviceInfo, EntityCategory
|
|
from homeassistant.helpers.entity_platform import AddEntitiesCallback
|
|
|
|
from .adb_session import AdbMediaSessionPoller, ensure_adb_key
|
|
from .const import (
|
|
CONF_ADB_ENABLED,
|
|
CONF_ADB_PORT,
|
|
DEFAULT_ADB_PORT,
|
|
DOMAIN,
|
|
)
|
|
from .helpers import entry_host
|
|
|
|
_LOGGER = logging.getLogger(__name__)
|
|
|
|
|
|
async def async_setup_entry(
|
|
hass: HomeAssistant,
|
|
entry: ConfigEntry,
|
|
async_add_entities: AddEntitiesCallback,
|
|
) -> None:
|
|
if entry.options.get(CONF_ADB_ENABLED, False):
|
|
async_add_entities([NvidiaShieldPairAdbButton(hass, entry)])
|
|
|
|
|
|
class NvidiaShieldPairAdbButton(ButtonEntity):
|
|
"""Button to initiate or re-pair the ADB connection."""
|
|
|
|
_attr_has_entity_name = True
|
|
_attr_name = "Pair ADB"
|
|
_attr_entity_category = EntityCategory.CONFIG
|
|
_attr_icon = "mdi:link-variant"
|
|
|
|
def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
|
|
self.hass = hass
|
|
self._entry = entry
|
|
self._attr_unique_id = f"{DOMAIN}_{entry.entry_id}_pair_adb"
|
|
|
|
@property
|
|
def device_info(self) -> DeviceInfo:
|
|
return DeviceInfo(
|
|
identifiers={(DOMAIN, self._entry.entry_id)},
|
|
name=self._entry.title,
|
|
manufacturer="NVIDIA",
|
|
model="Shield TV",
|
|
)
|
|
|
|
async def async_press(self) -> None:
|
|
"""Attempt ADB connection. The Shield will show a pairing prompt."""
|
|
# t41: the entry's own single address — never derived from another
|
|
# integration's entity.
|
|
host = entry_host(self._entry)
|
|
port = self._entry.options.get(CONF_ADB_PORT, DEFAULT_ADB_PORT)
|
|
|
|
if not host:
|
|
_LOGGER.error("Could not determine ADB host. Set it in integration options.")
|
|
return
|
|
|
|
key_path = await self.hass.async_add_executor_job(
|
|
ensure_adb_key, self.hass.config.config_dir
|
|
)
|
|
|
|
_LOGGER.info(
|
|
"Attempting ADB pairing with %s:%d — approve the prompt on the Shield",
|
|
host,
|
|
port,
|
|
)
|
|
|
|
poller = AdbMediaSessionPoller(host, port, key_path)
|
|
if await poller.connect():
|
|
_LOGGER.info("ADB pairing successful with %s", host)
|
|
await poller.disconnect()
|
|
# Reload to start polling
|
|
await self.hass.config_entries.async_reload(self._entry.entry_id)
|
|
else:
|
|
_LOGGER.error(
|
|
"ADB pairing failed with %s. Make sure Network debugging is enabled "
|
|
"and you approved the prompt on the Shield.",
|
|
host,
|
|
)
|
|
await poller.disconnect()
|