Implement XML fan speed commands

Author: nanomad

deebot_client/commands/xml/__init__.py

@@ -10,7 +10,7 @@
 from .charge import Charge
 from .charge_state import GetChargeState
 from .error import GetError
-from .fan_speed import GetFanSpeed
+from .fan_speed import GetCleanSpeed, SetCleanSpeed
 from .life_span import GetLifeSpan
 from .play_sound import PlaySound
 from .pos import GetPos
@@ -23,21 +23,24 @@
     "Charge",
     "GetBatteryInfo",
     "GetChargeState",
+    "GetCleanSpeed",
     "GetCleanSum",
     "GetError",
-    "GetFanSpeed",
     "GetLifeSpan",
     "GetPos",
     "PlaySound",
+    "SetCleanSpeed",
 ]
 
 # fmt: off
 # ordered by file asc
 _COMMANDS: list[type[XmlCommand]] = [
     GetBatteryInfo,
+    GetCleanSpeed,
     GetError,
     GetLifeSpan,
     PlaySound,
+    SetCleanSpeed
 ]
 # fmt: on
 

deebot_client/commands/xml/fan_speed.py

@@ -6,17 +6,18 @@
 
 from deebot_client.events import FanSpeedEvent, FanSpeedLevel
 from deebot_client.message import HandlingResult
+from deebot_client.util import get_enum
 
-from .common import XmlCommandWithMessageHandling
+from .common import ExecuteCommand, XmlCommandWithMessageHandling
 
 if TYPE_CHECKING:
     from xml.etree.ElementTree import Element
 
     from deebot_client.event_bus import EventBus
 
 
-class GetFanSpeed(XmlCommandWithMessageHandling):
-    """GetFanSpeed command."""
+class GetCleanSpeed(XmlCommandWithMessageHandling):
+    """GetCleanSpeed command."""
 
     NAME = "GetCleanSpeed"
 
@@ -29,16 +30,16 @@ def _handle_xml(cls, event_bus: EventBus, xml: Element) -> HandlingResult:
         if xml.attrib.get("ret") != "ok" or not (speed := xml.attrib.get("speed")):
             return HandlingResult.analyse()
 
-        event: FanSpeedEvent | None = None
+        event_bus.notify(FanSpeedEvent(FanSpeedLevel.from_xml(speed)))
+        return HandlingResult.success()
 
-        match speed.lower():
-            case "standard":
-                event = FanSpeedEvent(FanSpeedLevel.NORMAL)
-            case "strong":
-                event = FanSpeedEvent(FanSpeedLevel.MAX)
 
-        if event:
-            event_bus.notify(event)
-            return HandlingResult.success()
+class SetCleanSpeed(ExecuteCommand):
+    """SetCleanSpeed command."""
 
-        return HandlingResult.analyse()
+    NAME = "SetCleanSpeed"
+
+    def __init__(self, speed: FanSpeedLevel | str) -> None:
+        if isinstance(speed, str):
+            speed = get_enum(FanSpeedLevel, speed)
+        super().__init__({"speed": speed.xml_value})

tests/commands/xml/test_fan_speed.py

@@ -4,8 +4,8 @@
 
 import pytest
 
-from deebot_client.command import CommandResult
-from deebot_client.commands.xml import GetFanSpeed
+from deebot_client.command import CommandResult, CommandWithMessageHandling
+from deebot_client.commands.xml import GetCleanSpeed, SetCleanSpeed
 from deebot_client.events import FanSpeedEvent, FanSpeedLevel
 from deebot_client.message import HandlingState
 from tests.commands import assert_command
@@ -26,19 +26,36 @@
 )
 async def test_get_fan_speed(speed: str, expected_event: Event) -> None:
     json = get_request_xml(f"<ctl ret='ok' speed='{speed}'/>")
-    await assert_command(GetFanSpeed(), json, expected_event)
+    await assert_command(GetCleanSpeed(), json, expected_event)
 
 
 @pytest.mark.parametrize(
     "xml",
-    ["<ctl ret='error'/>", "<ctl ret='ok' speed='invalid'/>"],
-    ids=["error", "no_state"],
+    ["<ctl ret='error'/>"],
+    ids=["error"],
 )
 async def test_get_fan_speed_error(xml: str) -> None:
     json = get_request_xml(xml)
     await assert_command(
-        GetFanSpeed(),
+        GetCleanSpeed(),
         json,
         None,
         command_result=CommandResult(HandlingState.ANALYSE_LOGGED),
     )
+
+
+@pytest.mark.parametrize(
+    ("command", "xml", "result"),
+    [
+        (
+            SetCleanSpeed(FanSpeedLevel.MAX),
+            "<ctl ret='ok' />",
+            HandlingState.SUCCESS,
+        ),
+    ],
+)
+async def test_set_fan_speed(
+    command: CommandWithMessageHandling, xml: str, result: HandlingState
+) -> None:
+    json = get_request_xml(xml)
+    await assert_command(command, json, None, command_result=CommandResult(result))