velbus-aio 2024.7.0__tar.gz → 2024.7.4__tar.gz

{velbus_aio-2024.7.0/velbus_aio.egg-info → velbus_aio-2024.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velbus-aio
-Version: 2024.7.0
+Version: 2024.7.4
 Summary: Open-source home automation platform running on Python 3.
 Author-email: Maikel Punie <maikel.punie@gmail.com>
 License: MIT
@@ -28,6 +28,7 @@ License-File: LICENSE
 Requires-Dist: pyserial>=3.5.0
 Requires-Dist: pyserial-asyncio_fast>=0.11
 Requires-Dist: backoff>=1.10.0
+Requires-Dist: aiofile
 
 ![CI](https://github.com/Cereal2nd/velbus-aio/actions/workflows/main.yml/badge.svg)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Cereal2nd/velbus-aio/master.svg)](https://results.pre-commit.ci/latest/github/Cereal2nd/velbus-aio/master)

{velbus_aio-2024.7.0 → velbus_aio-2024.7.4}/pyproject.toml

@@ -4,7 +4,7 @@ requires = ["setuptools", "wheel"]
 [project]
 name = "velbus-aio"
 license = {text = "MIT"}
-version = "2024.7.0"
+version = "2024.7.4"
 description = "Open-source home automation platform running on Python 3."
 readme = "README.md"
 authors = [
@@ -32,6 +32,7 @@ dependencies = [
     "pyserial>=3.5.0",
     "pyserial-asyncio_fast>=0.11",
     "backoff>=1.10.0",
+    "aiofile",
 ]
 
 [project.urls]
@@ -51,7 +52,7 @@ exclude_dirs = ["tests"]
 skips = ["B301", "B403", "B323", "B104", "B110"]
 
 [tool.bumpver]
-current_version = "2024.7.0"
+current_version = "2024.7.4"
 version_pattern = "YYYY.MM.INC0"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

{velbus_aio-2024.7.0 → velbus_aio-2024.7.4/velbus_aio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velbus-aio
-Version: 2024.7.0
+Version: 2024.7.4
 Summary: Open-source home automation platform running on Python 3.
 Author-email: Maikel Punie <maikel.punie@gmail.com>
 License: MIT
@@ -28,6 +28,7 @@ License-File: LICENSE
 Requires-Dist: pyserial>=3.5.0
 Requires-Dist: pyserial-asyncio_fast>=0.11
 Requires-Dist: backoff>=1.10.0
+Requires-Dist: aiofile
 
 ![CI](https://github.com/Cereal2nd/velbus-aio/actions/workflows/main.yml/badge.svg)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/Cereal2nd/velbus-aio/master.svg)](https://results.pre-commit.ci/latest/github/Cereal2nd/velbus-aio/master)

{velbus_aio-2024.7.0 → velbus_aio-2024.7.4}/velbus_aio.egg-info/requires.txt

@@ -1,3 +1,4 @@
 pyserial>=3.5.0
 pyserial-asyncio_fast>=0.11
 backoff>=1.10.0
+aiofile

{velbus_aio-2024.7.0 → velbus_aio-2024.7.4}/velbusaio/controller.py

@@ -54,6 +54,9 @@ class Velbus:
         # make sure the cachedir exists
         pathlib.Path(self._cache_dir).mkdir(parents=True, exist_ok=True)
 
+    def get_cache_dir(self) -> str:
+        return self._cache_dir
+
     async def _on_message_received(self, msg: RawMessage) -> None:
         """On message received function."""
         await self._handler.handle(msg)

{velbus_aio-2024.7.0 → velbus_aio-2024.7.4}/velbusaio/handler.py

@@ -27,7 +27,6 @@ from velbusaio.message import Message
 from velbusaio.messages.module_subtype import ModuleSubTypeMessage
 from velbusaio.messages.module_type import ModuleTypeMessage, ModuleType2Message
 from velbusaio.raw_message import RawMessage
-from velbusaio.helpers import get_cache_dir
 
 
 if TYPE_CHECKING:
@@ -63,8 +62,8 @@ class PacketHandler:
             len(
                 [
                     name
-                    for name in os.listdir(f"{get_cache_dir()}")
-                    if os.path.isfile(f"{get_cache_dir()}/{name}")
+                    for name in os.listdir(f"{self._velbus.get_cache_dir()}")
+                    if os.path.isfile(f"{self._velbus.get_cache_dir()}/{name}")
                 ]
             )
             == 0
@@ -78,6 +77,8 @@ class PacketHandler:
             self._scan_complete = False
         # non-blocking check to see if the cache_dir is empty
         loop = asyncio.get_running_loop()
+        print(self._velbus.get_cache_dir())
+        print(await loop.run_in_executor(None, self.empty_cache))
         if not reload_cache and await loop.run_in_executor(None, self.empty_cache):
             self._log.info("No cache yet, so forcing a bus scan")
             reload_cache = True
@@ -92,7 +93,7 @@ class PacketHandler:
 
             self._log.info(f"Starting handling scan {address}")
 
-            cfile = pathlib.Path(f"{get_cache_dir()}/{address}.json")
+            cfile = pathlib.Path(f"{self._velbus.get_cache_dir()}/{address}.json")
             # cleanup the old module cache if needed
             scanModule = reload_cache
             if scanModule and os.path.isfile(cfile):