Correctly map mode number to string. (#202)

Author: JeffSteinbok

custom_components/dreo/pydreo/pydreofanbase.py

@@ -144,14 +144,11 @@ def preset_mode(self):
         if mode is None:
             mode = self._wind_type
 
-        if mode is None:
+        str_value : str = Helpers.name_from_value(self._preset_modes, mode)
+        if (str_value is None):
             return None
-
-        # If we can't match the preset mode, just return the first one.
-        if mode > len(self.preset_modes):
-            return self.preset_modes[0]
-
-        return self.preset_modes[mode - 1]
+        
+        return str_value    
 
     @preset_mode.setter
     def preset_mode(self, value: str) -> None:
@@ -164,8 +161,9 @@ def preset_mode(self, value: str) -> None:
         else:
             raise NotImplementedError("Attempting to set preset_mode on a device that doesn't support.")
 
-        if value in self.preset_modes:
-            self._send_command(key, self.preset_modes.index(value) + 1)
+        numeric_value = Helpers.value_from_name(self._preset_modes, value)
+        if numeric_value is not None:
+            self._send_command(key, numeric_value)
         else:
             raise ValueError(f"Preset mode {value} is not in the acceptable list: {self.preset_modes}")
 

custom_components/dreo/pydreo/pydreohumidifier.py

@@ -109,22 +109,19 @@ def panel_sound(self, value: bool) -> None:
     @property
     def mode(self):
         """Return the current mode."""
-        mode = self._mode
-
-        # If we can't match the preset mode, just return the first one.
-        if mode > len(self.modes):
-            return self.modes[0]
-
-        return self.modes[mode - 1]
+        
+        str_value : str = Helpers.name_from_value(self._modes, self._mode)
+        if (str_value is None):
+            return None
+        return str_value
 
     @mode.setter
     def mode(self, value: str) -> None:
-        key: str = None
-
-        if value in self.modes:
-            self._send_command(MODE_KEY, self.modes.index(value) + 1)
+        numeric_value = Helpers.value_from_name(self._modes, value)
+        if numeric_value is not None:
+            self._send_command(MODE_KEY, numeric_value)
         else:
-            raise ValueError(f"Preset mode {value} is not in the acceptable list: {self.modes}") 
+            raise ValueError(f"Preset mode {value} is not in the acceptable list: {self._modes}")
 
     def update_state(self, state: dict):
         """Process the state dictionary from the REST API."""

tests/dreo/integrationtests/test_helpers.py

@@ -25,3 +25,8 @@ def test_HHM001S(self):  # pylint: disable=invalid-name
         assert humidifier.is_feature_supported('target_humidity') is True
         assert humidifier.humidity == 47
         assert humidifier.target_humidity == 60
+
+        with patch(PATCH_SEND_COMMAND) as mock_send_command:
+            humidifier.mode = 'auto'
+            mock_send_command.assert_called_once_with(humidifier, {MODE_KEY: 1})
+