⚠️ fix deprecated warnings (#2280)

al-one · Jan 23, 2025 · 7cbdc39 · 7cbdc39
1 parent abaf43c
commit 7cbdc39
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/custom_components/xiaomi_miot/core/const.py b/custom_components/xiaomi_miot/core/const.py
@@ -101,4 +101,14 @@ class AlarmControlPanelState(StrEnum):
         PENDING = "pending"
         ARMING = "arming"
         DISARMING = "disarming"
-        TRIGGERED = "triggered"
+        TRIGGERED = "triggered"
+
+try:
+    # hass 2025.1
+    from homeassistant.components.vacuum import VacuumActivity
+except (ModuleNotFoundError, ImportError):
+    class VacuumActivity(StrEnum):
+        CLEANING = "cleaning"
+        DOCKED = "docked"
+        RETURNING = "returning"
+        ERROR = "error"
diff --git a/custom_components/xiaomi_miot/vacuum.py b/custom_components/xiaomi_miot/vacuum.py
@@ -12,10 +12,6 @@
     DOMAIN as ENTITY_DOMAIN,
     StateVacuumEntity,
     VacuumEntityFeature,  # v2022.5
-    STATE_CLEANING,
-    STATE_DOCKED,
-    STATE_RETURNING,
-    STATE_ERROR,
 )
 
 from . import (
@@ -34,6 +30,8 @@
     MiotService,
 )
 
+from .core.const import VacuumActivity
+
 _LOGGER = logging.getLogger(__name__)
 DATA_KEY = f'{ENTITY_DOMAIN}.{DOMAIN}'
 SCAN_INTERVAL = timedelta(seconds=60)
@@ -147,17 +145,17 @@ def state(self):
                 'Part Sweeping', 'Zone Sweeping', 'Select Sweeping', 'Spot Sweeping', 'Goto Target',
                 'Starting', 'Working', 'Busy', 'DustCollecting'
             ):
-                return STATE_CLEANING
+                return VacuumActivity.CLEANING
             elif val in self._prop_status.list_search('Idle', 'Sleep'):
                 return STATE_IDLE
             elif val in self._prop_status.list_search('Charging', 'Charging Completed', 'Fullcharge', 'Charge Done', 'Drying'):
-                return STATE_DOCKED
+                return VacuumActivity.DOCKED
             elif val in self._prop_status.list_search('Go Charging'):
-                return STATE_RETURNING
+                return VacuumActivity.RETURNING
             elif val in self._prop_status.list_search('Paused'):
                 return STATE_PAUSED
             elif val in self._prop_status.list_search('Error', 'Charging Problem'):
-                return STATE_ERROR
+                return VacuumActivity.ERROR
             else:
                 return self._prop_status.list_description(val)
         return None
@@ -193,7 +191,7 @@ def pause(self):
 
     def start_pause(self, **kwargs):
         sta = self.state
-        if sta == STATE_CLEANING:
+        if sta == VacuumActivity.CLEANING:
             return self.pause()
         return self.start()
 
@@ -367,7 +365,7 @@ def start_clean_segment(self, segment, repeat=1, **kwargs):
         if not segments:
             self.return_to_base()
             return False
-        if self.state == STATE_CLEANING:
+        if self.state == VacuumActivity.CLEANING:
             self.pause()
             time.sleep(1)
         if self.model in ['roborock.vacuum.m1s']: