Move generic initialize code to base class

Author: brefra

plugwise_usb/nodes/__init__.py

@@ -410,7 +410,10 @@ async def _load_from_cache(self) -> bool:
 
     async def initialize(self) -> bool:
         """Initialize node."""
-        raise NotImplementedError()
+        if self._initialized:
+            return True
+        self._initialized = True
+        return True
 
     async def _available_update_state(self, available: bool) -> None:
         """Update the node availability state."""

plugwise_usb/nodes/circle.py

@@ -786,8 +786,14 @@ async def initialize(self) -> bool:
         if self._initialized:
             _LOGGER.debug("Already initialized node %s", self._mac_in_str)
             return True
-        self._initialized = True
 
+        if isinstance(self, PlugwiseCircle) and not await self.clock_synchronize():
+            _LOGGER.debug(
+                "Failed to initialized node %s, failed clock sync",
+                self._mac_in_str
+            )
+            self._initialized = False
+            return False
         if not self._calibration and not await self.calibration_update():
             _LOGGER.debug(
                 "Failed to initialized node %s, no calibration",
@@ -800,13 +806,6 @@ async def initialize(self) -> bool:
                 "Failed to retrieve node info for %s",
                 self._mac_in_str
             )
-        if not await self.clock_synchronize():
-            _LOGGER.debug(
-                "Failed to initialized node %s, failed clock sync",
-                self._mac_in_str
-            )
-            self._initialized = False
-            return False
         if (
             NodeFeature.RELAY_INIT in self._features and
             self._relay_init_state is None
@@ -820,7 +819,7 @@ async def initialize(self) -> bool:
                 )
                 self._initialized = False
                 return False
-        return True
+        return await super().initialize()
 
     async def node_info_update(
         self, node_info: NodeInfoResponse | None = None

plugwise_usb/nodes/circle_plus.py

@@ -90,31 +90,10 @@ async def initialize(self) -> bool:
         """Initialize node."""
         if self._initialized:
             return True
-        self._initialized = True
-        if not self._available:
-            self._initialized = False
-            return False
-        if not self._calibration and not await self.calibration_update():
-            self._initialized = False
-            return False
         if not await self.realtime_clock_synchronize():
             self._initialized = False
             return False
-        if (
-            NodeFeature.RELAY_INIT in self._features and
-            self._relay_init_state is None
-        ):
-            if (state := await self._relay_init_get()) is not None:
-                self._relay_init_state = state
-            else:
-                _LOGGER.debug(
-                    "Failed to initialized node %s, relay init",
-                    self.mac
-                )
-                return False
-        self._initialized = True
-        await self._loaded_callback(NodeEvent.LOADED, self.mac)
-        return True
+        return await super().initialize()
 
     async def realtime_clock_synchronize(self) -> bool:
         """Synchronize realtime clock."""

plugwise_usb/nodes/scan.py

@@ -66,17 +66,12 @@ async def initialize(self) -> bool:
         """Initialize Scan node."""
         if self._initialized:
             return True
-        self._initialized = True
-        if not await super().initialize():
-            self._initialized = False
-            return False
         self._scan_subscription = self._message_subscribe(
             self._switch_group,
             self._mac_in_bytes,
             (NODE_SWITCH_GROUP_ID,),
         )
-        self._initialized = True
-        return True
+        return await super().initialize()
 
     async def unload(self) -> None:
         """Unload node."""

plugwise_usb/nodes/sed.py

@@ -96,7 +96,7 @@ async def initialize(self) -> bool:
             self._mac_in_bytes,
             NODE_AWAKE_RESPONSE_ID,
         )
-        return True
+        return await super().initialize()
 
     @property
     def maintenance_interval(self) -> int | None:

plugwise_usb/nodes/sense.py

@@ -63,15 +63,12 @@ async def initialize(self) -> bool:
         """Initialize Sense node."""
         if self._initialized:
             return True
-        if not await super().initialize():
-            return False
         self._sense_subscription = self._message_subscribe(
             self._sense_report,
             self._mac_in_bytes,
             SENSE_REPORT_ID,
         )
-        self._initialized = True
-        return True
+        return await super().initialize()
 
     async def unload(self) -> None:
         """Unload node."""

plugwise_usb/nodes/switch.py

@@ -47,16 +47,13 @@ async def initialize(self) -> bool:
         """Initialize Switch node."""
         if self._initialized:
             return True
-        if not await super().initialize():
-            return False
         self._switch_subscription = self._message_subscribe(
             b"0056",
             self._switch_group,
             self._mac_in_bytes,
             NODE_SWITCH_GROUP_ID,
         )
-        self._initialized = True
-        return True
+        return await super().initialize()
 
     async def unload(self) -> None:
         """Unload node."""