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

Update zwave_js entity naming logic (#98140)

Browse Source 
* Update zwave_js entity naming logic

* Update homeassistant/components/zwave_js/entity.py

Co-authored-by: Martin Hjelmare <marhje52@gmail.com>

* store primary value locally

---------

Co-authored-by: Martin Hjelmare <marhje52@gmail.com>
This commit is contained in:
Raman Gupta 2023-08-10 02:08:14 -04:00 committed by GitHub
parent 5d3d66e47d
commit 056d00fb11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,6 +161,7 @@ class ZWaveBaseEntity(Entity):
name_prefix: str | None = None,
) -> str:
"""Generate entity name."""
primary_value = self.info.primary_value
name = ""
if (
hasattr(self, "entity_description")
@ -178,9 +179,9 @@ class ZWaveBaseEntity(Entity):
value_name = alternate_value_name
elif include_value_name:
value_name = (
self.info.primary_value.metadata.label
or self.info.primary_value.property_key_name
or self.info.primary_value.property_name
primary_value.metadata.label
or primary_value.property_key_name
or primary_value.property_name
or ""
)
@ -188,12 +189,21 @@ class ZWaveBaseEntity(Entity):
# Only include non empty additional info
if additional_info := [item for item in (additional_info or []) if item]:
name = f"{name} {' '.join(additional_info)}"
# append endpoint if > 1
if (
self.info.primary_value.endpoint is not None
and self.info.primary_value.endpoint > 1
# Only append endpoint to name if there are equivalent values on a lower
# endpoint
if primary_value.endpoint is not None and any(
get_value_id_str(
self.info.node,
primary_value.command_class,
primary_value.property_,
endpoint=endpoint_idx,
property_key=primary_value.property_key,
)
in self.info.node.values
for endpoint_idx in range(0, primary_value.endpoint)
):
name += f" ({self.info.primary_value.endpoint})"
name += f" ({primary_value.endpoint})"
return name