address comments from @CoMPaTech

Author: dirixmjm

.gitignore

@@ -19,3 +19,4 @@ fixtures/*
 tmp
 .cache
 appdata_folder
+mock_folder_that_exists/*

plugwise_usb/constants.py

@@ -41,7 +41,8 @@
 NODE_TIME_OUT: Final = 15
 
 # Retry delay discover nodes
-NODE_DISCOVER_INTERVAL = 60
+NODE_RETRY_DISCOVER_INTERVAL = 60
+NODE_RETRY_LOAD_INTERVAL = 60
 
 MAX_RETRIES: Final = 3
 SUPPRESS_INITIALIZATION_WARNINGS: Final = 10  # Minutes to suppress (expected) communication warning messages after initialization

plugwise_usb/network/__init__.py

@@ -12,7 +12,12 @@
 
 from ..api import NodeEvent, NodeType, PlugwiseNode, StickEvent
 from ..connection import StickController
-from ..constants import ENERGY_NODE_TYPES, UTF8
+from ..constants import (
+    ENERGY_NODE_TYPES,
+    NODE_RETRY_DISCOVER_INTERVAL,
+    NODE_RETRY_LOAD_INTERVAL,
+    UTF8,
+)
 from ..exceptions import CacheError, MessageError, NodeError, StickError, StickTimeout
 from ..helpers.util import validate_mac
 from ..messages.requests import CircleMeasureIntervalRequest, NodePingRequest
@@ -445,14 +450,11 @@ async def _discover_registered_nodes(self) -> None:
                         self._registry_stragglers[address] = mac
                 registered_counter += 1
                 await sleep(0)
-        if len(self._registry_stragglers) > 0:
-            if (
-                self._discover_stragglers_task is None
-                or self._discover_stragglers_task.done()
-            ):
-                self._discover_stragglers_task = create_task(
-                    self._discover_stragglers()
-                )
+        if len(self._registry_stragglers) > 0 and (
+            self._discover_stragglers_task is None
+            or self._discover_stragglers_task.done()
+        ):
+            self._discover_stragglers_task = create_task(self._discover_stragglers())
         _LOGGER.debug(
             "Total %s online of %s registered node(s)",
             str(len(self._nodes)),
@@ -462,7 +464,7 @@ async def _discover_registered_nodes(self) -> None:
     async def _discover_stragglers(self) -> None:
         """Repeat Discovery of Nodes with unknown NodeType."""
         while len(self._registry_stragglers) > 0:
-            await sleep(60)
+            await sleep(NODE_RETRY_DISCOVER_INTERVAL)
             stragglers: dict[int, str] = {}
             for address, mac in self._registry_stragglers.items():
                 if not await self._discover_node(address, mac, None):
@@ -486,9 +488,9 @@ async def _load_node(self, mac: str) -> bool:
 
     async def _load_stragglers(self) -> None:
         """Retry failed load operation."""
-        await sleep(60)
+        await sleep(NODE_RETRY_LOAD_INTERVAL)
         while not self._load_discovered_nodes():
-            await sleep(60)
+            await sleep(NODE_RETRY_LOAD_INTERVAL)
 
     async def _load_discovered_nodes(self) -> bool:
         """Load all nodes currently discovered."""

plugwise_usb/network/registry.py

@@ -163,9 +163,8 @@ async def update_network_registration(
                 node_type = self._network_cache.get_nodetype(mac)
 
         self._registry[address] = (mac, node_type)
-        if node_type is not None:
-            if self._network_cache is not None:
-                await self._network_cache.update_nodetypes(mac, node_type)
+        if node_type is not None and self._network_cache is not None:
+            await self._network_cache.update_nodetypes(mac, node_type)
 
     async def update_missing_registrations_full(self) -> None:
         """Full retrieval of all unknown network registrations from network controller."""

plugwise_usb/nodes/node.py

@@ -588,10 +588,9 @@ async def is_online(self) -> bool:
         if await self.ping_update() is None:
             _LOGGER.debug("No response to ping for %s", self.mac)
             return False
-        if not self._initialized:
-            if not await self.initialize():
-                _LOGGER.debug("Node %s failed to initialize after ping", self.mac)
-                return False
+        if not self._initialized and self._loaded and not await self.initialize():
+            _LOGGER.debug("Node %s failed to initialize after ping", self.mac)
+            return False
         return True
 
     async def ping_update(

tests/test_usb.py

@@ -207,17 +207,15 @@ class MockOsPath:
 
     async def exists(self, file_or_path: str) -> bool:  # noqa:  PLR0911
         """Exists folder."""
-        if file_or_path == "mock_folder_that_exists":
-            return True
-        if file_or_path == "mock_folder_that_exists/nodetype.cache":
-            return True
-        if file_or_path == "mock_folder_that_exists\\nodetype.cache":
-            return True
-        if file_or_path == "mock_folder_that_exists/0123456789ABCDEF.cache":
-            return True
-        if file_or_path == "mock_folder_that_exists\\0123456789ABCDEF.cache":
-            return True
-        if file_or_path == "mock_folder_that_exists\\file_that_exists.ext":
+        test_exists = [
+            "mock_folder_that_exists",
+            "mock_folder_that_exists/nodetype.cache",
+            "mock_folder_that_exists\\nodetype.cache",
+            "mock_folder_that_exists/0123456789ABCDEF.cache",
+            "mock_folder_that_exists\\0123456789ABCDEF.cache",
+            "mock_folder_that_exists\\file_that_exists.ext",
+        ]
+        if file_or_path in test_exists:
             return True
         return file_or_path == "mock_folder_that_exists/file_that_exists.ext"