pymammotion 0.2.86__py3-none-any.whl → 0.2.88__py3-none-any.whl

pymammotion/mammotion/devices/base.py

@@ -33,14 +33,11 @@ def find_next_integer(lst: list[int], current_hash: int) -> int | None:
 class MammotionBaseDevice:
     """Base class for Mammotion devices."""
 
-    _state_manager: StateManager
-    _cloud_device: Device | None = None
-
-    def __init__(self, device: MowingDevice, cloud_device: Device | None = None) -> None:
+    def __init__(self, state_manager: StateManager, cloud_device: Device | None = None) -> None:
         """Initialize MammotionBaseDevice."""
         self.loop = asyncio.get_event_loop()
         self._raw_data = LubaMsg().to_dict(casing=betterproto.Casing.SNAKE)
-        self._state_manager = StateManager(device)
+        self._state_manager = state_manager
         self._state_manager.gethash_ack_callback = self.datahash_response
         self._state_manager.get_commondata_ack_callback = self.commdata_response
         self._notify_future: asyncio.Future[bytes] | None = None

pymammotion/mammotion/devices/mammotion.py

@@ -13,6 +13,7 @@ from pymammotion.aliyun.cloud_gateway import CloudIOTGateway
 from pymammotion.aliyun.model.dev_by_account_response import Device
 from pymammotion.data.model.account import Credentials
 from pymammotion.data.model.device import MowingDevice
+from pymammotion.data.state_manager import StateManager
 from pymammotion.http.http import connect_http
 from pymammotion.mammotion.devices.mammotion_bluetooth import MammotionBaseBLEDevice
 from pymammotion.mammotion.devices.mammotion_cloud import MammotionBaseCloudDevice, MammotionCloud
@@ -32,8 +33,6 @@ class ConnectionPreference(Enum):
 
 
 class MammotionMixedDeviceManager:
-    _ble_device: MammotionBaseBLEDevice | None = None
-    _cloud_device: MammotionBaseCloudDevice | None = None
     preference: ConnectionPreference
 
     def __init__(
@@ -45,22 +44,20 @@ class MammotionMixedDeviceManager:
         preference: ConnectionPreference = ConnectionPreference.BLUETOOTH,
     ) -> None:
         self.name = name
-        self._mower_state = MowingDevice()
+        self._state_manager = StateManager(MowingDevice())
+        self._ble_device: MammotionBaseBLEDevice | None = None
+        self._cloud_device: MammotionBaseCloudDevice | None = None
         self.add_ble(ble_device)
         self.add_cloud(cloud_device, mqtt)
         self.preference = preference
 
     @property
     def mower_state(self):
-        return self._mower_state
+        return self._state_manager.get_device()
 
     @mower_state.setter
     def mower_state(self, value: MowingDevice) -> None:
-        if self._cloud_device:
-            self._cloud_device.state_manager.set_device(value)
-        if self._ble_device:
-            self._ble_device.state_manager.set_device(value)
-        self._mower_state = value
+        self._state_manager.set_device(value)
 
     def ble(self) -> MammotionBaseBLEDevice | None:
         return self._ble_device
@@ -76,12 +73,12 @@ class MammotionMixedDeviceManager:
 
     def add_ble(self, ble_device: BLEDevice) -> None:
         if ble_device is not None:
-            self._ble_device = MammotionBaseBLEDevice(self.mower_state, ble_device)
+            self._ble_device = MammotionBaseBLEDevice(state_manager=self._state_manager, ble_device=ble_device)
 
     def add_cloud(self, cloud_device: Device | None = None, mqtt: MammotionCloud | None = None) -> None:
         if cloud_device is not None:
             self._cloud_device = MammotionBaseCloudDevice(
-                mqtt, cloud_device=cloud_device, mowing_state=self.mower_state
+                mqtt, cloud_device=cloud_device, state_manager=self._state_manager
             )
 
     def replace_cloud(self, cloud_device: MammotionBaseCloudDevice) -> None:

pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -15,6 +15,7 @@ from bleak_retry_connector import (
 
 from pymammotion.bluetooth import BleMessage
 from pymammotion.data.model.device import MowingDevice
+from pymammotion.data.state_manager import StateManager
 from pymammotion.mammotion.commands.mammotion_command import MammotionCommand
 from pymammotion.mammotion.devices.base import MammotionBaseDevice
 from pymammotion.proto import has_field
@@ -69,9 +70,9 @@ async def _handle_retry(fut: asyncio.Future[None], func, command: bytes) -> None
 class MammotionBaseBLEDevice(MammotionBaseDevice):
     """Base class for Mammotion BLE devices."""
 
-    def __init__(self, mowing_state: MowingDevice, device: BLEDevice, interface: int = 0, **kwargs: Any) -> None:
+    def __init__(self, state_manager: StateManager, device: BLEDevice, interface: int = 0, **kwargs: Any) -> None:
         """Initialize MammotionBaseBLEDevice."""
-        super().__init__(mowing_state)
+        super().__init__(state_manager)
         self._disconnect_strategy = True
         self._ble_sync_task = None
         self._prev_notification = None

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -14,6 +14,7 @@ from pymammotion.aliyun.model.dev_by_account_response import Device
 from pymammotion.data.model.device import MowingDevice
 from pymammotion.data.mqtt.event import ThingEventMessage
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
+from pymammotion.data.state_manager import StateManager
 from pymammotion.event.event import DataEvent
 from pymammotion.mammotion.commands.mammotion_command import MammotionCommand
 from pymammotion.mammotion.devices.base import MammotionBaseDevice
@@ -150,9 +151,9 @@ class MammotionCloud:
 class MammotionBaseCloudDevice(MammotionBaseDevice):
     """Base class for Mammotion Cloud devices."""
 
-    def __init__(self, mqtt: MammotionCloud, cloud_device: Device, mowing_state: MowingDevice) -> None:
+    def __init__(self, mqtt: MammotionCloud, cloud_device: Device, state_manager: StateManager) -> None:
         """Initialize MammotionBaseCloudDevice."""
-        super().__init__(mowing_state, cloud_device)
+        super().__init__(state_manager, cloud_device)
         self._ble_sync_task: TimerHandle | None = None
         self.stopped = False
         self.on_ready_callback: Optional[Callable[[], Awaitable[None]]] = None

{pymammotion-0.2.86.dist-info → pymammotion-0.2.88.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.2.86
+Version: 0.2.88
 Summary: 
 License: GNU-3.0
 Author: Michael Arthur

{pymammotion-0.2.86.dist-info → pymammotion-0.2.88.dist-info}/RECORD

@@ -61,10 +61,10 @@ pymammotion/mammotion/commands/messages/video.py,sha256=ne1YSuQChaDFfmHgMO5Jc9_O
 pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/control/joystick.py,sha256=QfBVxM_gxpWsZAGO90whtgxCI2tIZ3TTad9wHIPsU9s,5640
 pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_Ar_JEAAMD4fsE,102
-pymammotion/mammotion/devices/base.py,sha256=F_L5aDtY6rgRkk7Q4CwilLenTANW6cBe9zIU3a9HRmA,10020
-pymammotion/mammotion/devices/mammotion.py,sha256=hSO184o1q4ftfLPx9froFPIXk428wGg8Ayw160W3z7c,12482
-pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=KjcIta1VcJ8eNJvPFeOtwxV2jl3nrk7PldMmPv_Caqw,18939
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=-l4LRgI4J9_4AJFirocfzlzOMclGl6rliRdD75lbJfo,12613
+pymammotion/mammotion/devices/base.py,sha256=WRRDJsIftlvJ56C7uDbwx2nvb60MORHMGSBWbwlN9g8,9946
+pymammotion/mammotion/devices/mammotion.py,sha256=qYH1Yg_XZ9PrdKoYlksudAe04VjcvBc5jzz4zlxB3xM,12447
+pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=BqvYJhuK-fFx-0cuoi0zPFL3Hg2ZwSNsPlE_I2DTXos,18997
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=W50O7m6IRwsVoE5PZS9dWTGtH9Xh37J5Abb4honzNf4,12671
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/mammotion_future.py,sha256=_OWqKOlUGl2yT1xOsXFQYpGd-1zQ63OxqXgy7KRQgYc,710
 pymammotion/mqtt/mammotion_mqtt.py,sha256=LaySave_hf0gU3crUTLqzpdQtxIwK8vu5DM8F8fbU2Y,8748
@@ -119,7 +119,7 @@ pymammotion/utility/map.py,sha256=GYscVMg2cX3IPlNpCBNHDW0S55yS1WGRf1iHnNZ7TfQ,22
 pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tpfI,615
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.2.86.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.86.dist-info/METADATA,sha256=Nfv6FrCX_R_mkWXgtUsVNwRTrKeTgVaRIp6tiHSgojQ,3896
-pymammotion-0.2.86.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.86.dist-info/RECORD,,
+pymammotion-0.2.88.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.88.dist-info/METADATA,sha256=r9dZivAE2dGD73ICzaKfwiTE5YWd6IXDCXqh1wckQC8,3896
+pymammotion-0.2.88.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.88.dist-info/RECORD,,