pymammotion 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

pymammotion/aliyun/dataclass/aep_response.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 from typing import Optional
 
+from mashumaro.config import BaseConfig
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 
@@ -16,3 +17,6 @@ class AepResponse(DataClassORJSONMixin):
     code: int
     data: DeviceData
     id: Optional[str] = None
+
+    class Config(BaseConfig):
+        omit_default = True

pymammotion/aliyun/dataclass/dev_by_account_response.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 from typing import List, Optional
 
+from mashumaro.config import BaseConfig
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 
@@ -27,6 +28,9 @@ class Device(DataClassORJSONMixin):
     categoryImage: Optional[str] = None
     productModel: Optional[str] = None
 
+    class Config(BaseConfig):
+        omit_default = True
+
 
 @dataclass
 class Data(DataClassORJSONMixin):

pymammotion/aliyun/dataclass/regions_response.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass
 from typing import Optional, TypeVar
 
 from mashumaro import DataClassDictMixin
+from mashumaro.config import BaseConfig
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 DataT = TypeVar("DataT")
@@ -24,3 +25,6 @@ class RegionResponse(DataClassDictMixin):
     code: int
     id: Optional[str] = None
     msg: Optional[str] = None
+
+    class Config(BaseConfig):
+        omit_default = True

pymammotion/http/http.py

@@ -50,7 +50,7 @@ class MammotionHTTP:
     def __init__(self, login: LoginResponseData):
         self._headers = dict()
         self._headers["Authorization"] = f"Bearer {login.access_token}"
-        self.login = login
+        self.login_info = login
 
     @classmethod
     async def login(cls, session: ClientSession, username: str, password: str) -> Response[LoginResponseData]:

pymammotion/mammotion/devices/mammotion.py

@@ -177,12 +177,12 @@ class MammotionDevice:
         cloud_client = CloudIOTGateway()
         async with ClientSession(MAMMOTION_DOMAIN) as session:
             mammotion_http = await connect_http(account, password)
-            country_code = mammotion_http.login.userInformation.domainAbbreviation
+            country_code = mammotion_http.login_info.userInformation.domainAbbreviation
             _LOGGER.debug("CountryCode: " + country_code)
-            _LOGGER.debug("AuthCode: " + mammotion_http.login.authorization_code)
-            cloud_client.get_region(country_code, mammotion_http.login.authorization_code)
+            _LOGGER.debug("AuthCode: " + mammotion_http.login_info.authorization_code)
+            cloud_client.get_region(country_code, mammotion_http.login_info.authorization_code)
             await cloud_client.connect()
-            await cloud_client.login_by_oauth(country_code, mammotion_http.login.authorization_code)
+            await cloud_client.login_by_oauth(country_code, mammotion_http.login_info.authorization_code)
             cloud_client.aep_handle()
             cloud_client.session_by_auth_code()
 
@@ -206,8 +206,19 @@ class MammotionDevice:
             return await self._cloud_device.command(key, **kwargs)
         # TODO work with both with EITHER
 
+    async def start_sync(self, retry: int):
+        if self._preference is ConnectionPreference.BLUETOOTH:
+            return await self._ble_device.start_sync(retry)
+        if self._preference is ConnectionPreference.WIFI:
+            return await self._cloud_device.start_sync(retry)
+        # TODO work with both with EITHER
 
-
+    async def start_map_sync(self):
+        if self._preference is ConnectionPreference.BLUETOOTH:
+            return await self._ble_device.start_map_sync()
+        if self._preference is ConnectionPreference.WIFI:
+            return await self._cloud_device.start_map_sync()
+        # TODO work with both with EITHER
 
 def has_field(message: betterproto.Message) -> bool:
     """Check if the message has any fields serialized on wire."""

{pymammotion-0.2.0.dist-info → pymammotion-0.2.2.dist-info}/METADATA

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

{pymammotion-0.2.0.dist-info → pymammotion-0.2.2.dist-info}/RECORD

@@ -2,11 +2,11 @@ pymammotion/__init__.py,sha256=kmnjdt3AEMejIz5JK7h1tTJj5ZriAgKwZBa3ScA4-Ao,1516
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
 pymammotion/aliyun/cloud_gateway.py,sha256=7cU-40s70H8q5D53Qxnul9FenzIgzXZZXN9BEEDKMoo,18308
 pymammotion/aliyun/cloud_service.py,sha256=YWcKuKK6iRWy5mTnBYgHxcCusiRGGzQt3spSf7dGDss,2183
-pymammotion/aliyun/dataclass/aep_response.py,sha256=EPuTU8uN0vkbPY_8MdBKAxASSBI9r021kODeOqrcdtw,353
+pymammotion/aliyun/dataclass/aep_response.py,sha256=8f6GIP58ve8gd6AL3HBoXxsy0n2q4ygWvjELGnoOnVc,452
 pymammotion/aliyun/dataclass/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
-pymammotion/aliyun/dataclass/dev_by_account_response.py,sha256=qU29Jdpjvxv6mfp4tC3V6UCCkjBwdwttuGfV2C6ELo4,878
+pymammotion/aliyun/dataclass/dev_by_account_response.py,sha256=DtGeMCzoiFrfSniHoL6db9xcheQgmcTvGySkGBjKdKE,977
 pymammotion/aliyun/dataclass/login_by_oauth_response.py,sha256=6TQYAMyQ1jf_trsnTST007qlNXve3BqsvpV0Dwp7CFA,1245
-pymammotion/aliyun/dataclass/regions_response.py,sha256=0Kcly3OPMIEGK36O0OGFvZrHl6nJfnKzNeC4RPXvFhU,591
+pymammotion/aliyun/dataclass/regions_response.py,sha256=CVPpdFhDD6_emWHyLRzOdp2j3HLPtP8tlNyzGnr8AcI,690
 pymammotion/aliyun/dataclass/session_by_authcode_response.py,sha256=wLGSX2nHkA7crmyYeE_dYly_lDtoYWAiIZjQ0C6m44o,358
 pymammotion/aliyun/tmp_constant.py,sha256=M4Hq_lrGB3LZdX6R2XohRPFoK1NDnNV-pTJwJcJ9838,6650
 pymammotion/bluetooth/__init__.py,sha256=LAl8jqZ1fPh-3mLmViNQsP3s814C1vsocYUa6oSaXt0,36
@@ -42,7 +42,7 @@ pymammotion/data/state_manager.py,sha256=ItihtkmJCeIdXOYD3YRBp241cP29oMABbSISyC5
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=Fy5-I1p92AO_D67VW4eHQqA4pOt7MZsrP--tVfIVUz8,1820
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymammotion/http/http.py,sha256=VoAuDTciiueo8JRjqoZHf8wa0cfvIsFizOp8ISVHRs4,2361
+pymammotion/http/http.py,sha256=9vuI8P-ClVIuXMlagMNkXzfGoNEMC3vg3qMUlZrjRS4,2366
 pymammotion/mammotion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/abstract_message.py,sha256=nw6r7694yzl7iJKqRqhLmAPRjd_TL_Xo_-JXq2_a_ug,222
@@ -58,7 +58,7 @@ pymammotion/mammotion/commands/messages/video.py,sha256=_8lJsU4sLm2CGnc7RDkueA0A
 pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/control/joystick.py,sha256=EWV20MMzQuhbLlNlXbsyZKSEpeM7x1CQL7saU4Pn0-g,6165
 pymammotion/mammotion/devices/__init__.py,sha256=T72jt0ejtMjo1rPmn_FeMF3pmp0LLeRRpc9WcDKEYYY,126
-pymammotion/mammotion/devices/mammotion.py,sha256=HooHk3GFCwIdZ79Fb4isMR2u_B1qCWpziSzC2nuTpFU,38641
+pymammotion/mammotion/devices/mammotion.py,sha256=HbPA1lqabFLLnDWcY77yXZLiGB4IkBqBXk81C-QekzQ,39308
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/mammotion_mqtt.py,sha256=VU0c8X1DrZSZDLCVAsCaEbLX2zcyrUbEAYaPzOXALNo,7523
 pymammotion/proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -110,7 +110,7 @@ pymammotion/utility/device_type.py,sha256=KYawu2glZMVlPmxRbA4kVFujXz3miHp3rJiOWR
 pymammotion/utility/map.py,sha256=aoi-Luzuph02hKynTofMoq3mnPstanx75MDAVv49CuY,2211
 pymammotion/utility/periodic.py,sha256=9wJMfwXPlx6Mbp3Fws7LLTI34ZDKphH1bva_Ggyk32g,3281
 pymammotion/utility/rocker_util.py,sha256=syPL0QN4zMzHiTIkUKS7RXBBptjdbkfNlPddwUD5V3A,7171
-pymammotion-0.2.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.0.dist-info/METADATA,sha256=Rhb3BsXkrf-fHqvTLQkqnRS1ldAsccbkc6ZhsuZpLR4,3922
-pymammotion-0.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.0.dist-info/RECORD,,
+pymammotion-0.2.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.2.dist-info/METADATA,sha256=_QE8v08z8fhxnO1R_HVdHhTV16XQuQRlDBbJh7Cbi6s,3922
+pymammotion-0.2.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.2.dist-info/RECORD,,