refactor: Datetime platform _attr_native_value

davidrapan · Oct 5, 2024 · 44f5739 · 44f5739
1 parent 9486725
commit 44f5739
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/custom_components/solarman/datetime.py b/custom_components/solarman/datetime.py
@@ -3,7 +3,7 @@
 import logging
 
 from zoneinfo import ZoneInfo
-from datetime import datetime, time
+from datetime import datetime
 from functools import cached_property, partial
 
 from homeassistant.config_entries import ConfigEntry
@@ -54,10 +54,12 @@ def __init__(self, coordinator, sensor):
         if registers_length > 3 and registers[3] == registers[0] + 3:
             self._multiple_registers = True
 
-    @cached_property
+    @property
     def native_value(self) -> datetime | None:
         """Return the value reported by the datetime."""
-        return self._attr_native_value.replace(tzinfo = ZoneInfo(self.coordinator.hass.config.time_zone))
+        if not self._attr_native_value:
+            return None
+        return datetime.strptime(self._attr_native_value, '%y/%m/%d %H:%M:%S').replace(tzinfo = ZoneInfo(self.coordinator.hass.config.time_zone))
 
     async def async_set_value(self, value: datetime) -> None:
         """Change the date/time."""

diff --git a/custom_components/solarman/parser.py b/custom_components/solarman/parser.py
@@ -454,7 +454,9 @@ def try_parse_datetime(self, rawData, definition, start, length):
                 value = value[:-1]
 
             try:
-                self.set_state(key, datetime.strptime(value, '%y/%m/%d %H:%M:%S'))
+                if not "platform" in definition:
+                    value = datetime.strptime(value, '%y/%m/%d %H:%M:%S')
+                self.set_state(key, value)
             except Exception as e:
                 _LOGGER.debug(f"ParameterParser.try_parse_datetime: start: {start}, length: {length}, rawData: {rawData}, definition: {definition} [{format_exception(e)}]")
 

diff --git a/custom_components/solarman/time.py b/custom_components/solarman/time.py
@@ -52,12 +52,12 @@ def __init__(self, coordinator, sensor):
         if registers_length > 1 and registers[1] == registers[0] + 1:
             self._multiple_registers = True
 
-    @cached_property
+    @property
     def native_value(self) -> time | None:
         """Return the state of the setting entity."""
         if not self._attr_native_value:
             return None
-        if isinstance(self._attr_native_value, list):
+        if isinstance(self._attr_native_value, list) and len(self._attr_native_value) > 1:
             return datetime.strptime(f"{self._attr_native_value[0]}:{self._attr_native_value[1]}", "%H:%M").time()
         return datetime.strptime(self._attr_native_value, "%H:%M").time()