jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 21:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply review comments on proximity (#109249)

Browse Source 
use a named tuple as TrackedEntityDescriptor
This commit is contained in:
Michael 2024-02-01 09:02:38 +01:00 committed by GitHub
parent 175ec81269
commit e11e54fd50
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
homeassistant/components/proximity/sensor.py
View File

@ -2,6 +2,8 @@
from __future__ import annotations from __future__ import annotations
from typing import NamedTuple
from homeassistant.components.sensor import ( from homeassistant.components.sensor import (
SensorDeviceClass, SensorDeviceClass,
SensorEntity, SensorEntity,
@ -50,6 +52,13 @@ SENSORS_PER_PROXIMITY: list[SensorEntityDescription] = [
] ]
class TrackedEntityDescriptor(NamedTuple):
"""Descriptor of a tracked entity."""
entity_id: str
identifier: str
def _device_info(coordinator: ProximityDataUpdateCoordinator) -> DeviceInfo: def _device_info(coordinator: ProximityDataUpdateCoordinator) -> DeviceInfo:
return DeviceInfo( return DeviceInfo(
identifiers={(DOMAIN, coordinator.config_entry.entry_id)}, identifiers={(DOMAIN, coordinator.config_entry.entry_id)},
@ -70,23 +79,17 @@ async def async_setup_entry(
for description in SENSORS_PER_PROXIMITY for description in SENSORS_PER_PROXIMITY
] ]
tracked_entity_descriptors = [] tracked_entity_descriptors: list[TrackedEntityDescriptor] = []
entity_reg = er.async_get(hass) entity_reg = er.async_get(hass)
for tracked_entity_id in coordinator.tracked_entities: for tracked_entity_id in coordinator.tracked_entities:
if (entity_entry := entity_reg.async_get(tracked_entity_id)) is not None: if (entity_entry := entity_reg.async_get(tracked_entity_id)) is not None:
tracked_entity_descriptors.append( tracked_entity_descriptors.append(
{ TrackedEntityDescriptor(tracked_entity_id, entity_entry.id)
"entity_id": tracked_entity_id,
"identifier": entity_entry.id,
}
) )
else: else:
tracked_entity_descriptors.append( tracked_entity_descriptors.append(
{ TrackedEntityDescriptor(tracked_entity_id, tracked_entity_id)
"entity_id": tracked_entity_id,
"identifier": tracked_entity_id,
}
) )
entities += [ entities += [
@ -139,15 +142,15 @@ class ProximityTrackedEntitySensor(
self, self,
description: SensorEntityDescription, description: SensorEntityDescription,
coordinator: ProximityDataUpdateCoordinator, coordinator: ProximityDataUpdateCoordinator,
tracked_entity_descriptor: dict[str, str], tracked_entity_descriptor: TrackedEntityDescriptor,
) -> None: ) -> None:
"""Initialize the proximity.""" """Initialize the proximity."""
super().__init__(coordinator) super().__init__(coordinator)
self.entity_description = description self.entity_description = description
self.tracked_entity_id = tracked_entity_descriptor["entity_id"] self.tracked_entity_id = tracked_entity_descriptor.entity_id
self._attr_unique_id = f"{coordinator.config_entry.entry_id}_{tracked_entity_descriptor['identifier']}_{description.key}" self._attr_unique_id = f"{coordinator.config_entry.entry_id}_{tracked_entity_descriptor.identifier}_{description.key}"
self._attr_name = f"{self.tracked_entity_id.split('.')[-1]} {description.name}" self._attr_name = f"{self.tracked_entity_id.split('.')[-1]} {description.name}"
self._attr_device_info = _device_info(coordinator) self._attr_device_info = _device_info(coordinator)