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

Reduce overhead to write HomeKit Controller state (#102365)

Browse source
This commit is contained in:
J. Nick Koston 2023-10-19 20:50:07 -10:00 • committed by GitHub
parent 84d0907fc8
commit 3014a651c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

37
homeassistant/components/homekit_controller/entity.py
View file

@ -42,6 +42,7 @@ class HomeKitEntity(Entity):
self._char_name: str | None = None
self._char_subscription: CALLBACK_TYPE | None = None
self.async_setup()
self._attr_unique_id = f"{accessory.unique_id}_{self._aid}_{self._iid}"
super().__init__()
@callback
@ -190,11 +191,6 @@ class HomeKitEntity(Entity):
# Some accessories do not have a serial number
return f"homekit-{self._accessory.unique_id}-{self._aid}-{self._iid}"
@property
def unique_id(self) -> str:
"""Return the ID of this device."""
return f"{self._accessory.unique_id}_{self._aid}_{self._iid}"
@property
def default_name(self) -> str | None:
"""Return the default name of the device."""
@ -206,10 +202,9 @@ class HomeKitEntity(Entity):
accessory_name = self.accessory.name
# If the service has a name char, use that, if not
# fallback to the default name provided by the subclass
device_name = self._char_name or self.default_name
folded_device_name = folded_name(device_name or "")
folded_accessory_name = folded_name(accessory_name)
if device_name:
if device_name := self._char_name or self.default_name:
folded_device_name = folded_name(device_name)
folded_accessory_name = folded_name(accessory_name)
# Sometimes the device name includes the accessory
# name already like My ecobee Occupancy / My ecobee
if folded_device_name.startswith(folded_accessory_name):
@ -243,17 +238,17 @@ class HomeKitEntity(Entity):
class AccessoryEntity(HomeKitEntity):
"""A HomeKit entity that is related to an entire accessory rather than a specific service or characteristic."""
def __init__(self, accessory: HKDevice, devinfo: ConfigType) -> None:
"""Initialise a generic HomeKit accessory."""
super().__init__(accessory, devinfo)
self._attr_unique_id = f"{accessory.unique_id}_{self._aid}"
@property
def old_unique_id(self) -> str:
"""Return the old ID of this device."""
serial = self.accessory_info.value(CharacteristicsTypes.SERIAL_NUMBER)
return f"homekit-{serial}-aid:{self._aid}"
@property
def unique_id(self) -> str:
"""Return the ID of this device."""
return f"{self._accessory.unique_id}_{self._aid}"
class BaseCharacteristicEntity(HomeKitEntity):
"""A HomeKit entity that is related to an single characteristic rather than a whole service.
@ -299,13 +294,17 @@ class CharacteristicEntity(BaseCharacteristicEntity):
the service entity.
"""
def __init__(
self, accessory: HKDevice, devinfo: ConfigType, char: Characteristic
) -> None:
"""Initialise a generic single characteristic HomeKit entity."""
super().__init__(accessory, devinfo, char)
self._attr_unique_id = (
f"{accessory.unique_id}_{self._aid}_{char.service.iid}_{char.iid}"
)
@property
def old_unique_id(self) -> str:
"""Return the old ID of this device."""
serial = self.accessory_info.value(CharacteristicsTypes.SERIAL_NUMBER)
return f"homekit-{serial}-aid:{self._aid}-sid:{self._char.service.iid}-cid:{self._char.iid}"
@property
def unique_id(self) -> str:
"""Return the ID of this device."""
return f"{self._accessory.unique_id}_{self._aid}_{self._char.service.iid}_{self._char.iid}"