Fix creating cache folder during initialization

Author: brefra

plugwise_usb/__init__.py

@@ -276,6 +276,8 @@ async def initialize(self) -> None:
             self._network = StickNetwork(self._controller)
             self._network.cache_folder = self._cache_folder
             self._network.cache_enabled = self._cache_enabled
+            if self._cache_enabled:
+                await self._network.initialize_cache()
 
     @raise_not_connected
     @raise_not_initialized
@@ -285,6 +287,8 @@ async def start_network(self) -> None:
             self._network = StickNetwork(self._controller)
             self._network.cache_folder = self._cache_folder
             self._network.cache_enabled = self._cache_enabled
+            if self._cache_enabled:
+                await self._network.initialize_cache()
         await self._network.start()
 
     @raise_not_connected

plugwise_usb/network/__init__.py

@@ -12,7 +12,7 @@
 from ..api import NodeEvent, NodeType, StickEvent
 from ..connection import StickController
 from ..constants import UTF8
-from ..exceptions import MessageError, NodeError, StickError, StickTimeout
+from ..exceptions import CacheError, MessageError, NodeError, StickError, StickTimeout
 from ..messages.requests import (
     CirclePlusAllowJoiningRequest,
     NodeInfoRequest,
@@ -103,6 +103,12 @@ def cache_folder(self, cache_folder: str) -> None:
         for node in self._nodes.values():
             node.cache_folder = cache_folder
 
+    async def initialize_cache(self) -> None:
+        """Initialize the cache folder."""
+        if not self._cache_enabled:
+            raise CacheError("Unable to initialize cache, enable cache first.")
+        await self._register.initialize_cache()
+
     @property
     def controller_active(self) -> bool:
         """Return True if network controller (Circle+) is discovered and active."""

plugwise_usb/network/registry.py

@@ -9,7 +9,7 @@
 
 from ..api import NodeType
 from ..constants import UTF8
-from ..exceptions import NodeError
+from ..exceptions import CacheError, NodeError
 from ..messages.requests import CirclePlusScanRequest, NodeAddRequest, NodeRemoveRequest
 from ..messages.responses import (
     CirclePlusScanResponse,
@@ -57,19 +57,18 @@ def cache_enabled(self) -> bool:
     def cache_enabled(self, enable: bool = True) -> None:
         """Enable or disable usage of cache."""
         if enable and not self._cache_enabled:
-            _LOGGER.debug("Cache is enabled")
+            _LOGGER.debug("Enable cache")
             self._network_cache = NetworkRegistrationCache(self._cache_folder)
-            self._network_cache_file_task = create_task(
-                self._network_cache.initialize_cache()
-            )
         elif not enable and self._cache_enabled:
-            if self._network_cache is not None:
-                self._network_cache_file_task = create_task(
-                    self._network_cache.delete_cache()
-                )
-            _LOGGER.debug("Cache is disabled")
+            _LOGGER.debug("Disable cache")
         self._cache_enabled = enable
 
+    async def initialize_cache(self) -> None:
+        """Initialize cache"""
+        if not self._cache_enabled:
+            raise CacheError("Unable to initialize cache, enable cache first.")
+        await self._network_cache.initialize_cache()
+
     @property
     def cache_folder(self) -> str:
         """Path to folder to store cached data."""