Merge pull request #101 from iMicknl/fix-99

Remove exception raising in Device `__init__` in the API
iMicknl · Jul 3, 2020 · 54d9f45 · 54d9f45
2 parents 9df41cb + 6b729bb
commit 54d9f45
Showing 1 changed file with 19 additions and 94 deletions.
diff --git a/custom_components/tahoma/tahoma_api.py b/custom_components/tahoma/tahoma_api.py
@@ -593,108 +593,33 @@ def __init__(self, protocol, dataInput):
         self.__protocol = protocol
         self.__raw_data = dataInput
         self.__active_states = {}
-
-        debug_output = json.dumps(dataInput)
-
-        if "label" not in dataInput.keys():
-            raise ValueError("No device name found: " + debug_output)
-
-        self.__label = dataInput["label"]
-
-        if "controllableName" not in dataInput.keys():
-            raise ValueError("No control label name found: " + debug_output)
-
-        self.__type = dataInput["controllableName"]
-
-        if "deviceURL" not in dataInput.keys():
-            raise ValueError("No control URL: " + debug_output)
-
-        self.__url = dataInput["deviceURL"]
-
-        if "uiClass" not in dataInput.keys():
-            raise ValueError("No ui Class: " + debug_output)
-
-        self.__uiclass = dataInput["uiClass"]
-
-        if "widget" not in dataInput.keys():
-            raise ValueError("No widget: " + debug_output)
-
-        self.__widget = dataInput["widget"]
-
+        self.__label = dataInput.get("label", "")
+        self.__type = dataInput.get("controllableName", "")
+        self.__url = dataInput.get("deviceURL", "")
+        self.__uiclass = dataInput.get("uiClass", "")
+        self.__widget = dataInput.get("widget", "")
         # Parse definitions
-
-        if "definition" not in dataInput.keys():
-            raise ValueError("No device definition found: " + debug_output)
-
         self.__definitions = {"commands": [], "states": []}
-
-        definition = dataInput["definition"]
-
-        if "commands" in definition.keys():
-            for command in definition["commands"]:
-                if command["commandName"] in self.__definitions["commands"]:
-                    raise ValueError(
-                        "Command '"
-                        + command["commandName"]
-                        + "' double defined - "
-                        + debug_output
-                    )
-
-                self.__definitions["commands"].append(command["commandName"])
-
-        if "states" in definition.keys():
-            for state in definition["states"]:
-                if state["qualifiedName"] in self.__definitions["states"]:
-                    raise ValueError(
-                        "State '"
-                        + state["qualifiedName"]
-                        + "' double defined - "
-                        + debug_output
-                    )
-
-                self.__definitions["states"].append(state["qualifiedName"])
-
-        self.__command_def = dataInput["definition"]["commands"]
-
-        self.__states_def = dataInput["definition"]["states"]
-
+        definition = dataInput.get("definition")
+        if definition:
+            if "commands" in definition.keys():
+                for command in definition["commands"]:
+                    if command["commandName"] in self.__definitions["commands"]:
+                        continue
+                    self.__definitions["commands"].append(command["commandName"])
+            if "states" in definition.keys():
+                for state in definition["states"]:
+                    if state["qualifiedName"] in self.__definitions["states"]:
+                        continue
+                    self.__definitions["states"].append(state["qualifiedName"])
+            self.__command_def = definition.get("commands")
+            self.__states_def = definition.get("states")
         # Parse active states
-
-        # calculate the amount of known active states
-        active_states_amount = 0
-        if "states" in dataInput.keys():
-            for state in dataInput["states"]:
-                active_states_amount += 1
-
-        # make sure there are not more active states than definitions
-        if active_states_amount > len(self.state_definitions):
-            raise ValueError(
-                "Mismatch of state definition and active states ("
-                + str(len(self.state_definitions))
-                + "/"
-                + str(active_states_amount)
-                + "): "
-                + debug_output
-            )
-
         if len(self.state_definitions) > 0:
-
             if "states" in dataInput.keys():
-                # raise ValueError("No active states given.")
-
                 for state in dataInput["states"]:
-
                     if state["name"] not in self.state_definitions:
                         self.state_definitions.append(state["name"])
-
-                    if state["name"] in self.__active_states.keys():
-                        raise ValueError(
-                            "Active state '"
-                            + state["name"]
-                            + "' has been double defined: "
-                            + debug_output
-                        )
-
                     self.__active_states[state["name"]] = state["value"]
 
     @property