pymammotion 0.2.84__tar.gz → 0.2.86__tar.gz

{pymammotion-0.2.84 → pymammotion-0.2.86}/PKG-INFO

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

{pymammotion-0.2.84 → pymammotion-0.2.86}/pymammotion/event/event.py

@@ -66,4 +66,7 @@ class DataEvent:
         self.on_data_event += obj_method
 
     def remove_subscribers(self, obj_method) -> None:
-        self.on_data_event -= obj_method
+        try:
+            self.on_data_event -= obj_method
+        except ValueError:
+            """Subscription object no longer there."""

{pymammotion-0.2.84 → pymammotion-0.2.86}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -37,6 +37,7 @@ class MammotionCloud:
         self.mqtt_properties_event = DataEvent()
         self.on_ready_event = DataEvent()
         self.on_disconnected_event = DataEvent()
+        self.on_connected_event = DataEvent()
         self._operation_lock = asyncio.Lock()
         self._mqtt_client = mqtt_client
         self._mqtt_client.on_connected = self.on_connected
@@ -66,6 +67,7 @@ class MammotionCloud:
 
     async def on_connected(self) -> None:
         """Callback for when MQTT connects."""
+        await self.on_connected_event.data_event(None)
 
     async def on_disconnected(self) -> None:
         """Callback for when MQTT disconnects."""
@@ -165,19 +167,26 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self._mqtt.mqtt_properties_event.add_subscribers(self._parse_message_properties_for_device)
         self._mqtt.on_ready_event.add_subscribers(self.on_ready)
         self._mqtt.on_disconnected_event.add_subscribers(self.on_disconnect)
+        self._mqtt.on_connected_event.add_subscribers(self.on_connect)
         self.set_queue_callback(self.queue_command)
 
         if self._mqtt.is_ready:
             self.run_periodic_sync_task()
 
+    def __del__(self):
+        self._mqtt.on_ready_event.remove_subscribers(self.on_ready)
+        self._mqtt.on_disconnected_event.remove_subscribers(self.on_disconnect)
+        self._mqtt.on_connected_event.remove_subscribers(self.on_connect)
+        self._mqtt.mqtt_message_event.remove_subscribers(self._parse_message_for_device)
+        if self._ble_sync_task:
+            self._ble_sync_task.cancel()
+
+
     async def on_ready(self) -> None:
         """Callback for when MQTT is subscribed to events."""
         if self.stopped:
             return
         try:
-            await self._ble_sync()
-            if self._ble_sync_task is None or self._ble_sync_task.cancelled():
-                await self.run_periodic_sync_task()
             if self.on_ready_callback:
                 await self.on_ready_callback()
         except DeviceOfflineException:
@@ -188,11 +197,15 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
             self._ble_sync_task.cancel()
         self._mqtt.disconnect()
 
+    async def on_connect(self) -> None:
+        await self._ble_sync()
+        if self._ble_sync_task is None or self._ble_sync_task.cancelled():
+            await self.run_periodic_sync_task()
+
     async def stop(self) -> None:
         """Stop all tasks and disconnect."""
         if self._ble_sync_task:
             self._ble_sync_task.cancel()
-        self._mqtt.on_ready_event.remove_subscribers(self.on_ready)
         self.stopped = True
 
     async def start(self) -> None:
@@ -200,7 +213,6 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         if self._ble_sync_task is None or self._ble_sync_task.cancelled():
             await self.run_periodic_sync_task()
         self.stopped = False
-        self._mqtt.on_ready_event.add_subscribers(self.on_ready)
         if not self.mqtt.is_connected():
             self.mqtt.connect_async()
 

{pymammotion-0.2.84 → pymammotion-0.2.86}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name        = "pymammotion"
-version     = "0.2.84"
+version     = "0.2.86"
 
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.2.84"
+version     = "0.2.86"
 license     = "GNU-3.0"
 description = ""
 readme      = "README.md"
@@ -61,7 +61,7 @@ mypy = "^1.11.2"
 autotyping = "^24.3.0"
 
 [tool.bumpver]
-current_version = "0.2.84"
+current_version = "0.2.86"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true