pymammotion 0.5.12__tar.gz → 0.5.14__tar.gz

{pymammotion-0.5.12 → pymammotion-0.5.14}/PKG-INFO

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

{pymammotion-0.5.12 → pymammotion-0.5.14}/pymammotion/mammotion/devices/mammotion.py

@@ -139,11 +139,13 @@ class MammotionDeviceManager:
         if mammotion_device.has_ble():
             exists.replace_ble(mammotion_device.ble())
 
+    def has_device(self, mammotion_device_name: str) -> bool:
+        if self.devices.get(mammotion_device_name, None) is not None:
+            return True
+        return False
+
     def get_device(self, mammotion_device_name: str) -> MammotionMixedDeviceManager:
-        if device := self.devices[mammotion_device_name]:
-            return device
-        else:
-            raise KeyError
+        return self.devices[mammotion_device_name]
 
     async def remove_device(self, name: str) -> None:
         """Remove a device."""
@@ -231,8 +233,8 @@ class Mammotion:
     def add_cloud_devices(self, mqtt_client: MammotionCloud) -> None:
         """Add devices from cloud."""
         for device in mqtt_client.cloud_client.devices_by_account_response.data.data:
-            mower_device = self.device_manager.get_device(device.deviceName)
-            if device.deviceName.startswith(("Luba-", "Yuka-")) and mower_device is None:
+            has_device = self.device_manager.has_device(device.deviceName)
+            if device.deviceName.startswith(("Luba-", "Yuka-")) and not has_device:
                 mixed_device = MammotionMixedDeviceManager(
                     name=device.deviceName,
                     iot_id=device.iotId,
@@ -246,7 +248,8 @@ class Mammotion:
                     device.productName if device.productModel is None else device.productModel
                 )
                 self.device_manager.add_device(mixed_device)
-            elif device.deviceName.startswith(("Luba-", "Yuka-")) and mower_device:
+            elif device.deviceName.startswith(("Luba-", "Yuka-")) and has_device:
+                mower_device = self.device_manager.get_device(device.deviceName)
                 if mower_device.cloud() is None:
                     mower_device.add_cloud(mqtt=mqtt_client)
                 else:
@@ -284,8 +287,8 @@ class Mammotion:
         return self.device_manager.get_device(name)
 
     def get_or_create_device_by_name(self, device: Device, mqtt_client: MammotionCloud) -> MammotionMixedDeviceManager:
-        if mow_device := self.device_manager.get_device(device.deviceName):
-            return mow_device
+        if self.device_manager.has_device(device.deviceName):
+            return self.device_manager.get_device(device.deviceName)
         mow_device = MammotionMixedDeviceManager(
             name=device.deviceName,
             iot_id=device.iotId,

{pymammotion-0.5.12 → pymammotion-0.5.14}/pymammotion/proto/mctrl_driver.proto

@@ -2,8 +2,8 @@ syntax = "proto3";
 
 enum CutterWorkMode {
   CUTTER_STANDARD = 0;
-  CUTTER_PERFORMANCE = 1;
-  CUTTER_ECONOMIC = 2;
+  CUTTER_ECONOMIC = 1;
+  CUTTER_PERFORMANCE = 2;
 }
 
 enum CollectMotorState {

{pymammotion-0.5.12 → pymammotion-0.5.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.5.12"
+version     = "0.5.14"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -66,7 +66,7 @@ autotyping = "^24.3.0"
 ipython = "^9.0.2"
 
 [tool.bumpver]
-current_version = "0.5.12"
+current_version = "0.5.14"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true