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

Simplify get_unique_id helper function for zwave_js (#66221)

Browse Source
This commit is contained in:
Raman Gupta 2022-02-10 02:46:32 -05:00 committed by GitHub
parent 23e39d62d4
commit 72acda81a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
homeassistant/components/zwave_js/__init__.py
View File

@ -446,9 +446,7 @@ async def async_setup_entry( # noqa: C901
# We assert because we know the device exists # We assert because we know the device exists
assert device assert device
unique_id = get_unique_id( unique_id = get_unique_id(client, disc_info.primary_value.value_id)
client.driver.controller.home_id, disc_info.primary_value.value_id
)
entity_id = ent_reg.async_get_entity_id(disc_info.platform, DOMAIN, unique_id) entity_id = ent_reg.async_get_entity_id(disc_info.platform, DOMAIN, unique_id)
raw_value = value_ = value.value raw_value = value_ = value.value

2
homeassistant/components/zwave_js/entity.py
View File

@ -48,7 +48,7 @@ class ZWaveBaseEntity(Entity):
# Entity class attributes # Entity class attributes
self._attr_name = self.generate_name() self._attr_name = self.generate_name()
self._attr_unique_id = get_unique_id( self._attr_unique_id = get_unique_id(
self.client.driver.controller.home_id, self.info.primary_value.value_id self.client, self.info.primary_value.value_id
) )
self._attr_entity_registry_enabled_default = ( self._attr_entity_registry_enabled_default = (
self.info.entity_registry_enabled_default self.info.entity_registry_enabled_default

6
homeassistant/components/zwave_js/helpers.py
View File

@ -55,9 +55,9 @@ def update_data_collection_preference(
@callback @callback
def get_unique_id(home_id: str, value_id: str) -> str: def get_unique_id(client: ZwaveClient, value_id: str) -> str:
"""Get unique ID from home ID and value ID.""" """Get unique ID from client and value ID."""
return f"{home_id}.{value_id}" return f"{client.driver.controller.home_id}.{value_id}"
@callback @callback

10
homeassistant/components/zwave_js/migrate.py
View File

@ -470,10 +470,7 @@ def async_migrate_discovered_value(
) -> None: ) -> None:
"""Migrate unique ID for entity/entities tied to discovered value.""" """Migrate unique ID for entity/entities tied to discovered value."""
new_unique_id = get_unique_id( new_unique_id = get_unique_id(client, disc_info.primary_value.value_id)
client.driver.controller.home_id,
disc_info.primary_value.value_id,
)
# On reinterviews, there is no point in going through this logic again for already # On reinterviews, there is no point in going through this logic again for already
# discovered values # discovered values
@ -485,10 +482,7 @@ def async_migrate_discovered_value(
# 2021.2.*, 2021.3.0b0, and 2021.3.0 formats # 2021.2.*, 2021.3.0b0, and 2021.3.0 formats
old_unique_ids = [ old_unique_ids = [
get_unique_id( get_unique_id(client, value_id)
client.driver.controller.home_id,
value_id,
)
for value_id in get_old_value_ids(disc_info.primary_value) for value_id in get_old_value_ids(disc_info.primary_value)
] ]