Fix invalid date formats (#4460)

Author: andrew-codechimp

custom_components/battery_notes/common.py

@@ -1,5 +1,6 @@
 """Common functions for battery_notes."""
 
+import re
 from datetime import datetime
 
 from homeassistant.helpers.device_registry import DeviceEntry
@@ -23,6 +24,29 @@ def utcnow_no_timezone() -> datetime:
     return dt_util.utcnow().replace(tzinfo=None)
 
 
+def fix_datetime_string(datetime_str) -> str:
+    """Fix datetime string by replacing colon with period before microseconds."""
+    # Prior to 3.3.2 there was an issue where microseconds were formatted with a colon and are held in storage.
+    # New dates are stored correctly, over time the last_reported, last_replaced will be updated with the correct format.
+
+    # Look for timezone offset at the end (e.g., +00:00, -05:00, Z)
+    tz_match = re.search(r"([+-]\d{2}:\d{2}|[+-]\d{4}|Z)$", datetime_str)
+
+    if tz_match:
+        # Split into datetime and timezone parts
+        tz_start = tz_match.start()
+        datetime_part = datetime_str[:tz_start]
+        tz_part = datetime_str[tz_start:]
+    else:
+        datetime_part = datetime_str
+        tz_part = ""
+
+    # Replace colon with period only if followed by exactly 6 digits (microseconds)
+    datetime_part = re.sub(r":(\d{6})$", r".\1", datetime_part)
+
+    return datetime_part + tz_part
+
+
 def get_device_model_id(device_entry: DeviceEntry) -> str | None:
     """Get the device model if available."""
     return device_entry.model_id if hasattr(device_entry, "model_id") else None

custom_components/battery_notes/coordinator.py

@@ -29,7 +29,7 @@
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util.hass_dict import HassKey
 
-from .common import utcnow_no_timezone, validate_is_float
+from .common import fix_datetime_string, utcnow_no_timezone, validate_is_float
 from .const import (
     ATTR_BATTERY_LAST_REPLACED,
     ATTR_BATTERY_LEVEL,
@@ -636,11 +636,15 @@ def last_replaced(self) -> datetime | None:
                 self.device_id
             )
 
-        if entry:
-            if LAST_REPLACED in entry and entry[LAST_REPLACED] is not None:
-                entry_last_replaced = str(entry[LAST_REPLACED])
-                if not entry_last_replaced.endswith("+00:00"):
-                    entry_last_replaced += "+00:00"
+        if entry and LAST_REPLACED in entry and entry[LAST_REPLACED] is not None:
+            entry_last_replaced = str(entry[LAST_REPLACED])
+            if not entry_last_replaced.endswith("+00:00"):
+                entry_last_replaced += "+00:00"
+
+            try:
+                return datetime.fromisoformat(entry_last_replaced)
+            except ValueError:
+                entry_last_replaced = fix_datetime_string(entry_last_replaced)
                 return datetime.fromisoformat(entry_last_replaced)
         return None
 
@@ -677,7 +681,12 @@ def last_reported(self) -> datetime | None:
             entry_last_reported = str(entry[LAST_REPORTED])
             if not entry_last_reported.endswith("+00:00"):
                 entry_last_reported += "+00:00"
-            return datetime.fromisoformat(entry_last_reported)
+
+            try:
+                return datetime.fromisoformat(entry_last_reported)
+            except ValueError:
+                entry_last_reported = fix_datetime_string(entry_last_reported)
+                return datetime.fromisoformat(entry_last_reported)
 
         return None