pyhausbus 1.0.6__py2.py3-none-any.whl → 1.0.7__py2.py3-none-any.whl

pyhausbus/Templates.py

@@ -2,6 +2,7 @@ import os
 from collections import defaultdict
 from typing import List, Dict, Optional
 from pyhausbus.de.hausbus.homeassistant.proxy.controller.params.EFirmwareId import EFirmwareId
+from pyhausbus.HausBusUtils import LOGGER
 
 def load_file(path: str) -> list[str]:
     try:
@@ -15,7 +16,8 @@ def load_file(path: str) -> list[str]:
         return []
 
 class Templates:
-    template_root_dir = "pyhausbus/templates/"
+    template_root_dir = os.path.join(os.path.dirname(__file__), "templates")
+    LOGGER.debug(f"templateRootDir = {self.template_root_dir}")
     filter_non_existing = True
     _instance = None
     class_mappings: Dict[str, str] = {}
@@ -25,7 +27,7 @@ class Templates:
         self.feature_names: Dict['ModuleType', List['FeatureEntry']] = {}
 
         try:
-            lines = load_file(self.template_root_dir + "deviceTypes.def")
+            lines = load_file(os.path.join(self.template_root_dir, "deviceTypes.def"))
             for line in lines:
                 tokens = line.split(",")
                 firmware_id = EFirmwareId.value_of(tokens[0])
@@ -58,16 +60,17 @@ class Templates:
               
             quit()'''
 
-            lines = load_file(self.template_root_dir + "classMapping.def")
+            lines = load_file(os.path.join(self.template_root_dir, "classMapping.def"))
             if lines:
                 for line in lines:
                     tokens = line.split(",")
                     orig_name = tokens[0]
                     mapped_name = tokens[1]
                     Templates.class_mappings[orig_name] = mapped_name
-
+            LOGGER.debug(f"module types = {len(self.module_types)}")
+            LOGGER.debug(f"feature names = {len(self.feature_names)}")
         except Exception as e:
-            print(f"Fehler beim Initialisieren der Templates: {e}")
+            LOGGER.error(f"Fehler beim Initialisieren der Templates: {e}")
 
     @classmethod
     def get_instance(cls):

{pyhausbus-1.0.6.dist-info → pyhausbus-1.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhausbus
-Version: 1.0.6
+Version: 1.0.7
 Summary: Python based library for accessing haus-bus.de modules. Inteded to be used in a Home Assistant integration.
 Home-page: https://haus-bus.secure-stores.de/
 Author: Hermann Hoeschen

{pyhausbus-1.0.6.dist-info → pyhausbus-1.0.7.dist-info}/RECORD

@@ -630,10 +630,10 @@ pyhausbus/templates/SD485_2E_6-fach-Taster.tpl,sha256=d8ALY9k1pcNSQUGSqSUsIpiRva
 pyhausbus/templates/SD485_2F_6-fach-Taster.tpl,sha256=d8ALY9k1pcNSQUGSqSUsIpiRvaR0bqoy4onhpfF7bzA,533
 pyhausbus/templates/SD6_14_Multitaster.tpl,sha256=cneNlLhmyE0RSh1BQK5p8Gz2cRbDOFztfc1_XWy3fAY,451
 pyhausbus/templates/SD6_1E_Multitaster.tpl,sha256=cneNlLhmyE0RSh1BQK5p8Gz2cRbDOFztfc1_XWy3fAY,451
-pyhausbus/Templates.py,sha256=Fo-xYyKUeEgcOo5hYIUUH3vx5DRnDY9jLnykk16hJQg,5333
+pyhausbus/Templates.py,sha256=gtghruC2mTbvzUQ_7bTiIvK4Rnq81NzRuMdbbQNIg8U,5644
 pyhausbus/UdpReceiveWorker.py,sha256=lQD2O2Rqk3Xvy6Glrlbn1p2n4ZTWW80yxJp3-OsQTcc,2678
 pyhausbus/WeekTime.py,sha256=o30XyAOEYAQhcWdE2hEX685RNJmo-VCQNPEx1xAFwzk,1287
-pyhausbus-1.0.6.dist-info/LICENSE,sha256=LrguBvqK4LI4RXcja3oOYNPAIB5x5HPUXHRlkTkP5Sg,1094
-pyhausbus-1.0.6.dist-info/METADATA,sha256=9QAurk7rVxemyk4fXCQ9CS5VrtEZ58GhFOCe80Eold8,1324
-pyhausbus-1.0.6.dist-info/WHEEL,sha256=iAMR_6Qh95yyjYIwRxyjpiFq4FhDPemrEV-SyWIQB3U,92
-pyhausbus-1.0.6.dist-info/RECORD,,
+pyhausbus-1.0.7.dist-info/LICENSE,sha256=LrguBvqK4LI4RXcja3oOYNPAIB5x5HPUXHRlkTkP5Sg,1094
+pyhausbus-1.0.7.dist-info/METADATA,sha256=NDThp0QVotdWwbJPkOEKF_jt0_EiRRmFooWoagwpLgE,1324
+pyhausbus-1.0.7.dist-info/WHEEL,sha256=iAMR_6Qh95yyjYIwRxyjpiFq4FhDPemrEV-SyWIQB3U,92
+pyhausbus-1.0.7.dist-info/RECORD,,