Takes care of zero len custom_name

sanjoyg · Mar 30, 2024 · 3f3727a · 3f3727a
1 parent d3140ee
commit 3f3727a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 11 deletions.
diff --git a/custom_components/dirigera_platform/binary_sensor.py b/custom_components/dirigera_platform/binary_sensor.py
@@ -89,14 +89,16 @@ def available(self):
     def device_info(self) -> DeviceInfo:
         return DeviceInfo(
             identifiers={("dirigera_platform", self._json_data.id)},
-            name=self._json_data.attributes.custom_name,
+            name=self.name,
             manufacturer=self._json_data.attributes.manufacturer,
             model=self._json_data.attributes.model,
             sw_version=self._json_data.attributes.firmware_version,
         )
 
     @property
     def name(self):
+        if self._json_data.attributes.custom_name is None or len(self._json_data.attributes.custom_name) == 0:
+            return self.unique_id
         return self._json_data.attributes.custom_name
 
     @property
@@ -123,7 +125,7 @@ def __init__(self, hub, json_data):
     def device_info(self) -> DeviceInfo:
         return DeviceInfo(
             identifiers={("dirigera_platform", self._json_data.id)},
-            name=self._json_data.attributes.custom_name,
+            name=self.name,
             manufacturer=self._json_data.attributes.manufacturer,
             model=self._json_data.attributes.model,
             sw_version=self._json_data.attributes.firmware_version,
@@ -135,6 +137,8 @@ def device_class(self) -> str:
 
     @property
     def name(self):
+        if self._json_data.attributes.custom_name is None or len(self._json_data.attributes.custom_name) == 0:
+            return self.unique_id
         return self._json_data.attributes.custom_name
 
     @property

diff --git a/custom_components/dirigera_platform/cover.py b/custom_components/dirigera_platform/cover.py
@@ -62,7 +62,7 @@ def available(self):
     def device_info(self) -> DeviceInfo:
         return DeviceInfo(
             identifiers={("dirigera_platform", self._json_data.id)},
-            name=self._json_data.attributes.custom_name,
+            name=self.name,
             manufacturer=self._json_data.attributes.manufacturer,
             model=self._json_data.attributes.model,
             sw_version=self._json_data.attributes.firmware_version,
@@ -82,6 +82,8 @@ def supported_features(self):
 
     @property
     def name(self):
+        if self._json_data.attributes.custom_name is None or len(self._json_data.attributes.custom_name) == 0:
+            return self.unique_id
         return self._json_data.attributes.custom_name
 
     @property

diff --git a/custom_components/dirigera_platform/fan.py b/custom_components/dirigera_platform/fan.py
@@ -173,14 +173,16 @@ def available(self):
     def device_info(self) -> DeviceInfo:
         return DeviceInfo(
             identifiers={("dirigera_platform", self._json_data.id)},
-            name=self._json_data.attributes.custom_name,
+            name=self.name,
             manufacturer=self._json_data.attributes.manufacturer,
             model=self._json_data.attributes.model,
             sw_version=self._json_data.attributes.firmware_version,
         )
 
     @property
     def name(self) -> str:
+        if self._json_data.attributes.custom_name is None or len(self._json_data.attributes.custom_name) == 0:
+            return self.unique_id
         return self._json_data.attributes.custom_name
 
     @property

diff --git a/custom_components/dirigera_platform/light.py b/custom_components/dirigera_platform/light.py
@@ -49,7 +49,6 @@ async def async_setup_entry(
     async_add_entities(lights)
     logger.debug("LIGHT Complete async_setup_entry")
 
-
 class ikea_bulb(LightEntity):
     _attr_has_entity_name = True
 
@@ -111,16 +110,18 @@ def available(self):
     def device_info(self) -> DeviceInfo:
         return DeviceInfo(
             identifiers={("dirigera_platform", self._json_data.id)},
-            name=self._json_data.attributes.custom_name,
+            name=self.name,
             manufacturer=self._json_data.attributes.manufacturer,
             model=self._json_data.attributes.model,
             sw_version=self._json_data.attributes.firmware_version,
         )
 
     @property
     def name(self):
+        if self._json_data.attributes.custom_name is None or len(self._json_data.attributes.custom_name) == 0:
+            return self.unique_id
         return self._json_data.attributes.custom_name
-
+    
     @property
     def brightness(self):
         scaled = int((self._json_data.attributes.light_level / 100) * 255)
@@ -211,4 +212,4 @@ def turn_off(self, **kwargs):
         except Exception as ex:
             logger.error("error encountered turning off : {}".format(self.name))
             logger.error(ex)
-            raise HomeAssistantError(ex, DOMAIN, "hub_exception")
+            raise HomeAssistantError(ex, DOMAIN, "hub_exception")
diff --git a/custom_components/dirigera_platform/sensor.py b/custom_components/dirigera_platform/sensor.py
@@ -127,14 +127,16 @@ def available(self):
     def device_info(self) -> DeviceInfo:
         return DeviceInfo(
             identifiers={("dirigera_platform", self._json_data.id)},
-            name=self._json_data.attributes.custom_name,
+            name=self.name,
             manufacturer=self._json_data.attributes.manufacturer,
             model=self._json_data.attributes.model,
             sw_version=self._json_data.attributes.firmware_version,
         )
 
     @property
     def name(self) -> str:
+        if self._json_data.attributes.custom_name is None or len(self._json_data.attributes.custom_name) == 0:
+            return self.unique_id
         return self._json_data.attributes.custom_name
 
     @property
@@ -289,7 +291,7 @@ def __init__(self, hub, json_data):
     def device_info(self) -> DeviceInfo:
         return DeviceInfo(
             identifiers={("dirigera_platform", self._json_data.id)},
-            name=self._json_data.attributes.custom_name,
+            name=self.name,
             manufacturer=self._json_data.attributes.manufacturer,
             model=self._json_data.attributes.model,
             sw_version=self._json_data.attributes.firmware_version,
@@ -309,6 +311,8 @@ def available(self):
 
     @property
     def name(self):
+        if self._json_data.attributes.custom_name is None or len(self._json_data.attributes.custom_name) == 0:
+            return self.unique_id
         return self._json_data.attributes.custom_name
 
     @property

diff --git a/custom_components/dirigera_platform/switch.py b/custom_components/dirigera_platform/switch.py
@@ -60,14 +60,16 @@ def available(self):
     def device_info(self) -> DeviceInfo:
         return DeviceInfo(
             identifiers={("dirigera_platform", self._json_data.id)},
-            name=self._json_data.attributes.custom_name,
+            name=self.name,
             manufacturer=self._json_data.attributes.manufacturer,
             model=self._json_data.attributes.model,
             sw_version=self._json_data.attributes.firmware_version,
         )
 
     @property
     def name(self):
+        if self._json_data.attributes.custom_name is None or len(self._json_data.attributes.custom_name) == 0:
+            return self.unique_id
         return self._json_data.attributes.custom_name
 
     @property