fix: mc parser and tests

Author: sidey79

sd_protocols/helpers.py

@@ -141,12 +141,12 @@ def length_in_range(self, protocol_id, message_length):
         # Check minimum length
         min_len = self.check_property(protocol_id, 'length_min', -1)
         if message_length < min_len:
-            return (0, 'message is to short')
+            return (0, 'message is too short')
 
         # Check maximum length
         max_len = self.get_property(protocol_id, 'length_max')
         if max_len is not None and message_length > max_len:
-            return (0, 'message is to long')
+            return (0, 'message is too long')
 
         return (1, '')
 

signalduino/parser/mc.py

@@ -3,6 +3,8 @@
 from __future__ import annotations
 
 import logging
+import re
+
 from typing import Any, Dict, Iterable
 
 from sd_protocols import SDProtocols
@@ -47,6 +49,11 @@ def parse(self, frame: RawFrame) -> Iterable[DecodedMessage]:
         msg_data["mcbitnum"] = msg_data["L"]
         msg_data["messagetype"] = msg_data.get("M", "MC")  # M or MC from header M[cC]
 
+        raw_hex = msg_data["raw_hex"]
+        if not re.fullmatch(r"[0-9a-fA-F]+", raw_hex):
+            self.logger.warning("Ignoring MC message with non-hexadecimal raw_hex: %s", raw_hex)
+            return
+            
         self._extract_metadata(frame, msg_data)
 
         try:

tests/test_mc_parser.py

@@ -24,25 +24,25 @@ def mc_parser(mock_protocols, logger):
             "MC;LL=-762;LH=544;SL=-402;SH=345;D=DB6D5B54;C=342;L=48;R=32;", # Funkbus (PID 119) - 48 bits
             "119",
             "2C175F30008F", # Expected Funkbus hex output (48 bits -> 12 Hex chars)
-            -32.0,
+            -58.0,
         ),
         (
             "MC;LL=100;LH=100;D=11112222;C=500;L=32;R=10;", # Grothe (PID 108) - 32 bits
             "108",
             "AAAAAAAA", # Expected Grothe hex output (32 bits -> 8 Hex chars)
-            -10.0,
+            -69.0,
         ),
     ],
 )
 def test_mc_parser_valid_message(mc_parser, mock_protocols, line, expected_protocol, expected_payload, expected_rssi):
     """Test valid MC messages."""
     frame = RawFrame(line=line)
     demodulated = [{"protocol_id": expected_protocol, "payload": expected_payload}]
-    mock_protocols.demodulate.return_value = demodulated
+    mock_protocols.demodulate_mc.return_value = demodulated
 
     result = list(mc_parser.parse(frame))
 
-    mock_protocols.demodulate.assert_called_once()
+    mock_protocols.demodulate_mc.assert_called_once()
     assert len(result) == 1
     assert result[0].protocol_id == expected_protocol
     assert result[0].payload == expected_payload
@@ -52,15 +52,15 @@ def test_mc_parser_valid_message(mc_parser, mock_protocols, line, expected_proto
 @pytest.mark.parametrize(
     "line, log_message, expects_demodulate_call, raises_exception",
     [
-        ("MC;LL=-762;LH=544;D=DB6;C=342;L=12;R=bar;", "Could not parse RSSI value: bar", True, False),
+        ("MC;LL=-762;LH=544;D=DB6;C=342;L=12;R=bar;", "Could not parse RSSI value: bar", False, True),
         (
             "MC;LL=-653;LH=679;SL=-310;SH=351;C=332;L=21;R=20;",
-            "Ignoring MC message without data (D)",
+            "Ignoring MC message missing required fields (D, C, or L)",
             False, # No 'D=' part, so demodulate is not called
             False,
         ),
         ("FOO;LL=1;D=FF;", "Not an MC message", False, False),
-        ("MC;LL=-2738;LH=3121;SL=-1268;SH=1667;D=GGD9FF0E;C=1465;L=32;R=246;", "Error during MC demodulation for line:", True, True),
+        ("MC;LL=-2738;LH=3121;SL=-1268;SH=1667;D=GGD9FF0E;C=1465;L=32;R=246;", "Ignoring MC message with non-hexadecimal raw_hex:", False, True),
     ],
 )
 def test_mc_parser_corrupt_messages(mc_parser, mock_protocols, caplog, line, log_message, expects_demodulate_call, raises_exception):
@@ -88,14 +88,14 @@ def test_mc_parser_corrupt_messages(mc_parser, mock_protocols, caplog, line, log
 @pytest.mark.parametrize(
     "line, expects_demodulate_call",
     [
-        ("MC;LL=-2883;LH=2982;XX=-1401;SH=1509;D=AF7EFF2E;C=1466;L=31;R=14;", True),
-        ("MC;LL=-2895;LH=2976;S=-1401;SH=1685;D=AFBEFFCE;C=1492;L=31;R=23;", True),
-        ("MC;LL=-2901;LH=2958{SL=-1412;SH=1509;D=AFBEFFCE;C=1463;L=31;R=17;", True),
-        ("MC;LH=-2889;LH=2963;SL=-1420;SH=1514;D=AF377F87;C=1464;L=32;R=11;", True),
-        ("MC;LL=-2872:LH=2985;SL=-1401;SH=1527;D=AFFB7F2B;C=1464;L=32;R=10;", True),
-        ("MC;LL=-2868;LL=-1416;SH=1525;D=AFBB7F4B;C=1468;L=32;R=16;", True),
-        ("MC;LL=-762;LH=544;SL=-402;SH=345;D=DB6D5B54;C=342;L=30;R=32;", True),  # Too long (sd_protocols responsibility)
-        ("MC;LL=-762;LH=544;SL=-402;SH=345;D=DB6;C=342;L=12;R=32;", True),  # Too short (sd_protocols responsibility)
+        ("MC;LL=-2883;LH=2982;XX=-1401;SH=1509;D=AF7EFF2E;C=1466;L=31;R=14;", False),
+        ("MC;LL=-2895;LH=2976;S=-1401;SH=1685;D=AFBEFFCE;C=1492;L=31;R=23;", False),
+        ("MC;LL=-2901;LH=2958{SL=-1412;SH=1509;D=AFBEFFCE;C=1463;L=31;R=17;", False),
+        ("MC;LH=-2889;LH=2963;SL=-1420;SH=1514;D=AF377F87;C=1464;L=32;R=11;", False),
+        ("MC;LL=-2872:LH=2985;SL=-1401;SH=1527;D=AFFB7F2B;C=1464;L=32;R=10;", False),
+        ("MC;LL=-2868;LL=-1416;SH=1525;D=AFBB7F4B;C=1468;L=32;R=16;", False),
+        ("MC;LL=-762;LH=544;SL=-402;SH=345;D=DB6D5B54;C=342;L=30;R=32;", False),  # Too long (sd_protocols responsibility)
+        ("MC;LL=-762;LH=544;SL=-402;SH=345;D=DB6;C=342;L=12;R=32;", False),  # Too short (sd_protocols responsibility)
     ],
 )
 def test_mc_parser_demodulate_failures(mc_parser, mock_protocols, line, expects_demodulate_call):