retore next_date to date

bruxy70 · Jul 14, 2022 · b99933f · b99933f
1 parent 232c4de
commit b99933f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/custom_components/garbage_collection/sensor.py b/custom_components/garbage_collection/sensor.py
@@ -110,7 +110,12 @@ def __init__(self, config_entry: ConfigEntry) -> None:
         self._icon_tomorrow = config.get(const.CONF_ICON_TOMORROW)
         exp = config.get(const.CONF_EXPIRE_AFTER)
         self.expire_after: time | None = (
-            None if exp is None else datetime.strptime(exp, "%H:%M:%S").time()
+            None
+            if (
+                exp is None
+                or datetime.strptime(exp, "%H:%M:%S").time() == time(0, 0, 0)
+            )
+            else datetime.strptime(exp, "%H:%M:%S").time()
         )
         self._date_format = config.get(
             const.CONF_DATE_FORMAT, const.DEFAULT_DATE_FORMAT
@@ -135,9 +140,8 @@ async def async_added_to_hass(self) -> None:
         if (state := await self.async_get_last_state()) is not None:
             self._attr_state = state.state
             self._days = state.attributes[const.ATTR_DAYS]
-            self._next_date = helpers.parse_datetime(
-                state.attributes[const.ATTR_NEXT_DATE]
-            )
+            next_date = helpers.parse_datetime(state.attributes[const.ATTR_NEXT_DATE])
+            self._next_date = None if next_date is None else next_date.date()
             self.last_collection = helpers.parse_datetime(
                 state.attributes[const.ATTR_LAST_COLLECTION]
             )