Add more checks to Pos message parsing

Author: nanomad

deebot_client/commands/xml/pos.py

@@ -20,11 +20,11 @@ class PosParser:
     """Support class for producing Pos events."""
 
     @classmethod
-    def __parse_xml(
+    def _parse_xml(
         cls, position_type: PositionType, event_bus: EventBus, xml: Element
     ) -> HandlingResult:
         """Handle xml message and notify the correct event subscribers."""
-        if (p := xml.attrib.get("p")) and (xml.attrib.get("valid", "1")) != "1":
+        if (p := xml.attrib.get("p")) and (xml.attrib.get("valid", "1")) == "1":
             p_x, p_y = p.split(",", 2)
             p_a = xml.attrib.get("a", 0)
             position = Position(type=position_type, x=int(p_x), y=int(p_y), a=int(p_a))
@@ -48,7 +48,7 @@ def _handle_xml(cls, event_bus: EventBus, xml: Element) -> HandlingResult:
         if xml.attrib.get("ret") != "ok" or xml.attrib.get("t") != "p":
             return HandlingResult.analyse()
 
-        return cls.__parse_xml(PositionType.DEEBOT, event_bus, xml)
+        return cls._parse_xml(PositionType.DEEBOT, event_bus, xml)
 
 
 class GetChargerPos(XmlCommandWithMessageHandling, PosParser):
@@ -65,4 +65,4 @@ def _handle_xml(cls, event_bus: EventBus, xml: Element) -> HandlingResult:
         if xml.attrib.get("ret") != "ok":
             return HandlingResult.analyse()
 
-        return cls.__parse_xml(PositionType.CHARGER, event_bus, xml)
+        return cls._parse_xml(PositionType.CHARGER, event_bus, xml)

deebot_client/messages/xml/pos.py

@@ -5,14 +5,14 @@
 from typing import TYPE_CHECKING
 
 from deebot_client.commands.xml.pos import PosParser
+from deebot_client.message import HandlingResult
 from deebot_client.messages.xml.common import XmlMessage
 from deebot_client.rs.map import PositionType
 
 if TYPE_CHECKING:
     from xml.etree.ElementTree import Element
 
     from deebot_client.event_bus import EventBus
-    from deebot_client.message import HandlingResult
 
 
 class Pos(XmlMessage, PosParser):
@@ -22,4 +22,7 @@ class Pos(XmlMessage, PosParser):
 
     @classmethod
     def _handle_xml(cls, event_bus: EventBus, xml: Element) -> HandlingResult:
-        return cls.__parse_xml(PositionType.DEEBOT, event_bus, xml)
+        if xml.attrib.get("t") != "p":
+            return HandlingResult.analyse()
+
+        return cls._parse_xml(PositionType.DEEBOT, event_bus, xml)

tests/messages/xml/test_pos.py

@@ -21,10 +21,15 @@ def test_Pos(position: tuple[int, int, int]) -> None:
 
 
 @pytest.mark.parametrize(
-    "xml_message",
+    ("xml_message", "expected_result_state"),
     [
-        '<ctl td="Pos" t="p" a="89" valid="1" />',
+        ('<ctl td="Pos" t="p" a="89" valid="1" />', HandlingState.ANALYSE_LOGGED),
+        ('<ctl td="Pos" t="??" p="0,0" a="89" valid="1" />', HandlingState.ERROR),
+        (
+            '<ctl td="Pos" t="p" p="0,0" a="89" valid="0" />',
+            HandlingState.ANALYSE_LOGGED,
+        ),
     ],
 )
-def test_Pos_error(xml_message: str) -> None:
-    assert_message_failure(Pos, xml_message, HandlingState.ANALYSE_LOGGED)
+def test_Pos_error(xml_message: str, expected_result_state: HandlingState) -> None:
+    assert_message_failure(Pos, xml_message, expected_result_state)