pymammotion 0.4.14__py3-none-any.whl → 0.4.15__py3-none-any.whl

pymammotion/aliyun/cloud_gateway.py

@@ -146,6 +146,10 @@ class CloudIOTGateway:
 
     def get_region(self, country_code: str, auth_code: str):
         """Get the region based on country code and auth code."""
+
+        if self._region_response is not None:
+            return self._region_response
+
         config = Config(
             app_key=self._app_key,
             app_secret=self._app_secret,

pymammotion/data/model/hash_list.py

@@ -269,13 +269,23 @@ class HashList(DataClassORJSONMixin):
         return missing_numbers
 
     @staticmethod
-    def _add_hash_data(hash_dict: dict, hash_data: NavGetCommData | SvgMessage) -> bool:
+    def _add_hash_data(hash_dict: dict[int, FrameList], hash_data: NavGetCommData | SvgMessage) -> bool:
         if isinstance(hash_data, SvgMessage):
             if hash_dict.get(hash_data.data_hash) is None:
                 hash_dict[hash_data.data_hash] = FrameList(total_frame=hash_data.total_frame, data=[hash_data])
                 return True
 
             if hash_data not in hash_dict[hash_data.data_hash].data:
+                exists = next(
+                    (
+                        rhl
+                        for rhl in hash_dict[hash_data.data_hash].data
+                        if rhl.current_frame == hash_data.current_frame
+                    ),
+                    None,
+                )
+                if exists:
+                    return True
                 hash_dict[hash_data.data_hash].data.append(hash_data)
                 return True
             return False
@@ -285,6 +295,12 @@ class HashList(DataClassORJSONMixin):
             return True
 
         if hash_data not in hash_dict[hash_data.hash].data:
+            exists = next(
+                (rhl for rhl in hash_dict[hash_data.hash].data if rhl.current_frame == hash_data.current_frame),
+                None,
+            )
+            if exists:
+                return True
             hash_dict[hash_data.hash].data.append(hash_data)
             return True
         return False

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -1,5 +1,5 @@
 import asyncio
-from asyncio import TimerHandle
+from asyncio import InvalidStateError, TimerHandle
 import base64
 from collections import deque
 from collections.abc import Awaitable, Callable
@@ -87,7 +87,11 @@ class MammotionCloud:
                 future.set_result(result)
             except Exception as ex:
                 # Set the exception on the future if something goes wrong
-                future.set_exception(ex)
+                try:
+                    future.set_exception(ex)
+                except InvalidStateError:
+                    """Dead end, log an error."""
+                    _LOGGER.exception("InvalidStateError while trying to bubble up exception")
             finally:
                 # Mark the task as done
                 self.command_queue.task_done()

{pymammotion-0.4.14.dist-info → pymammotion-0.4.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.14
+Version: 0.4.15
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

{pymammotion-0.4.14.dist-info → pymammotion-0.4.15.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pymammotion/__init__.py,sha256=u1OHuD8Uj0qCOH4I7Lt5d7T-TPt1R0pY-bv8S6UfVxM,1587
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
-pymammotion/aliyun/cloud_gateway.py,sha256=mafX63IuRhbSLNv5WjwhbDY4HJGHRCYAMJseVOQebJE,26605
+pymammotion/aliyun/cloud_gateway.py,sha256=_t9PDpsULxMd5a3xnUrb2jr9_0Hj6V7bXcoGnl0nZq8,26694
 pymammotion/aliyun/model/aep_response.py,sha256=EY4uMTJ4F9rvbcXnAOc5YKi7q__9kIVgfDwfyr65Gk0,421
 pymammotion/aliyun/model/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
 pymammotion/aliyun/model/dev_by_account_response.py,sha256=P9yYy4Z2tLkJSqXA_5XGaCUliSSVa5ILl7VoMtL_tCA,977
@@ -31,7 +31,7 @@ pymammotion/data/model/enums.py,sha256=EpKmO8yVUZyEnTY4yH0DMMVKYNQM42zpW1maUu0i3
 pymammotion/data/model/excute_boarder_params.py,sha256=9CpUqrygcle1C_1hDW-riLmm4map4ZbE842NXjcomEI,1394
 pymammotion/data/model/execute_boarder.py,sha256=9rd_h4fbcsXxgnLOd2rO2hWyD1abnTGc47QTEpp8DD0,1103
 pymammotion/data/model/generate_route_information.py,sha256=pgjqURwmEIzjCMbl4Z5JDDkfxyUAdry1KhPfyir3-mU,777
-pymammotion/data/model/hash_list.py,sha256=nN_FndIkPK61EaQEY8c3bC1DyGoQmuoAENOOOcc2IdY,9921
+pymammotion/data/model/hash_list.py,sha256=oe4vSj3Xf_JWrD9vDGrxtjDF0vp6tR8htNFIR3mKpwM,10514
 pymammotion/data/model/location.py,sha256=PwmITejfI4pm7PI4rzqSuuHetwle6IJr_CV95435s2M,871
 pymammotion/data/model/mowing_modes.py,sha256=bBbRhDe-imZsXDR0TN0emQv6BiIkAlXJFb5isPEjgDk,1078
 pymammotion/data/model/plan.py,sha256=wGlcJT-w0EdbWK9jI838TCOm_MABFg7WoR664VB8RWg,2880
@@ -68,7 +68,7 @@ pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_A
 pymammotion/mammotion/devices/base.py,sha256=urFR2c_kZGoUJ6e0KPY7I5OU-sfrINxuLAIyML_jGAY,10482
 pymammotion/mammotion/devices/mammotion.py,sha256=Zz2tUIdGA-jFSHLM3aO8tBMvVl7sBIBiqC9Kg7f-lm8,13190
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=0c-HXawLQVHz28s0HKaSCNq4wmLWJZZ3ATDVnCXdSrc,19579
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=xCoO57Az6Rkq2e4uAohL4DoNnDHTYpBb9YX5tj0GVp8,14526
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=A1irPnfyb1xnhnnABUTZkJUm3-SYNbjEYRI5lDjPTI8,14757
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/linkkit/__init__.py,sha256=ENgc3ynd2kd9gMQR3-kgmCu6Ed9Y6XCIzU0zFReUlkk,80
 pymammotion/mqtt/linkkit/h2client.py,sha256=w9Nvi_nY4CLD_fw-pHtYChwQf7e2TiAGeqkY_sF4cf0,19659
@@ -117,7 +117,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.4.14.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.14.dist-info/METADATA,sha256=NRlymDDBNkVkm09-tl8lTVuJ46QRYtJe7SIB8URO6qg,3834
-pymammotion-0.4.14.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-pymammotion-0.4.14.dist-info/RECORD,,
+pymammotion-0.4.15.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.15.dist-info/METADATA,sha256=GZAoKgk5WReOioLw-xTy2aj5hk6eyr8kPo3FFQ_uMes,3834
+pymammotion-0.4.15.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+pymammotion-0.4.15.dist-info/RECORD,,