simply bool retrieval from cache

Author: dirixmjm

plugwise_usb/nodes/node.py

@@ -655,6 +655,14 @@ def _get_cache(self, setting: str) -> str | None:
             return None
         return self._node_cache.get_state(setting)
 
+    def _get_cache_as_bool(self, setting: str) -> bool | None:
+        """Retrieve bool of specified setting from cache memory."""
+        if not self._cache_enabled:
+            return None
+        if self._node_cache.get_state(setting) == "True":
+            return True
+        return False
+
     def _get_cache_as_datetime(self, setting: str) -> datetime | None:
         """Retrieve value of specified setting from cache memory and return it as datetime object."""
         if (timestamp_str := self._get_cache(setting)) is not None:

plugwise_usb/nodes/scan.py

@@ -178,13 +178,7 @@ async def _load_from_cache(self) -> bool:
 
     def _daylight_mode_from_cache(self) -> bool | None:
         """Load awake duration from cache."""
-        if (
-            daylight_mode := self._get_cache(CACHE_SCAN_CONFIG_DAYLIGHT_MODE)
-        ) is not None:
-            if daylight_mode == "True":
-                return True
-            return False
-        return None
+        return self._get_cache_as_bool(CACHE_SCAN_CONFIG_DAYLIGHT_MODE)
 
     def _motion_from_cache(self) -> bool:
         """Load motion state from cache."""
@@ -218,7 +212,7 @@ def _sensitivity_level_from_cache(self) -> MotionSensitivity | None:
 
     def _motion_config_dirty_from_cache(self) -> bool:
         """Load dirty  from cache."""
-        if (dirty := self._get_cache(CACHE_SCAN_CONFIG_DIRTY)) is not None:
+        if (dirty := self._get_cache_as_bool(CACHE_SCAN_CONFIG_DIRTY)) is not None:
             return dirty
         return True
 

plugwise_usb/nodes/sed.py

@@ -191,11 +191,7 @@ def _clock_interval_from_cache(self) -> int | None:
 
     def _clock_sync_from_cache(self) -> bool | None:
         """Load clock sync state from cache."""
-        if (clock_sync := self._get_cache(CACHE_SED_CLOCK_SYNC)) is not None:
-            if clock_sync == "True":
-                return True
-            return False
-        return None
+        return self._get_cache_as_bool(CACHE_SED_CLOCK_SYNC)
 
     def _maintenance_interval_from_cache(self) -> int | None:
         """Load maintenance interval from cache."""
@@ -222,7 +218,7 @@ def _awake_reason_from_cache(self) -> str | None:
 
     def _sed_config_dirty_from_cache(self) -> bool:
         """Load battery config dirty  from cache."""
-        if (dirty := self._get_cache(CACHE_SED_DIRTY)) is not None:
+        if (dirty := self._get_cache_as_bool(CACHE_SED_DIRTY)) is not None:
             return dirty
         return True