evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert oralb to use entry.runtime_data (#122527)

Browse source
This commit is contained in:
J. Nick Koston 2024-07-24 09:23:42 -05:00 • committed by GitHub
parent cae992f5e6
commit c81b9d624b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
homeassistant/components/oralb/__init__.py
View file

@ -18,14 +18,15 @@ from homeassistant.config_entries import ConfigEntry
from homeassistant.const import Platform from homeassistant.const import Platform
from homeassistant.core import CoreState, HomeAssistant from homeassistant.core import CoreState, HomeAssistant
from .const import DOMAIN
PLATFORMS: list[Platform] = [Platform.SENSOR] PLATFORMS: list[Platform] = [Platform.SENSOR]
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: type OralBConfigEntry = ConfigEntry[ActiveBluetoothProcessorCoordinator]
async def async_setup_entry(hass: HomeAssistant, entry: OralBConfigEntry) -> bool:
"""Set up OralB BLE device from a config entry.""" """Set up OralB BLE device from a config entry."""
address = entry.unique_id address = entry.unique_id
assert address is not None assert address is not None
@ -65,31 +66,25 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
) )
return await data.async_poll(connectable_device) return await data.async_poll(connectable_device)
coordinator = hass.data.setdefault(DOMAIN, {})[entry.entry_id] = ( coordinator = entry.runtime_data = ActiveBluetoothProcessorCoordinator(
ActiveBluetoothProcessorCoordinator( hass,
hass, _LOGGER,
_LOGGER, address=address,
address=address, mode=BluetoothScanningMode.PASSIVE,
mode=BluetoothScanningMode.PASSIVE, update_method=data.update,
update_method=data.update, needs_poll_method=_needs_poll,
needs_poll_method=_needs_poll, poll_method=_async_poll,
poll_method=_async_poll, # We will take advertisements from non-connectable devices
# We will take advertisements from non-connectable devices # since we will trade the BLEDevice for a connectable one
# since we will trade the BLEDevice for a connectable one # if we need to poll it
# if we need to poll it connectable=False,
connectable=False,
)
) )
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS) await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
entry.async_on_unload( # only start after all platforms have had a chance to subscribe
coordinator.async_start() entry.async_on_unload(coordinator.async_start())
) # only start after all platforms have had a chance to subscribe
return True return True
async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: async def async_unload_entry(hass: HomeAssistant, entry: OralBConfigEntry) -> 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)
hass.data[DOMAIN].pop(entry.entry_id)
return unload_ok

10
homeassistant/components/oralb/sensor.py
View file

@ -4,11 +4,9 @@ from __future__ import annotations
from oralb_ble import OralBSensor, SensorUpdate from oralb_ble import OralBSensor, SensorUpdate
from homeassistant import config_entries
from homeassistant.components.bluetooth.passive_update_processor import ( from homeassistant.components.bluetooth.passive_update_processor import (
PassiveBluetoothDataProcessor, PassiveBluetoothDataProcessor,
PassiveBluetoothDataUpdate, PassiveBluetoothDataUpdate,
PassiveBluetoothProcessorCoordinator,
PassiveBluetoothProcessorEntity, PassiveBluetoothProcessorEntity,
) )
from homeassistant.components.sensor import ( from homeassistant.components.sensor import (
@ -27,7 +25,7 @@ from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
from .const import DOMAIN from . import OralBConfigEntry
from .device import device_key_to_bluetooth_entity_key from .device import device_key_to_bluetooth_entity_key
SENSOR_DESCRIPTIONS: dict[str, SensorEntityDescription] = { SENSOR_DESCRIPTIONS: dict[str, SensorEntityDescription] = {
@ -109,13 +107,11 @@ def sensor_update_to_bluetooth_data_update(
async def async_setup_entry( async def async_setup_entry(
hass: HomeAssistant, hass: HomeAssistant,
entry: config_entries.ConfigEntry, entry: OralBConfigEntry,
async_add_entities: AddEntitiesCallback, async_add_entities: AddEntitiesCallback,
) -> None: ) -> None:
"""Set up the OralB BLE sensors.""" """Set up the OralB BLE sensors."""
coordinator: PassiveBluetoothProcessorCoordinator = hass.data[DOMAIN][ coordinator = entry.runtime_data
entry.entry_id
]
processor = PassiveBluetoothDataProcessor(sensor_update_to_bluetooth_data_update) processor = PassiveBluetoothDataProcessor(sensor_update_to_bluetooth_data_update)
entry.async_on_unload( entry.async_on_unload(
processor.async_add_entities_listener( processor.async_add_entities_listener(