Get program name

pyhon/appliance.py

@@ -2,6 +2,7 @@ import importlib
 import json
 import logging
 from contextlib import suppress
+from copy import copy
 from datetime import datetime, timedelta
 from pathlib import Path
 from typing import Optional, Dict, Any
@@ -11,6 +12,7 @@ from pyhon import helper
 from pyhon.commands import HonCommand
 from pyhon.parameter.base import HonParameter
 from pyhon.parameter.fixed import HonParameterFixed
+from pyhon.parameter.range import HonParameterRange
 
 if TYPE_CHECKING:
     from pyhon import HonAPI
@@ -213,8 +215,29 @@ class HonAppliance:
         self._appliance_model = raw.pop("applianceModel")
         raw.pop("dictionaryId", None)
         self._commands = self._get_commands(raw)
+        await self._add_favourites()
         await self._recover_last_command_states()
 
+    async def _add_favourites(self):
+        favourites = await self._api.command_favourites(self)
+        for favourite in favourites:
+            name = favourite.get("favouriteName")
+            command = favourite.get("command")
+            command_name = command.get("commandName")
+            program_name = command.get("programName", "").split(".")[-1].lower()
+            base = copy(self._commands[command_name].categories[program_name])
+            for data in command.values():
+                if isinstance(data, str):
+                    continue
+                for key, value in data.items():
+                    if parameter := base.parameters.get(key):
+                        with suppress(ValueError):
+                            parameter.value = value
+            extra_param = HonParameterFixed("favourite", {"fixedValue": "1"}, "custom")
+            base.parameters.update(favourite=extra_param)
+            base.parameters["program"].set_value(name)
+            self._commands[command_name].categories[name] = base
+
     async def load_attributes(self):
         self._attributes = await self.api.load_attributes(self)
         for name, values in self._attributes.pop("shadow").get("parameters").items():
@@ -275,6 +298,8 @@ class HonAppliance:
             "statistics": self.statistics,
             "additional_data": self._additional_data,
         }
+        if self._extra and data.get("attributes"):
+            data = self._extra.data(data)
         if command_only:
             data.pop("attributes")
             data.pop("appliance")
@@ -295,6 +320,25 @@ class HonAppliance:
         )
         return result.replace(self.mac_address, "xx-xx-xx-xx-xx-xx")
 
+    def sync_command(self, main, target=None) -> None:
+        base: HonCommand = self.commands.get(main)
+        for command, data in self.commands.items():
+            if command == main or target and command not in target:
+                continue
+            for name, parameter in data.parameters.items():
+                if base_value := base.parameters.get(name):
+                    if isinstance(base_value, HonParameterRange) and isinstance(
+                        parameter, HonParameterRange
+                    ):
+                        parameter.max = base_value.max
+                        parameter.min = base_value.min
+                        parameter.step = base_value.step
+                    elif isinstance(parameter, HonParameterRange):
+                        parameter.max = int(base_value.value)
+                        parameter.min = int(base_value.value)
+                        parameter.step = 1
+                    parameter.value = base_value.value
+
 
 class HonApplianceTest(HonAppliance):
     def __init__(self, name):

pyhon/appliances/base.py

@@ -0,0 +1,13 @@
+class ApplianceBase:
+    def __init__(self, appliance):
+        self.parent = appliance
+
+    def data(self, data):
+        program_name = "No Program"
+        if program := int(data["attributes"]["parameters"].get("prCode", "0")):
+            if ids := self.parent.settings["startProgram.program"].ids:
+                program_name = ids.get(program, program_name)
+        data["programName"] = program_name
+
+    def settings(self, settings):
+        return settings

pyhon/appliances/dw.py

@@ -1,12 +1,10 @@
-class Appliance:
-    def __init__(self, appliance):
-        self.parent = appliance
+from pyhon.appliances.base import ApplianceBase
 
+
+class Appliance(ApplianceBase):
     def data(self, data):
+        super().data(data)
         if data["attributes"]["lastConnEvent"]["category"] == "DISCONNECTED":
             data["attributes"]["parameters"]["machMode"] = "0"
         data["active"] = bool(data.get("attributes", {}).get("activity"))
         return data
-
-    def settings(self, settings):
-        return settings

pyhon/appliances/ov.py

@@ -1,8 +1,9 @@
-class Appliance:
-    def __init__(self, appliance):
-        self.parent = appliance
+from pyhon.appliances.base import ApplianceBase
 
+
+class Appliance(ApplianceBase):
     def data(self, data):
+        super().data(data)
         if data["attributes"]["lastConnEvent"]["category"] == "DISCONNECTED":
             data["attributes"]["parameters"]["temp"] = "0"
             data["attributes"]["parameters"]["onOffStatus"] = "0"
@@ -11,7 +12,8 @@ class Appliance:
 
         data["active"] = data["attributes"]["parameters"]["onOffStatus"] == "1"
 
-        return data
+        if program := int(data["attributes"]["parameters"]["prCode"]):
+            ids = self.parent.settings["startProgram.program"].ids
+            data["programName"] = ids.get(program, "")
 
-    def settings(self, settings):
-        return settings
+        return data

pyhon/appliances/ref.py

@@ -0,0 +1,23 @@
+from pyhon.appliances.base import ApplianceBase
+
+
+class Appliance(ApplianceBase):
+    def data(self, data):
+        super().data(data)
+        if data["attributes"]["parameters"]["holidayMode"] == "1":
+            data["modeZ1"] = "holiday"
+        elif data["attributes"]["parameters"]["intelligenceMode"] == "1":
+            data["modeZ1"] = "auto_set"
+        elif data["attributes"]["parameters"]["quickModeZ1"] == "1":
+            data["modeZ1"] = "super_cool"
+        else:
+            data["modeZ1"] = "no_mode"
+
+        if data["attributes"]["parameters"]["quickModeZ2"] == "1":
+            data["modeZ2"] = "super_freeze"
+        elif data["attributes"]["parameters"]["intelligenceMode"] == "1":
+            data["modeZ2"] = "auto_set"
+        else:
+            data["modeZ2"] = "no_mode"
+
+        return data

pyhon/appliances/td.py

@@ -1,18 +1,14 @@
+from pyhon.appliances.base import ApplianceBase
 from pyhon.parameter.fixed import HonParameterFixed
 
 
-class Appliance:
-    def __init__(self, appliance):
-        self.parent = appliance
-
+class Appliance(ApplianceBase):
     def data(self, data):
+        super().data(data)
         if data["attributes"]["lastConnEvent"]["category"] == "DISCONNECTED":
             data["attributes"]["parameters"]["machMode"] = "0"
         data["active"] = bool(data.get("attributes", {}).get("activity"))
         data["pause"] = data["attributes"]["parameters"]["machMode"] == "3"
-        if program := int(data["attributes"]["parameters"]["prCode"]):
-            ids = self.parent.settings["startProgram.program"].ids
-            data["programName"] = ids.get(program, "")
         return data
 
     def settings(self, settings):

pyhon/appliances/wd.py

@@ -1,8 +1,9 @@
-class Appliance:
-    def __init__(self, appliance):
-        self.parent = appliance
+from pyhon.appliances.base import ApplianceBase
 
+
+class Appliance(ApplianceBase):
     def data(self, data):
+        super().data(data)
         if data["attributes"]["lastConnEvent"]["category"] == "DISCONNECTED":
             data["attributes"]["parameters"]["machMode"] = "0"
         data["active"] = bool(data.get("attributes", {}).get("activity"))

pyhon/appliances/wm.py

@@ -1,8 +1,9 @@
-class Appliance:
-    def __init__(self, appliance):
-        self.parent = appliance
+from pyhon.appliances.base import ApplianceBase
 
+
+class Appliance(ApplianceBase):
     def data(self, data):
+        super().data(data)
         if data["attributes"]["lastConnEvent"]["category"] == "DISCONNECTED":
             data["attributes"]["parameters"]["machMode"] = "0"
         data["active"] = bool(data.get("attributes", {}).get("activity"))

pyhon/commands.py

@@ -48,7 +48,7 @@ class HonCommand:
     @property
     def api(self) -> "HonAPI":
         if self._api is None:
-            raise exceptions.NoAuthenticationException
+            raise exceptions.NoAuthenticationException("Missing hOn login")
         return self._api
 
     @property
@@ -71,7 +71,7 @@ class HonCommand:
     def parameter_groups(self) -> Dict[str, Dict[str, Union[str, float]]]:
         result: Dict[str, Dict[str, Union[str, float]]] = {}
         for name, parameter in self._parameters.items():
-            result.setdefault(parameter.group, {})[name] = parameter.value
+            result.setdefault(parameter.group, {})[name] = parameter.intern_value
         return result
 
     @property

pyhon/const.py

@@ -4,7 +4,7 @@ API_KEY = "GRCqFhC6Gk@ikWXm1RmnSmX1cm,MxY-configuration"
 APP = "hon"
 # All seen id's (different accounts, different devices) are the same, so I guess this hash is static
 CLIENT_ID = "3MVG9QDx8IX8nP5T2Ha8ofvlmjLZl5L_gvfbT9.HJvpHGKoAS_dcMN8LYpTSYeVFCraUnV.2Ag1Ki7m4znVO6"
-APP_VERSION = "1.53.7"
+APP_VERSION = "2.0.10"
 OS_VERSION = 31
 OS = "android"
 DEVICE_MODEL = "exynos9820"

pyhon/parameter/base.py

@@ -22,6 +22,15 @@ class HonParameter:
     def value(self) -> str | float:
         return self._value if self._value is not None else "0"
 
+    @value.setter
+    def value(self, value: str | float) -> None:
+        self._value = value
+        self.check_trigger(value)
+
+    @property
+    def intern_value(self) -> str | float:
+        return str(self._value) if self._value is not None else ""
+
     @property
     def values(self) -> List[str]:
         return [str(self.value)]

pyhon/parameter/enum.py

@@ -3,13 +3,17 @@ from typing import Dict, Any, List
 from pyhon.parameter.base import HonParameter
 
 
+def clean_value(value):
+    return str(value).strip("[]").replace("|", "_").lower()
+
+
 class HonParameterEnum(HonParameter):
     def __init__(self, key: str, attributes: Dict[str, Any], group: str) -> None:
         super().__init__(key, attributes, group)
         self._default = attributes.get("defaultValue")
         self._value = self._default or "0"
         self._values: List[str] = attributes.get("enumValues", [])
-        if self._default and str(self._default.strip("[]")) not in self.values:
+        if self._default and clean_value(self._default.strip("[]")) not in self.values:
             self._values.append(self._default)
 
     def __repr__(self) -> str:
@@ -17,7 +21,7 @@ class HonParameterEnum(HonParameter):
 
     @property
     def values(self) -> List[str]:
-        return [str(value) for value in self._values]
+        return [clean_value(value) for value in self._values]
 
     @values.setter
     def values(self, values) -> None:
@@ -25,7 +29,7 @@ class HonParameterEnum(HonParameter):
 
     @property
     def value(self) -> str | float:
-        return self._value if self._value is not None else self.values[0]
+        return clean_value(self._value) if self._value is not None else self.values[0]
 
     @value.setter
     def value(self, value: str) -> None:

pyhon/parameter/program.py

@@ -44,6 +44,11 @@ class HonParameterProgram(HonParameterEnum):
         values = {
             int(p.parameters["prCode"].value): n
             for i, (n, p) in enumerate(self._programs.items())
-            if "iot_" not in n and p.parameters.get("prCode")
+            if "iot_" not in n
+            and p.parameters.get("prCode")
+            and not ((fav := p.parameters.get("favourite")) and fav.value == "1")
         }
         return dict(sorted(values.items()))
+
+    def set_value(self, value: str):
+        self._value = value

pyhon/parameter/range.py

@@ -26,22 +26,34 @@ class HonParameterRange(HonParameter):
     def min(self) -> float:
         return self._min
 
+    @min.setter
+    def min(self, min: float) -> None:
+        self._min = min
+
     @property
     def max(self) -> float:
         return self._max
 
+    @max.setter
+    def max(self, max: float) -> None:
+        self._max = max
+
     @property
     def step(self) -> float:
         if not self._step:
             return 1
         return self._step
 
+    @step.setter
+    def step(self, step: float) -> None:
+        self._step = step
+
     @property
-    def value(self) -> float:
+    def value(self) -> str | float:
         return self._value if self._value is not None else self._min
 
     @value.setter
-    def value(self, value: float) -> None:
+    def value(self, value: str | float) -> None:
         value = str_to_float(value)
         if self._min <= value <= self._max and not (value - self._min) % self._step:
             self._value = value

setup.py

@@ -7,7 +7,7 @@ with open("README.md", "r") as f:
 
 setup(
     name="pyhOn",
-    version="0.11.0",
+    version="0.12.0",
     author="Andre Basche",
     description="Control hOn devices with python",
     long_description=long_description,