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

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/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.dist-info → pymammotion-0.2.86.dist-info}/METADATA

@@ -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.dist-info → pymammotion-0.2.86.dist-info}/RECORD

@@ -42,7 +42,7 @@ pymammotion/data/mqtt/properties.py,sha256=kvphcjrDuJHuX8Az98-wKeFv_rSmu2Fz9YKLG
 pymammotion/data/mqtt/status.py,sha256=zqnlo-MzejEQZszl0i0Wucoc3E76x6UtI9JLxoBnu54,1067
 pymammotion/data/state_manager.py,sha256=vtBT28-5DY58hJMi_kqOUKnOq6rJ4fx1zX8yU7N96A8,5357
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
-pymammotion/event/event.py,sha256=UzYnxV5DfvMDK3E06UvSzvzuBbaXOOUwO6xYt_zn9To,2034
+pymammotion/event/event.py,sha256=m7gDAxVcgQAWQBe7AZd3w59eMf9mlcEv27eRT-zz2c0,2133
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/http.py,sha256=9TnVah-R8nkjlb6oCMk78IZ0Y-2iAcMyIdjcQ54GEPk,3562
 pymammotion/http/model/http.py,sha256=_hHqe9IfKDukUYKQDrZb_Tt_9rd5BNN1WKsaGIjsexM,1876
@@ -64,7 +64,7 @@ pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_A
 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=OW5TqJwoTIYxXc-FqrX4QIYHtFnEGnyKCsMXiULND8k,12136
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=-l4LRgI4J9_4AJFirocfzlzOMclGl6rliRdD75lbJfo,12613
 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.84.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.84.dist-info/METADATA,sha256=ea2hs79g7uQDd6Xr4N537FtKoAer6KXtCB34p6tChWQ,3896
-pymammotion-0.2.84.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.84.dist-info/RECORD,,
+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,,