xaal.lib 0.7.10__py3-none-any.whl → 0.7.12__py3-none-any.whl

xaal/lib/aioengine.py

@@ -268,9 +268,8 @@ class AsyncEngine(core.EngineMixin):
         self.started_event.clear()
         # cancel all tasks
         for task in self.all_tasks():
-            if task != self._watchdog_task:
+            if task != self._watchdog_task and not task.cancelled():
                 task.cancel()
-                await asyncio.sleep(0.1)
 
     def sigkill_handler(self, signal, frame):
         print("", end="\r")  # remove the uggly ^C

xaal/lib/config.py

@@ -87,9 +87,12 @@ class Config:
         return False
 
 
+config_dir = os.environ.get("XAAL_CONF_DIR", None)
 config = Config()
-try:
-    config.load()
-except Exception as e:
-    print(e)
-    sys.exit(-1)
+
+if config_dir is None or config_dir != '':
+    try:
+        config.load()
+    except Exception as e:
+        print(e)
+        sys.exit(-1)

xaal/lib/devices.py

@@ -247,21 +247,21 @@ class Device(object):
         r.append(['address', self.address])
         for k, v in self._get_description().items():
             r.append([k, v])
-        print(tabulate(r, tablefmt='fancy_grid'))
+        print(tabulate(r, tablefmt='psql'))
 
         # attributes
         if len(self._get_attributes()) > 0:
             r = []
             for k, v in self._get_attributes().items():
                 r.append([k, str(v)])
-            print(tabulate(r, tablefmt='fancy_grid'))
+            print(tabulate(r, tablefmt='psql'))
 
         # methods
         if len(self.methods) > 0:
             r = []
             for k, v in self.methods.items():
                 r.append([k, v.__name__])
-            print(tabulate(r, tablefmt='fancy_grid'))
+            print(tabulate(r, tablefmt='psql'))
 
     def __repr__(self) -> str:
         return f"<xaal.Device {id(self):x} {self.address} {self.dev_type}>"

xaal/lib/helpers.py

@@ -7,7 +7,7 @@ import logging
 import logging.handlers
 import os
 import time
-from typing import Any, Optional
+from typing import Any, Optional, Union
 
 import coloredlogs
 from decorator import decorator
@@ -41,13 +41,14 @@ def set_console_title(value: str):
     print("\x1b]0;xAAL => %s\x07" % value, end="\r")
 
 
-def setup_console_logger(level: str = config.log_level):
-    fmt = "%(asctime)s %(name)-25s %(funcName)-18s %(levelname)-8s %(message)s"
+def setup_console_logger(level: Union[str, int] = config.log_level):
+    # fmt = "%(asctime)s %(name)-25s %(funcName)-18s %(levelname)-8s %(message)s"
+    fmt = "%(asctime)s %(name)-25s %(funcName)-18s %(message)s"
     # fmt = '[%(name)s] %(funcName)s %(levelname)s: %(message)s'
     coloredlogs.install(level=level, fmt=fmt)
 
 
-def setup_file_logger(name: str, level: str = config.log_level, filename: Optional[str] = None):
+def setup_file_logger(name: str, level: Union[str, int] = config.log_level, filename: Optional[str] = None):
     filename = filename or os.path.join(config.log_path, "%s.log" % name)
     formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(name)s - %(message)s")
     handler = logging.handlers.RotatingFileHandler(filename, "a", 10000, 1, "utf8")

{xaal.lib-0.7.10.dist-info → xaal_lib-0.7.12.dist-info}/METADATA

@@ -1,12 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: xaal.lib
-Version: 0.7.10
+Version: 0.7.12
 Summary: Official Python stack for xAAL protocol
 Author-email: Jerome Kerdreux <Jerome.Kerdreux@imt-atlantique.fr>
 License: GPL License
-Project-URL: Homepage, https://recherche.imt-atlantique.fr/xaal/
-Project-URL: Documentation, https://redmine.imt-atlantique.fr/projects/xaal/repository/xaal/entry/code/Python/branches/0.7/libs/lib/README.rst
-Project-URL: Source, https://redmine.imt-atlantique.fr/projects/xaal/repository/xaal/show/code/Python/branches/0.7/libs/lib
+Project-URL: Homepage, https://gitlab.imt-atlantique.fr/xaal/code/python/-/blob/main/packages.rst
+Project-URL: Documentation, https://gitlab.imt-atlantique.fr/xaal/code/python/-/blob/main/libs/lib/README.rst
+Project-URL: Source, https://gitlab.imt-atlantique.fr/xaal/code/python/-/tree/main/libs/lib
 Keywords: xaal,home-automation
 Classifier: Programming Language :: Python
 Classifier: Topic :: Software Development :: Libraries :: Python Modules

{xaal.lib-0.7.10.dist-info → xaal_lib-0.7.12.dist-info}/RECORD

@@ -1,22 +1,22 @@
 xaal/__init__.py,sha256=jv2YF__bseklT3OWEzlqJ5qE24c4aWd5F4r0TTjOrWQ,65
 xaal/lib/__init__.py,sha256=yI2lG7uSbedjp1h2FCdcAUGzkyuJxYyNbK13SHvwNew,491
 xaal/lib/__main__.py,sha256=xsVqqoIh3UeJIXxeexSfmGSUP4YxUcibdZExjEzk4lE,30
-xaal/lib/aioengine.py,sha256=BHCDfr3yVurQj3ePFHyDoBpqqyMuppxLD7OvG6IWgkI,14029
+xaal/lib/aioengine.py,sha256=rMFQJgPVtqkCkQAJFM2y4AQucbxr7riUFkb0QWO3asg,14013
 xaal/lib/aiohelpers.py,sha256=O1oQX8XHxuvCL1ual509chjoR52AwV_ZGqeAbSlvFrE,1010
 xaal/lib/aionetwork.py,sha256=WSYwxwEHJaQDlfVocX8ow2tAtssWcH9LxPAazx4Qx_o,2547
 xaal/lib/bindings.py,sha256=V77bFfeVFj0GyGuwH8b4k7qSyA7zApZYJ8QTjq_3DwI,2140
 xaal/lib/cbor.py,sha256=XX0zgTU0uwQD9QXctGLT4lEISohi1whMUdyWKMevH8c,1647
-xaal/lib/config.py,sha256=KR28xC8NGyGjvFD9QcAoWfwyf7xcXDEP7aSenNmaRzM,3019
+xaal/lib/config.py,sha256=cKI2XvyN2rNFOBQCMithigHa72hbnDjV4aOrc2ws7io,3134
 xaal/lib/core.py,sha256=IBTrCCZhBKKYOuZWImxETbLZ5_upH5MRoIKKBXYEXvU,11982
-xaal/lib/devices.py,sha256=CaUH3i_xTQD0W63fW93glI-Ck2_YVvMpdn8y7BqQqzw,10696
+xaal/lib/devices.py,sha256=KnmZvn_WJNqhMTlNPp5UTrHHAuwXdZwiJlQCMDhH2UM,10678
 xaal/lib/engine.py,sha256=oFiBIma5M6Qv0W2wMmWdyCRuu7BwqR-DRUvqWfajh-A,8141
 xaal/lib/exceptions.py,sha256=4cKKkDDcZIPyVrLv3Q19apbn_pIqDGqXb1s1d2sZnpI,573
-xaal/lib/helpers.py,sha256=lPtEwP82Ssd9igmxJGq2UzmPVCyRBMHULBBVyAH4Blg,2827
+xaal/lib/helpers.py,sha256=eq6IyiVAvr4GViaZYMDgjB9c4_p4cRoymueNpWY4qIQ,2924
 xaal/lib/messages.py,sha256=FpdIZ5flzUfgXaVVptv_tirvq5jL__mjUGimExwK9Z0,12388
 xaal/lib/network.py,sha256=oHpyHXkFT31RS6UKMZstC33dgC_sTtYKzfpgugY26oU,3277
 xaal/lib/test.py,sha256=GTjIwdqRupdqO4lNhAnc4iH0azfCCMN9BEpJpgAUors,2944
 xaal/lib/tools.py,sha256=Py_RUmLcOVjYDcm7muQ6jZPJLdOKzBfOKstX73K4Jqg,4157
-xaal.lib-0.7.10.dist-info/METADATA,sha256=wnOQJjes_62vU63PL8hKCKsskwSJr8TbBtHY9XZj-IU,4351
-xaal.lib-0.7.10.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-xaal.lib-0.7.10.dist-info/top_level.txt,sha256=UZ2WDkN02ztkh1OrsjrW8Kmj4n3WqC0BQxaEYOYfWa0,5
-xaal.lib-0.7.10.dist-info/RECORD,,
+xaal_lib-0.7.12.dist-info/METADATA,sha256=prt8GgsAd9KBV3PqjpZuSeLNh8qCuNORd0iX-CNmjg8,4319
+xaal_lib-0.7.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xaal_lib-0.7.12.dist-info/top_level.txt,sha256=UZ2WDkN02ztkh1OrsjrW8Kmj4n3WqC0BQxaEYOYfWa0,5
+xaal_lib-0.7.12.dist-info/RECORD,,

{xaal.lib-0.7.10.dist-info → xaal_lib-0.7.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any