diff --git a/pyblnet/blnet_web.py b/pyblnet/blnet_web.py index 596ce2b..c794d43 100644 --- a/pyblnet/blnet_web.py +++ b/pyblnet/blnet_web.py @@ -25,6 +25,14 @@ ) DIGITAL_INPUT_STATES = {"AUS": "0", "OFF": "0", "EIN": "1", "ON": "1"} +# A mixer on the outputs page: its mode, then the state of the opening output +# and of the closing output, which has the next id +MIXER_OUTPUT_PATTERN = re.compile( + r"(?P\d+): (?P.+)\n( )+(?PAUTO|HAND) .*PAR\?.*\n" + r"( )+auf:( )+(?PAUS|EIN)\n" + r"( )*(?P\d+): zu:( )+(?PAUS|EIN)" +) + class _ElementTextParser(HTMLParser): """ @@ -326,6 +334,17 @@ def read_digital_values(self): match_dict[key] = html.unescape(value) # and append formatted dict data.append(match_dict) + # a mixer uses two outputs (open, close) with a common mode + for match in MIXER_OUTPUT_PATTERN.finditer(data_raw): + name = html.unescape(match["name"].replace(" ", " ")) + for id, direction, value in [ + (match["id"], "auf", match["open"]), + (match["id_close"], "zu", match["close"]), + ]: + data.append( + {"id": id, "name": f"{name} {direction}", "mode": match["mode"], "value": value} + ) + data.sort(key=lambda entry: int(entry["id"])) return data def set_digital_value(self, digital_id, value): diff --git a/tests/test_structure/580600.mixer.htm b/tests/test_structure/580600.mixer.htm new file mode 100644 index 0000000..5f62a33 Binary files /dev/null and b/tests/test_structure/580600.mixer.htm differ diff --git a/tests/test_web_pages.py b/tests/test_web_pages.py index b3051f7..9093d5c 100644 --- a/tests/test_web_pages.py +++ b/tests/test_web_pages.py @@ -108,6 +108,22 @@ def test_fetch_keeps_web_value_of_digital_input_missing_in_direct_data(self): self.assertEqual(data["analog"][13]["value"], "1") self.assertEqual(data["analog"][1]["value"], 14.3) + def test_read_digital_values_with_mixer(self): + # outputs 3 and 4 open and close a mixer, 15 and 16 are analog outputs + with serve("580600.mixer.htm"): + values = self.web.read_digital_values() + self.assertEqual( + values, + [ + {"id": "1", "name": "Ladep.WW.", "mode": "AUTO", "value": "AUS"}, + {"id": "2", "name": "Pumpe-Hzkr", "mode": "HAND", "value": "AUS"}, + {"id": "3", "name": "Misch.Hzkr auf", "mode": "AUTO", "value": "AUS"}, + {"id": "4", "name": "Misch.Hzkr zu", "mode": "AUTO", "value": "AUS"}, + {"id": "5", "name": "Anf.Brenner", "mode": "AUTO", "value": "AUS"}, + {"id": "10", "name": "Notheizer", "mode": "HAND", "value": "AUS"}, + ], + ) + def test_read_analog_values_access_denied(self): with serve(".error.html"): self.assertIsNone(self.web.read_analog_values()) diff --git a/tests/web_raw/web_state.py b/tests/web_raw/web_state.py index ea1b382..2f299de 100644 --- a/tests/web_raw/web_state.py +++ b/tests/web_raw/web_state.py @@ -60,6 +60,8 @@ "digital": { 1: {"id": "1", "mode": "AUTO", "name": "Pumpe-Solar", "value": "AUS"}, 2: {"id": "2", "mode": "AUTO", "name": "Pumpe-Hzkr", "value": "EIN"}, + 3: {"id": "3", "mode": "AUTO", "name": "Misch.Hzkr auf", "value": "AUS"}, + 4: {"id": "4", "mode": "AUTO", "name": "Misch.Hzkr zu", "value": "AUS"}, 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 Kaminofen", "value": "EIN"}, @@ -125,6 +127,8 @@ "digital": { 1: {"id": "1", "name": "Pumpe-Solar", "mode": "AUTO", "value": "AUS"}, 2: {"id": "2", "name": "Pumpe-Hzkr", "mode": "AUTO", "value": "EIN"}, + 3: {"id": "3", "name": "Misch.Hzkr auf", "mode": "AUTO", "value": "AUS"}, + 4: {"id": "4", "name": "Misch.Hzkr zu", "mode": "AUTO", "value": "AUS"}, 5: {"id": "5", "name": "Anf.Kessel", "mode": "AUTO", "value": "AUS"}, 6: {"id": "6", "name": "Vent.Solar", "mode": "HAND", "value": "AUS"}, 7: {"id": "7", "name": "P Kaminofen", "mode": "AUTO", "value": "EIN"}, @@ -159,6 +163,8 @@ STATE_DIGITAL = [ {"id": "1", "mode": "AUTO", "name": "Pumpe-Solar", "value": "AUS"}, {"id": "2", "mode": "AUTO", "name": "Pumpe-Hzkr", "value": "EIN"}, + {"id": "3", "mode": "AUTO", "name": "Misch.Hzkr auf", "value": "AUS"}, + {"id": "4", "mode": "AUTO", "name": "Misch.Hzkr zu", "value": "AUS"}, {"id": "5", "mode": "AUTO", "name": "Anf.Kessel", "value": "AUS"}, {"id": "6", "mode": "HAND", "name": "Vent.Solar", "value": "AUS"}, {"id": "7", "mode": "AUTO", "name": "P Kaminofen", "value": "EIN"},