Parse negative values

nielstron · Mar 2, 2019 · a562ba4 · a562ba4
1 parent 4ba082c
commit a562ba4
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 3 deletions.
diff --git a/pyblnet/blnet_web.py b/pyblnet/blnet_web.py
@@ -199,7 +199,7 @@ def read_analog_values(self):
 
         # search for data by regular expression
         match_iter = re.finditer(
-            r"(?P<id>\d+):&nbsp;(?P<name>.+)\n(&nbsp;){3,6}(?P<value>\d+,\d+) (?P<unit_of_measurement>.+?) &nbsp;&nbsp;PAR?",
+            r"(?P<id>\d+):&nbsp;(?P<name>.+)\n(&nbsp;){3,6}(?P<value>-?\d+,\d+) (?P<unit_of_measurement>.+?) &nbsp;&nbsp;PAR?",
             data_raw)
         # parse a dict of the match and save them all in a list
         for match in match_iter:

diff --git a/pyblnet/tests/test_structure/580500.alternative.htm b/pyblnet/tests/test_structure/580500.alternative.htm
diff --git a/pyblnet/tests/test_structure/580500.htm b/pyblnet/tests/test_structure/580500.htm
diff --git a/pyblnet/tests/web_raw/web_state.py b/pyblnet/tests/web_raw/web_state.py
@@ -1,4 +1,64 @@
-STATE = {
+STATE = {'analog': {1: {'id': '1',
+                'name': 'TKollektor',
+                'unit_of_measurement': '°C',
+                'value': '5.3'},
+            2: {'id': '2',
+                'name': 'TSP.oben',
+                'unit_of_measurement': '°C',
+                'value': '46.3'},
+            3: {'id': '3',
+                'name': 'TSP.unten',
+                'unit_of_measurement': '°C',
+                'value': '53.1'},
+            4: {'id': '4',
+                'name': 'THeizkr.VL',
+                'unit_of_measurement': '°C',
+                'value': '44.8'},
+            5: {'id': '5',
+                'name': 'Temp.Aussen',
+                'unit_of_measurement': '°C',
+                'value': '-72.3'},
+            6: {'id': '6',
+                'name': 'Temp.Raum',
+                'unit_of_measurement': '°C',
+                'value': '24.6'},
+            7: {'id': '7',
+                'name': 'T\xa0Kaminofen',
+                'unit_of_measurement': '°C',
+                'value': '20.9'},
+            9: {'id': '9',
+                'name': 'TZirku.RL',
+                'unit_of_measurement': '°C',
+                'value': '36.6'}},
+ 'digital': {1: {'id': '1',
+                 'mode': 'AUTO',
+                 'name': 'Pumpe-Solar',
+                 'value': 'AUS'},
+             2: {'id': '2',
+                 'mode': 'AUTO',
+                 'name': 'Pumpe-Hzkr',
+                 'value': 'EIN'},
+             5: {'id': '5',
+                 'mode': 'AUTO',
+                 'name': 'Anf.Kessel',
+                 'value': 'AUS'},
+             6: {'id': '6',
+                 'mode': 'HAND',
+                 'name': 'Vent.Solar',
+                 'value': 'AUS'},
+             7: {'id': '7',
+                 'mode': 'AUTO',
+                 'name': 'P\xa0Kaminofen',
+                 'value': 'EIN'},
+             10: {'id': '10',
+                  'mode': 'HAND',
+                  'name': 'WW-Pumpe1',
+                  'value': 'AUS'}},
+ 'energy': {},
+ 'power': {},
+ 'speed': {}}
+
+STATE_ALTERNATIVE = {
     'analog': {
         2: {
             'id': '2',
@@ -86,7 +146,25 @@
     'power': {}
 }
 
-STATE_ANALOG = [{
+STATE_ANALOG = [{'id': '1', 'name': 'TKollektor', 'unit_of_measurement': '°C', 'value': '5.3'},
+ {'id': '2', 'name': 'TSP.oben', 'unit_of_measurement': '°C', 'value': '46.3'},
+ {'id': '3', 'name': 'TSP.unten', 'unit_of_measurement': '°C', 'value': '53.1'},
+ {'id': '4',
+  'name': 'THeizkr.VL',
+  'unit_of_measurement': '°C',
+  'value': '44.8'},
+ {'id': '5',
+  'name': 'Temp.Aussen',
+  'unit_of_measurement': '°C',
+  'value': '-72.3'},
+ {'id': '6', 'name': 'Temp.Raum', 'unit_of_measurement': '°C', 'value': '24.6'},
+ {'id': '7',
+  'name': 'T\xa0Kaminofen',
+  'unit_of_measurement': '°C',
+  'value': '20.9'},
+ {'id': '9', 'name': 'TZirku.RL', 'unit_of_measurement': '°C', 'value': '36.6'}]
+
+STATE_ANALOG_ALTERNATIVE = [{
     'id': '2',
     'name': 'TSP.oben',
     'unit_of_measurement': '°C',