mirror of
https://github.com/home-assistant/core.git
synced 2025-07-08 22:07:10 +00:00
Refactor of unique ID and entity description handling in Rituals Perfume Genie (#92545)
This commit is contained in:
parent
7b8936b420
commit
9e529d1d59
@ -77,9 +77,7 @@ class RitualsBinarySensorEntity(DiffuserEntity, BinarySensorEntity):
|
|||||||
description: RitualsBinarySensorEntityDescription,
|
description: RitualsBinarySensorEntityDescription,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Initialize Rituals binary sensor entity."""
|
"""Initialize Rituals binary sensor entity."""
|
||||||
super().__init__(coordinator)
|
super().__init__(coordinator, description)
|
||||||
self.entity_description = description
|
|
||||||
self._attr_unique_id = f"{coordinator.diffuser.hublot}-{description.key}"
|
|
||||||
self._attr_name = f"{coordinator.diffuser.name} {description.name}"
|
self._attr_name = f"{coordinator.diffuser.name} {description.name}"
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
"""Base class for Rituals Perfume Genie diffuser entity."""
|
"""Base class for Rituals Perfume Genie diffuser entity."""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from homeassistant.helpers.entity import DeviceInfo
|
from homeassistant.helpers.entity import DeviceInfo, EntityDescription
|
||||||
from homeassistant.helpers.update_coordinator import CoordinatorEntity
|
from homeassistant.helpers.update_coordinator import CoordinatorEntity
|
||||||
|
|
||||||
from .const import DOMAIN
|
from .const import DOMAIN
|
||||||
@ -18,9 +18,12 @@ class DiffuserEntity(CoordinatorEntity[RitualsDataUpdateCoordinator]):
|
|||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
coordinator: RitualsDataUpdateCoordinator,
|
coordinator: RitualsDataUpdateCoordinator,
|
||||||
|
description: EntityDescription,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Init from config, hookup diffuser and coordinator."""
|
"""Init from config, hookup diffuser and coordinator."""
|
||||||
super().__init__(coordinator)
|
super().__init__(coordinator)
|
||||||
|
self.entity_description = description
|
||||||
|
self._attr_unique_id = f"{coordinator.diffuser.hublot}-{description.key}"
|
||||||
self._attr_device_info = DeviceInfo(
|
self._attr_device_info = DeviceInfo(
|
||||||
identifiers={(DOMAIN, coordinator.diffuser.hublot)},
|
identifiers={(DOMAIN, coordinator.diffuser.hublot)},
|
||||||
manufacturer=MANUFACTURER,
|
manufacturer=MANUFACTURER,
|
||||||
|
@ -72,9 +72,7 @@ class RitualsNumberEntity(DiffuserEntity, NumberEntity):
|
|||||||
description: RitualsNumberEntityDescription,
|
description: RitualsNumberEntityDescription,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Initialize the diffuser perfume amount number."""
|
"""Initialize the diffuser perfume amount number."""
|
||||||
super().__init__(coordinator)
|
super().__init__(coordinator, description)
|
||||||
self.entity_description = description
|
|
||||||
self._attr_unique_id = f"{coordinator.diffuser.hublot}-{description.key}"
|
|
||||||
self._attr_name = f"{coordinator.diffuser.name} {description.name}"
|
self._attr_name = f"{coordinator.diffuser.name} {description.name}"
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -76,12 +76,10 @@ class RitualsSelectEntity(DiffuserEntity, SelectEntity):
|
|||||||
description: RitualsSelectEntityDescription,
|
description: RitualsSelectEntityDescription,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Initialize the diffuser room size select entity."""
|
"""Initialize the diffuser room size select entity."""
|
||||||
super().__init__(coordinator)
|
super().__init__(coordinator, description)
|
||||||
self.entity_description = description
|
|
||||||
self._attr_entity_registry_enabled_default = (
|
self._attr_entity_registry_enabled_default = (
|
||||||
self.coordinator.diffuser.has_battery
|
self.coordinator.diffuser.has_battery
|
||||||
)
|
)
|
||||||
self._attr_unique_id = f"{coordinator.diffuser.hublot}-{description.key}"
|
|
||||||
self._attr_name = f"{coordinator.diffuser.name} {description.name}"
|
self._attr_name = f"{coordinator.diffuser.name} {description.name}"
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -98,9 +98,7 @@ class RitualsSensorEntity(DiffuserEntity, SensorEntity):
|
|||||||
description: RitualsSensorEntityDescription,
|
description: RitualsSensorEntityDescription,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Initialize the diffuser sensor."""
|
"""Initialize the diffuser sensor."""
|
||||||
super().__init__(coordinator)
|
super().__init__(coordinator, description)
|
||||||
self.entity_description = description
|
|
||||||
self._attr_unique_id = f"{coordinator.diffuser.hublot}-{description.key}"
|
|
||||||
self._attr_name = f"{coordinator.diffuser.name} {description.name}"
|
self._attr_name = f"{coordinator.diffuser.name} {description.name}"
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -72,9 +72,7 @@ class RitualsSwitchEntity(DiffuserEntity, SwitchEntity):
|
|||||||
description: RitualsSwitchEntityDescription,
|
description: RitualsSwitchEntityDescription,
|
||||||
) -> None:
|
) -> None:
|
||||||
"""Initialize the diffuser switch."""
|
"""Initialize the diffuser switch."""
|
||||||
super().__init__(coordinator)
|
super().__init__(coordinator, description)
|
||||||
self.entity_description = description
|
|
||||||
self._attr_unique_id = f"{coordinator.diffuser.hublot}-{description.key}"
|
|
||||||
self._attr_name = coordinator.diffuser.name
|
self._attr_name = coordinator.diffuser.name
|
||||||
self._attr_is_on = description.is_on_fn(coordinator.diffuser)
|
self._attr_is_on = description.is_on_fn(coordinator.diffuser)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user