chore: minor refactoring

Author: Lash-L

roborock/devices/device.py

@@ -13,7 +13,7 @@
 from typing import Any
 
 from roborock.callbacks import CallbackList
-from roborock.data import HomeDataDevice, HomeDataProduct, RoborockErrorCode, RoborockStateCode
+from roborock.data import HomeDataDevice, HomeDataProduct
 from roborock.diagnostics import redact_device_data
 from roborock.exceptions import RoborockException
 from roborock.roborock_message import (
@@ -235,7 +235,7 @@ def _on_message(self, message: RoborockMessage) -> None:
             return
 
         # Only process messages that can contain protocol updates
-        # RPC_RESPONSE (102), GENERAL_REQUEST (4), and GENERAL_RESPONSE (5)
+        # RPC_RESPONSE (102), and GENERAL_RESPONSE (5)
         if message.protocol not in {
             RoborockMessageProtocol.RPC_RESPONSE,
             RoborockMessageProtocol.GENERAL_RESPONSE,
@@ -246,7 +246,7 @@ def _on_message(self, message: RoborockMessage) -> None:
             return
 
         try:
-            payload = json.loads(message.payload.decode())
+            payload = json.loads(message.payload.decode("utf-8"))
             dps = payload.get("dps", {})
 
             if not dps:
@@ -260,7 +260,7 @@ def _on_message(self, message: RoborockMessage) -> None:
 
                 try:
                     data_protocol = RoborockDataProtocol(int(data_point_number))
-                    self._logger.debug(f"Got device update for {data_protocol.name}: {data_point}")
+                    self._logger.debug("Got device update for %s: %s", data_protocol.name, data_point)
                     self._handle_protocol_update(data_protocol, data_point)
                 except ValueError:
                     # Unknown protocol number
@@ -269,7 +269,7 @@ def _on_message(self, message: RoborockMessage) -> None:
                         f"This may allow for faster updates in the future."
                     )
         except (json.JSONDecodeError, UnicodeDecodeError, KeyError) as ex:
-            self._logger.debug(f"Failed to parse protocol message: {ex}")
+            self._logger.debug("Failed to parse protocol message: %s", ex)
 
     def _handle_protocol_update(self, protocol: RoborockDataProtocol, data_point: Any) -> None:
         """Handle a protocol update for a specific data protocol.
@@ -280,22 +280,9 @@ def _handle_protocol_update(self, protocol: RoborockDataProtocol, data_point: An
         """
         # Handle status protocol updates
         if protocol in ROBOROCK_DATA_STATUS_PROTOCOL and self.v1_properties and self.v1_properties.status:
-            # Update the specific field in the status trait
-            match protocol:
-                case RoborockDataProtocol.ERROR_CODE:
-                    self.v1_properties.status.error_code = RoborockErrorCode(data_point)
-                case RoborockDataProtocol.STATE:
-                    self.v1_properties.status.state = RoborockStateCode(data_point)
-                case RoborockDataProtocol.BATTERY:
-                    self.v1_properties.status.battery = data_point
-                case RoborockDataProtocol.CHARGE_STATUS:
-                    self.v1_properties.status.charge_status = data_point
-                case _:
-                    # There is also fan power and water box mode, but for now those are skipped
-                    return
-
-            self._logger.debug("Updated status.%s to %s", protocol.name.lower(), data_point)
-            self.v1_properties.status.notify_update()
+            if self.v1_properties.status.handle_protocol_update(protocol, data_point):
+                self._logger.debug("Updated status.%s to %s", protocol.name.lower(), data_point)
+                self.v1_properties.status.notify_update()
 
     def diagnostic_data(self) -> dict[str, Any]:
         """Return diagnostics information about the device."""

roborock/devices/traits/v1/status.py

@@ -1,7 +1,8 @@
-from typing import Self
+from typing import Any, Self
 
-from roborock.data import HomeDataProduct, ModelStatus, S7MaxVStatus, Status
+from roborock.data import HomeDataProduct, ModelStatus, RoborockErrorCode, RoborockStateCode, S7MaxVStatus, Status
 from roborock.devices.traits.v1 import common
+from roborock.roborock_message import RoborockDataProtocol
 from roborock.roborock_typing import RoborockCommand
 
 
@@ -22,3 +23,19 @@ def _parse_response(self, response: common.V1ResponseData) -> Self:
         if isinstance(response, dict):
             return status_type.from_dict(response)
         raise ValueError(f"Unexpected status format: {response!r}")
+
+    def handle_protocol_update(self, protocol: RoborockDataProtocol, data_point: Any) -> bool:
+        """Handle a protocol update for a specific data protocol."""
+        match protocol:
+            case RoborockDataProtocol.ERROR_CODE:
+                self.error_code = RoborockErrorCode(data_point)
+            case RoborockDataProtocol.STATE:
+                self.state = RoborockStateCode(data_point)
+            case RoborockDataProtocol.BATTERY:
+                self.battery = data_point
+            case RoborockDataProtocol.CHARGE_STATUS:
+                self.charge_status = data_point
+            case _:
+                # There is also fan power and water box mode, but for now those are skipped
+                return False
+        return True