Integrate PR feedback

Author: nanomad

deebot_client/commands/xml/pos.py

@@ -4,8 +4,8 @@
 
 from typing import TYPE_CHECKING
 
-from deebot_client.events import Position, PositionsEvent
 from deebot_client.message import HandlingResult
+from deebot_client.messages.xml import Pos
 from deebot_client.rs.map import PositionType
 
 from .common import XmlCommandWithMessageHandling
@@ -16,25 +16,7 @@
     from deebot_client.event_bus import EventBus
 
 
-class PosParser:
-    """Support class for producing Pos events."""
-
-    @classmethod
-    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":
-            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))
-            event_bus.notify(PositionsEvent(positions=[position]))
-            return HandlingResult.success()
-
-        return HandlingResult.analyse()
-
-
-class GetPos(XmlCommandWithMessageHandling, PosParser):
+class GetPos(XmlCommandWithMessageHandling, Pos):
     """GetPos command."""
 
     NAME = "GetPos"
@@ -51,7 +33,7 @@ def _handle_xml(cls, event_bus: EventBus, xml: Element) -> HandlingResult:
         return cls._parse_xml(PositionType.DEEBOT, event_bus, xml)
 
 
-class GetChargerPos(XmlCommandWithMessageHandling, PosParser):
+class GetChargerPos(XmlCommandWithMessageHandling, Pos):
     """GetChargerPos command."""
 
     NAME = "GetChargerPos"

deebot_client/messages/xml/pos.py

@@ -4,7 +4,7 @@
 
 from typing import TYPE_CHECKING
 
-from deebot_client.commands.xml.pos import PosParser
+from deebot_client.events import Position, PositionsEvent
 from deebot_client.message import HandlingResult
 from deebot_client.messages.xml.common import XmlMessage
 from deebot_client.rs.map import PositionType
@@ -15,7 +15,7 @@
     from deebot_client.event_bus import EventBus
 
 
-class Pos(XmlMessage, PosParser):
+class Pos(XmlMessage):
     """Pos message."""
 
     NAME = "Pos"
@@ -26,3 +26,17 @@ def _handle_xml(cls, event_bus: EventBus, xml: Element) -> HandlingResult:
             return HandlingResult.analyse()
 
         return cls._parse_xml(PositionType.DEEBOT, event_bus, xml)
+
+    @classmethod
+    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":
+            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))
+            event_bus.notify(PositionsEvent(positions=[position]))
+            return HandlingResult.success()
+
+        return HandlingResult.analyse()