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

Switch mqtt to use async_track_device_registry_updated_event (#93603)

Browse Source
This commit is contained in:
J. Nick Koston 2023-05-29 09:43:01 -05:00 committed by GitHub
parent c44a7fe358
commit 3db59908ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
homeassistant/components/mqtt/mixins.py
View File

@ -34,10 +34,7 @@ from homeassistant.helpers import (
device_registry as dr, device_registry as dr,
entity_registry as er, entity_registry as er,
) )
from homeassistant.helpers.device_registry import ( from homeassistant.helpers.device_registry import DeviceEntry
EVENT_DEVICE_REGISTRY_UPDATED,
DeviceEntry,
)
from homeassistant.helpers.dispatcher import ( from homeassistant.helpers.dispatcher import (
async_dispatcher_connect, async_dispatcher_connect,
async_dispatcher_send, async_dispatcher_send,
@ -49,7 +46,10 @@ from homeassistant.helpers.entity import (
async_generate_entity_id, async_generate_entity_id,
) )
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.event import async_track_entity_registry_updated_event from homeassistant.helpers.event import (
async_track_device_registry_updated_event,
async_track_entity_registry_updated_event,
)
from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
from homeassistant.util.json import json_loads from homeassistant.util.json import json_loads
@ -680,8 +680,8 @@ class MqttDiscoveryDeviceUpdate(ABC):
) )
config_entry.async_on_unload(self._entry_unload) config_entry.async_on_unload(self._entry_unload)
if device_id is not None: if device_id is not None:
self._remove_device_updated = hass.bus.async_listen( self._remove_device_updated = async_track_device_registry_updated_event(
EVENT_DEVICE_REGISTRY_UPDATED, self._async_device_removed hass, device_id, self._async_device_removed
) )
_LOGGER.info( _LOGGER.info(
"%s %s has been initialized", "%s %s has been initialized",
@ -1182,19 +1182,16 @@ def async_removed_from_device(
hass: HomeAssistant, event: Event, mqtt_device_id: str, config_entry_id: str hass: HomeAssistant, event: Event, mqtt_device_id: str, config_entry_id: str
) -> bool: ) -> bool:
"""Check if the passed event indicates MQTT was removed from a device.""" """Check if the passed event indicates MQTT was removed from a device."""
device_id: str = event.data["device_id"] action: str = event.data["action"]
if event.data["action"] not in ("remove", "update"): if action not in ("remove", "update"):
return False return False
if device_id != mqtt_device_id: if action == "update":
return False
if event.data["action"] == "update":
if "config_entries" not in event.data["changes"]: if "config_entries" not in event.data["changes"]:
return False return False
device_registry = dr.async_get(hass) device_registry = dr.async_get(hass)
if ( if (
device_entry := device_registry.async_get(device_id) device_entry := device_registry.async_get(event.data["device_id"])
) and config_entry_id in device_entry.config_entries: ) and config_entry_id in device_entry.config_entries:
# Not removed from device # Not removed from device
return False return False