Merge branch 'dev' of github.com:mdeweerd/zha-toolkit into dev

Author: mdeweerd

custom_components/zha_toolkit/__init__.py

@@ -652,7 +652,7 @@ async def async_setup(hass, config):
         return True
 
     LOGGER.debug("Setup services from async_setup")
-    await hass.async_add_executor_job(register_services, hass)
+    register_services(hass)
 
     return True
 
@@ -710,7 +710,7 @@ async def toolkit_service(service):
             LOGGER.debug(
                 "Reload services because VERSION changed from %s to %s",
                 LOADED_VERSION,
-                u.getVersion(),
+                currentVersion,
             )
             await _register_services(hass)
 
@@ -739,7 +739,7 @@ async def toolkit_service(service):
 
         # Preload event_data
         event_data = {
-            "zha_toolkit_version": await u.getVersion(),
+            "zha_toolkit_version": currentVersion,
             "zigpy_version": u.getZigpyVersion(),
             "zigpy_rf_version": u.get_radio_version(app),
             "ieee_org": ieee_str,

custom_components/zha_toolkit/manifest.json

@@ -6,6 +6,6 @@
   "documentation": "https://github.com/mdeweerd/zha-toolkit",
   "iot_class": "local_polling",
   "issue_tracker": "https://github.com/mdeweerd/zha-toolkit/issues",
-  "requirements": ["pytz"],
+  "requirements": ["aiofiles>=0.4.0", "pytz>=>2016.10"],
   "version": "1.0.0"
 }

custom_components/zha_toolkit/utils.py

@@ -9,6 +9,7 @@
 import typing
 from enum import Enum
 
+import aiofiles
 import zigpy
 from homeassistant.components.zha.core.gateway import ZHAGateway
 from homeassistant.util import dt as dt_util
@@ -85,9 +86,9 @@ def getVersion() -> str:
         # No version, or file change -> get version again
         LOGGER.debug(f"Read version from {fname} {ftime}<>{VERSION_TIME}")
 
-        with open(fname, encoding="utf_8") as infile:
-            VERSION_TIME = ftime
-            MANIFEST = json.load(infile)
+        async with aiofiles.open(fname, mode="r", encoding="utf_8") as infile:
+            json_raw = await infile.read()
+            MANIFEST = json.loads(json_raw)
 
         if MANIFEST is not None:
             if "version" in MANIFEST.keys():