improve readability circle.py

expose dirty flag properly

Author: dirixmjm

plugwise_usb/nodes/circle.py

@@ -910,8 +910,10 @@ async def load(self) -> None:
 
             # Check if node is online
             if (
-                not self._available and not await self.is_online()
-            ) or await self.node_info_update() is None:
+                not self._available
+                and not await self.is_online()
+                or await self.node_info_update() is None
+            ):
                 _LOGGER.debug(
                     "Failed to retrieve NodeInfo for %s, loading defaults",
                     self._mac_in_str,

plugwise_usb/nodes/scan.py

@@ -227,6 +227,10 @@ def _motion_timestamp_from_cache(self) -> datetime | None:
     # endregion
 
     # region Properties
+    @property
+    def dirty(self) -> bool:
+        """Motion configuration dirty flag."""
+        return self._motion_config.dirty
 
     @property
     def daylight_mode(self) -> bool:
@@ -261,6 +265,7 @@ def motion_config(self) -> MotionConfig:
             reset_timer=self.reset_timer,
             daylight_mode=self.daylight_mode,
             sensitivity_level=self.sensitivity_level,
+            dirty=self.dirty,
         )
 
     @property

plugwise_usb/nodes/sed.py

@@ -162,7 +162,6 @@ async def _load_from_cache(self) -> bool:
             dirty = True
             sleep_duration = SED_DEFAULT_SLEEP_DURATION
         dirty &= self._sed_config_dirty_from_cache()
-
         self._battery_config = BatteryConfig(
             awake_duration=awake_duration,
             clock_interval=clock_interval,
@@ -191,6 +190,9 @@ def _clock_interval_from_cache(self) -> int | None:
 
     def _clock_sync_from_cache(self) -> bool | None:
         """Load clock sync state from cache."""
+        _LOGGER.debug(
+            "MDI: Bool: %s", str(self._get_cache_as_bool(CACHE_SED_CLOCK_SYNC))
+        )
         return self._get_cache_as_bool(CACHE_SED_CLOCK_SYNC)
 
     def _maintenance_interval_from_cache(self) -> int | None:
@@ -237,7 +239,9 @@ async def set_awake_duration(self, seconds: int) -> bool:
             )
 
         self._battery_config = replace(
-            self._battery_config, awake_duration=seconds, dirty=True
+            self._battery_config,
+            awake_duration=seconds,
+            dirty=True,
         )
         return True
 
@@ -325,6 +329,11 @@ async def set_sleep_duration(self, minutes: int) -> bool:
 
     # endregion
     # region Properties
+    @property
+    def dirty(self) -> int:
+        """Battry configuration dirty flag."""
+        return self._battery_config.dirty
+
     @property
     def awake_duration(self) -> int:
         """Duration in seconds a battery powered devices is awake."""
@@ -341,6 +350,7 @@ def battery_config(self) -> BatteryConfig:
             clock_sync=self.clock_sync,
             maintenance_interval=self.maintenance_interval,
             sleep_duration=self.sleep_duration,
+            dirty=self.dirty,
         )
 
     @property
@@ -413,17 +423,17 @@ async def _awake_response(self, response: PlugwiseResponse) -> bool:
         ):
             return True
 
+        await self._run_awake_tasks()
         self._last_awake[response.awake_type] = response.timestamp
 
         tasks: list[Coroutine[Any, Any, None]] = [
-            await self._reset_awake(response.timestamp),
+            self._reset_awake(response.timestamp),
             self.publish_feature_update_to_subscribers(
                 NodeFeature.BATTERY,
                 self._battery_config,
             ),
-            await self.save_cache(),
+            self.save_cache(),
         ]
-        await self._run_awake_tasks()
         if response.awake_type == NodeAwakeResponseType.MAINTENANCE:
             self._last_awake_reason = "Maintenance"
             self._set_cache(CACHE_SED_AWAKE_REASON, "Maintenance")