first tests with yaml config

boswatch/configYaml.py

@@ -9,7 +9,7 @@
                 German BOS Information Script
                      by Bastian Schroll
 
-@file:        config_yaml.py
+@file:        configYaml.py
 @date:        27.02.2019
 @author:      Bastian Schroll
 @description: Module for the configuration in yaml format

boswatch/filter/doubeFilter.py

@@ -18,7 +18,7 @@
 import logging
 import time
 
-from boswatch.config import Config
+from boswatch import configYaml
 
 logging.debug("- %s loaded", __name__)
 
@@ -28,7 +28,7 @@ class DoubleFilter:
 
     def __init__(self):
         """!init"""
-        self._config = Config()
+        self._config = configYaml.loadConfigSharepoint("serverConfig")["filter"]["doubleFilter"]
         self._filterLists = {}
 
     def filter(self, bwPacket):
@@ -57,14 +57,14 @@ class DoubleFilter:
         # delete entries that are to old
         counter = 0
         for listPacket in self._filterLists[bwPacket.get("mode")][1:]:  # [1:] skip first entry, thats the new one
-            if listPacket.get("timestamp") < (time.time() - self._config.getInt("doubleFilter", "IgnoreTime", "serverConfig")):
+            if listPacket.get("timestamp") < (time.time() - self._config["ignoreTime"]):
                 self._filterLists[bwPacket.get("mode")].remove(listPacket)
                 counter += 1
         if counter:
             logging.debug("%d old entry(s) removed", counter)
 
         # delete last entry if list is to big
-        if len(self._filterLists[bwPacket.get("mode")]) > self._config.getInt("doubleFilter", "MaxEntry", "serverConfig"):
+        if len(self._filterLists[bwPacket.get("mode")]) > self._config["maxEntry"]:
             logging.debug("MaxEntry reached - delete oldest")
             self._filterLists[bwPacket.get("mode")].pop()
 

boswatch/packet/packet.py

@@ -16,7 +16,7 @@
 """
 import logging
 import time
-from boswatch.config import Config
+from boswatch import configYaml
 from boswatch import version
 
 logging.debug("- %s loaded", __name__)
@@ -73,14 +73,14 @@ class Packet:
         - clientBranch
         - inputSource
         - frequency"""
-        config = Config()
+        config = configYaml.loadConfigSharepoint("clientConfig")
         logging.debug("add client data to bwPacket")
-        self.set("clientName", config.getStr("Client", "Name", "clientConfig"))
+        self.set("clientName", config["client"]["name"])
         self.set("clientVersion", version.client)
         self.set("clientBuildDate", version.date)
         self.set("clientBranch", version.branch)
-        self.set("inputSource", config.getStr("Client", "InputSource", "clientConfig"))
-        self.set("frequency", config.getStr("Stick", "Frequency", "clientConfig"))
+        self.set("inputSource", config["client"]["inputSource"])
+        self.set("frequency", config["inputSource"]["stick"]["frequency"])
 
     def addServerData(self):
         """!Add the server information to the decoded data
@@ -90,9 +90,9 @@ class Packet:
         - serverVersion
         - serverBuildDate
         - serverBranch"""
-        config = Config()
+        config = configYaml.loadConfigSharepoint("serverConfig")
         logging.debug("add server data to bwPacket")
-        self.set("serverName", config.getStr("Server", "Name", "serverConfig"))
+        self.set("serverName", config["server"]["name"])
         self.set("serverVersion", version.server)
         self.set("serverBuildDate", version.date)
         self.set("serverBranch", version.branch)