♻️ improve for entity state (#2263)

al-one · Jan 2, 2025 · cfdf1c0 · cfdf1c0
1 parent 4bc63a4
commit cfdf1c0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/custom_components/xiaomi_miot/number.py b/custom_components/xiaomi_miot/number.py
@@ -69,7 +69,10 @@ def get_state(self) -> dict:
         return {self.attr: self._attr_native_value}
 
     def set_state(self, data: dict):
-        self._attr_native_value = self.conv.value_from_dict(data)
+        val = self.conv.value_from_dict(data)
+        if val is None:
+            return
+        self._attr_native_value = val
 
     async def async_set_native_value(self, value: float):
         await self.device.async_write({self.attr: value})

diff --git a/custom_components/xiaomi_miot/select.py b/custom_components/xiaomi_miot/select.py
@@ -59,7 +59,9 @@ def get_state(self) -> dict:
         return {self.attr: self._attr_current_option}
 
     def set_state(self, data: dict):
-        val = data.get(self.attr)
+        val = self.conv.value_from_dict(data)
+        if val is None:
+            return
         self._attr_current_option = val
 
     async def async_select_option(self, option: str):

diff --git a/custom_components/xiaomi_miot/sensor.py b/custom_components/xiaomi_miot/sensor.py
@@ -133,7 +133,7 @@ def get_state(self) -> dict:
         return {self.attr: self._attr_native_value}
 
     def set_state(self, data: dict):
-        value = data.get(self.attr)
+        value = self.conv.value_from_dict(data)
         prop = self._miot_property
         if prop and prop.value_range:
             if not prop.range_valid(value):
@@ -148,7 +148,7 @@ def set_state(self, data: dict):
                 value = None
             if self.device_class == SensorDeviceClass.TIMESTAMP:
                 value = datetime_with_tzinfo(value)
-        self._attr_native_value = value
+            self._attr_native_value = value
 
     @cached_property
     def custom_value_ratio(self):

diff --git a/custom_components/xiaomi_miot/switch.py b/custom_components/xiaomi_miot/switch.py
@@ -73,10 +73,10 @@ def get_state(self) -> dict:
         return {self.attr: self._attr_is_on}
 
     def set_state(self, data: dict):
-        val = data.get(self.attr)
-        if val is not None:
-            val = bool(val)
-        self._attr_is_on = val
+        val = self.conv.value_from_dict(data)
+        if val is None:
+            return
+        self._attr_is_on = bool(val)
 
     async def async_turn_on(self):
         await self.device.async_write({self.attr: True})

diff --git a/custom_components/xiaomi_miot/text.py b/custom_components/xiaomi_miot/text.py
@@ -41,10 +41,12 @@ def get_state(self) -> dict:
 
     def set_state(self, data: dict):
         val = self.conv.value_from_dict(data)
+        if val is None:
+            return
         if isinstance(val, list):
             val = val[0] if val else None
-        if val is None:
-            val = ''
+            if val is None:
+                val = ''
         self._attr_native_value = val
 
     async def async_set_value(self, value: str):