pymammotion 0.2.0__tar.gz → 0.2.2__tar.gz

{pymammotion-0.2.0 → pymammotion-0.2.2}/PKG-INFO

@@ -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 → pymammotion-0.2.2}/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-0.2.0 → pymammotion-0.2.2}/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-0.2.0 → pymammotion-0.2.2}/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-0.2.0 → pymammotion-0.2.2}/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-0.2.0 → pymammotion-0.2.2}/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 → pymammotion-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.2.0"
+version     = "0.2.2"
 license     = "GNU-3.0"
 description = ""
 readme      = "README.md"
@@ -48,7 +48,7 @@ mypy = "^1.10.0"
 pre-commit = "^3.7.1"
 
 [tool.bumpver]
-current_version = "0.2.0"
+current_version = "0.2.2"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true