Use runtime_data in dormakaba_dkey (#136440)

This commit is contained in:
epenet 2025-01-24 14:52:22 +01:00 committed by GitHub
parent f6b1786b13
commit 2e78ab620f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 23 additions and 28 deletions

View File

@ -7,18 +7,19 @@ from py_dormakaba_dkey.models import AssociationData
from homeassistant.components import bluetooth from homeassistant.components import bluetooth
from homeassistant.components.bluetooth.match import ADDRESS, BluetoothCallbackMatcher from homeassistant.components.bluetooth.match import ADDRESS, BluetoothCallbackMatcher
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_ADDRESS, EVENT_HOMEASSISTANT_STOP, Platform from homeassistant.const import CONF_ADDRESS, EVENT_HOMEASSISTANT_STOP, Platform
from homeassistant.core import Event, HomeAssistant, callback from homeassistant.core import Event, HomeAssistant, callback
from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.exceptions import ConfigEntryNotReady
from .const import CONF_ASSOCIATION_DATA, DOMAIN from .const import CONF_ASSOCIATION_DATA
from .coordinator import DormakabaDkeyCoordinator from .coordinator import DormakabaDkeyConfigEntry, DormakabaDkeyCoordinator
PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.LOCK, Platform.SENSOR] PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.LOCK, Platform.SENSOR]
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: async def async_setup_entry(
hass: HomeAssistant, entry: DormakabaDkeyConfigEntry
) -> bool:
"""Set up Dormakaba dKey from a config entry.""" """Set up Dormakaba dKey from a config entry."""
address: str = entry.data[CONF_ADDRESS] address: str = entry.data[CONF_ADDRESS]
ble_device = bluetooth.async_ble_device_from_address(hass, address.upper(), True) ble_device = bluetooth.async_ble_device_from_address(hass, address.upper(), True)
@ -52,7 +53,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
coordinator = DormakabaDkeyCoordinator(hass, entry, lock) coordinator = DormakabaDkeyCoordinator(hass, entry, lock)
await coordinator.async_config_entry_first_refresh() await coordinator.async_config_entry_first_refresh()
hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator entry.runtime_data = coordinator
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS) await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
@ -63,13 +64,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
entry.async_on_unload( entry.async_on_unload(
hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _async_stop) hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _async_stop)
) )
entry.async_on_unload(coordinator.lock.disconnect)
return True return True
async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: async def async_unload_entry(
hass: HomeAssistant, entry: DormakabaDkeyConfigEntry
) -> bool:
"""Unload a config entry.""" """Unload a config entry."""
if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS): return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
coordinator: DormakabaDkeyCoordinator = hass.data[DOMAIN].pop(entry.entry_id)
await coordinator.lock.disconnect()
return unload_ok

View File

@ -12,12 +12,10 @@ from homeassistant.components.binary_sensor import (
BinarySensorEntity, BinarySensorEntity,
BinarySensorEntityDescription, BinarySensorEntityDescription,
) )
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant, callback from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from .const import DOMAIN from .coordinator import DormakabaDkeyConfigEntry, DormakabaDkeyCoordinator
from .coordinator import DormakabaDkeyCoordinator
from .entity import DormakabaDkeyEntity from .entity import DormakabaDkeyEntity
@ -46,11 +44,11 @@ BINARY_SENSOR_DESCRIPTIONS = (
async def async_setup_entry( async def async_setup_entry(
hass: HomeAssistant, hass: HomeAssistant,
entry: ConfigEntry, entry: DormakabaDkeyConfigEntry,
async_add_entities: AddEntitiesCallback, async_add_entities: AddEntitiesCallback,
) -> None: ) -> None:
"""Set up the binary sensor platform for Dormakaba dKey.""" """Set up the binary sensor platform for Dormakaba dKey."""
coordinator: DormakabaDkeyCoordinator = hass.data[DOMAIN][entry.entry_id] coordinator = entry.runtime_data
async_add_entities( async_add_entities(
DormakabaDkeyBinarySensor(coordinator, description) DormakabaDkeyBinarySensor(coordinator, description)
for description in BINARY_SENSOR_DESCRIPTIONS for description in BINARY_SENSOR_DESCRIPTIONS

View File

@ -17,6 +17,8 @@ from .const import UPDATE_SECONDS
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
type DormakabaDkeyConfigEntry = ConfigEntry[DormakabaDkeyCoordinator]
class DormakabaDkeyCoordinator(DataUpdateCoordinator[None]): class DormakabaDkeyCoordinator(DataUpdateCoordinator[None]):
"""DormakabaDkey coordinator.""" """DormakabaDkey coordinator."""
@ -24,7 +26,7 @@ class DormakabaDkeyCoordinator(DataUpdateCoordinator[None]):
def __init__( def __init__(
self, self,
hass: HomeAssistant, hass: HomeAssistant,
entry: ConfigEntry, entry: DormakabaDkeyConfigEntry,
lock: DKEYLock, lock: DKEYLock,
) -> None: ) -> None:
"""Initialize the coordinator.""" """Initialize the coordinator."""

View File

@ -7,23 +7,20 @@ from typing import Any
from py_dormakaba_dkey.commands import UnlockStatus from py_dormakaba_dkey.commands import UnlockStatus
from homeassistant.components.lock import LockEntity from homeassistant.components.lock import LockEntity
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant, callback from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from .const import DOMAIN from .coordinator import DormakabaDkeyConfigEntry, DormakabaDkeyCoordinator
from .coordinator import DormakabaDkeyCoordinator
from .entity import DormakabaDkeyEntity from .entity import DormakabaDkeyEntity
async def async_setup_entry( async def async_setup_entry(
hass: HomeAssistant, hass: HomeAssistant,
entry: ConfigEntry, entry: DormakabaDkeyConfigEntry,
async_add_entities: AddEntitiesCallback, async_add_entities: AddEntitiesCallback,
) -> None: ) -> None:
"""Set up the lock platform for Dormakaba dKey.""" """Set up the lock platform for Dormakaba dKey."""
coordinator: DormakabaDkeyCoordinator = hass.data[DOMAIN][entry.entry_id] async_add_entities([DormakabaDkeyLock(entry.runtime_data)])
async_add_entities([DormakabaDkeyLock(coordinator)])
class DormakabaDkeyLock(DormakabaDkeyEntity, LockEntity): class DormakabaDkeyLock(DormakabaDkeyEntity, LockEntity):

View File

@ -8,13 +8,11 @@ from homeassistant.components.sensor import (
SensorEntityDescription, SensorEntityDescription,
SensorStateClass, SensorStateClass,
) )
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import PERCENTAGE from homeassistant.const import PERCENTAGE
from homeassistant.core import HomeAssistant, callback from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from .const import DOMAIN from .coordinator import DormakabaDkeyConfigEntry, DormakabaDkeyCoordinator
from .coordinator import DormakabaDkeyCoordinator
from .entity import DormakabaDkeyEntity from .entity import DormakabaDkeyEntity
BINARY_SENSOR_DESCRIPTIONS = ( BINARY_SENSOR_DESCRIPTIONS = (
@ -29,11 +27,11 @@ BINARY_SENSOR_DESCRIPTIONS = (
async def async_setup_entry( async def async_setup_entry(
hass: HomeAssistant, hass: HomeAssistant,
entry: ConfigEntry, entry: DormakabaDkeyConfigEntry,
async_add_entities: AddEntitiesCallback, async_add_entities: AddEntitiesCallback,
) -> None: ) -> None:
"""Set up the lock platform for Dormakaba dKey.""" """Set up the lock platform for Dormakaba dKey."""
coordinator: DormakabaDkeyCoordinator = hass.data[DOMAIN][entry.entry_id] coordinator = entry.runtime_data
async_add_entities( async_add_entities(
DormakabaDkeySensor(coordinator, description) DormakabaDkeySensor(coordinator, description)
for description in BINARY_SENSOR_DESCRIPTIONS for description in BINARY_SENSOR_DESCRIPTIONS