#439 Check for attributes on restore

bruxy70 · Nov 21, 2022 · 04005c2 · 04005c2
1 parent 232bdbd
commit 04005c2
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/custom_components/garbage_collection/sensor.py b/custom_components/garbage_collection/sensor.py
@@ -143,11 +143,21 @@ async def async_added_to_hass(self) -> None:
         if (state := await self.async_get_last_state()) is not None:
             self._last_updated = None  # Unblock update - after options change
             self._attr_state = state.state
-            self._days = state.attributes[const.ATTR_DAYS]
-            next_date = helpers.parse_datetime(state.attributes[const.ATTR_NEXT_DATE])
+            self._days = (
+                state.attributes[const.ATTR_DAYS]
+                if const.ATTR_DAYS in state.attributes
+                else None
+            )
+            next_date = (
+                helpers.parse_datetime(state.attributes[const.ATTR_NEXT_DATE])
+                if const.ATTR_NEXT_DATE in state.attributes
+                else None
+            )
             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]
+            self.last_collection = (
+                helpers.parse_datetime(state.attributes[const.ATTR_LAST_COLLECTION])
+                if const.ATTR_LAST_COLLECTION in state.attributes
+                else None
             )
 
         # Create device