Use runtime_data in ialarm (#145178)

This commit is contained in:
epenet 2025-05-19 10:58:34 +02:00 committed by GitHub
parent f50afae1c3
commit da6c6c5201
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 26 deletions

View File

@ -6,18 +6,16 @@ import asyncio
from pyialarm import IAlarm from pyialarm import IAlarm
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_HOST, CONF_PORT, Platform from homeassistant.const import CONF_HOST, CONF_PORT, Platform
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.exceptions import ConfigEntryNotReady
from .const import DATA_COORDINATOR, DOMAIN from .coordinator import IAlarmConfigEntry, IAlarmDataUpdateCoordinator
from .coordinator import IAlarmDataUpdateCoordinator
PLATFORMS = [Platform.ALARM_CONTROL_PANEL] PLATFORMS = [Platform.ALARM_CONTROL_PANEL]
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: async def async_setup_entry(hass: HomeAssistant, entry: IAlarmConfigEntry) -> bool:
"""Set up iAlarm config.""" """Set up iAlarm config."""
host: str = entry.data[CONF_HOST] host: str = entry.data[CONF_HOST]
port: int = entry.data[CONF_PORT] port: int = entry.data[CONF_PORT]
@ -32,20 +30,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
coordinator = IAlarmDataUpdateCoordinator(hass, entry, ialarm, mac) coordinator = IAlarmDataUpdateCoordinator(hass, entry, ialarm, mac)
await coordinator.async_config_entry_first_refresh() await coordinator.async_config_entry_first_refresh()
hass.data.setdefault(DOMAIN, {}) entry.runtime_data = coordinator
hass.data[DOMAIN][entry.entry_id] = {
DATA_COORDINATOR: coordinator,
}
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS) await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
return True return True
async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: async def async_unload_entry(hass: HomeAssistant, entry: IAlarmConfigEntry) -> bool:
"""Unload iAlarm config.""" """Unload iAlarm config."""
unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS) return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
if unload_ok:
hass.data[DOMAIN].pop(entry.entry_id)
return unload_ok

View File

@ -7,26 +7,22 @@ from homeassistant.components.alarm_control_panel import (
AlarmControlPanelEntityFeature, AlarmControlPanelEntityFeature,
AlarmControlPanelState, AlarmControlPanelState,
) )
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceInfo from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import DATA_COORDINATOR, DOMAIN from .const import DOMAIN
from .coordinator import IAlarmDataUpdateCoordinator from .coordinator import IAlarmConfigEntry, IAlarmDataUpdateCoordinator
async def async_setup_entry( async def async_setup_entry(
hass: HomeAssistant, hass: HomeAssistant,
entry: ConfigEntry, entry: IAlarmConfigEntry,
async_add_entities: AddConfigEntryEntitiesCallback, async_add_entities: AddConfigEntryEntitiesCallback,
) -> None: ) -> None:
"""Set up a iAlarm alarm control panel based on a config entry.""" """Set up a iAlarm alarm control panel based on a config entry."""
coordinator: IAlarmDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id][ async_add_entities([IAlarmPanel(entry.runtime_data)], False)
DATA_COORDINATOR
]
async_add_entities([IAlarmPanel(coordinator)], False)
class IAlarmPanel( class IAlarmPanel(

View File

@ -4,8 +4,6 @@ from pyialarm import IAlarm
from homeassistant.components.alarm_control_panel import AlarmControlPanelState from homeassistant.components.alarm_control_panel import AlarmControlPanelState
DATA_COORDINATOR = "ialarm"
DEFAULT_PORT = 18034 DEFAULT_PORT = 18034
DOMAIN = "ialarm" DOMAIN = "ialarm"

View File

@ -19,14 +19,20 @@ from .const import DOMAIN, IALARM_TO_HASS
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
type IAlarmConfigEntry = ConfigEntry[IAlarmDataUpdateCoordinator]
class IAlarmDataUpdateCoordinator(DataUpdateCoordinator[None]): class IAlarmDataUpdateCoordinator(DataUpdateCoordinator[None]):
"""Class to manage fetching iAlarm data.""" """Class to manage fetching iAlarm data."""
config_entry: ConfigEntry config_entry: IAlarmConfigEntry
def __init__( def __init__(
self, hass: HomeAssistant, config_entry: ConfigEntry, ialarm: IAlarm, mac: str self,
hass: HomeAssistant,
config_entry: IAlarmConfigEntry,
ialarm: IAlarm,
mac: str,
) -> None: ) -> None:
"""Initialize global iAlarm data updater.""" """Initialize global iAlarm data updater."""
self.ialarm = ialarm self.ialarm = ialarm