[Zone] Rename mode => mode_raw & mode_name => mode

max13fr · Apr 19, 2020 · 81827e9 · 81827e9
1 parent fb3e440
commit 81827e9
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/AirzoneCloud/Zone.py b/AirzoneCloud/Zone.py
@@ -20,22 +20,22 @@ def __str__(self):
         return "Zone(name={}, is_on={}, mode={}, current_temp={}, target_temp={})".format(
             self.name,
             self.is_on,
-            self.mode_name,
+            self.mode,
             self.current_temperature,
             self.target_temperature,
         )
 
     @property
     def str_complete(self):
-        return "Zone(name={}, id={}, system_number={}, zone_number={}, is_on={}, mode={}, current_temperature={} target_temperature={})".format(
+        return "Zone(name={}, is_on={}, mode={}, current_temperature={} target_temperature={}, id={}, system_number={}, zone_number={})".format(
             self.name,
-            self.id,
-            self.system_number,
-            self.zone_number,
             self.is_on,
-            self.mode_name,
+            self.mode,
             self.current_temperature,
             self.target_temperature,
+            self.id,
+            self.system_number,
+            self.zone_number,
         )
 
     #
@@ -82,15 +82,15 @@ def is_on(self):
 
     @property
     def mode(self):
-        return self._data.get("mode")
+        return MODES_CONVERTER[self.mode_raw]["name"]
 
     @property
-    def mode_name(self):
-        return MODES_CONVERTER[self.mode]["name"]
+    def mode_description(self):
+        return MODES_CONVERTER[self.mode_raw]["description"]
 
     @property
-    def mode_description(self):
-        return MODES_CONVERTER[self.mode]["description"]
+    def mode_raw(self):
+        return self._data.get("mode")
 
     @property
     def id(self):