Fix bugs

pyhon/__main__.py

@@ -24,6 +24,7 @@ def get_arguments():
     subparser = parser.add_subparsers(title="commands", metavar="COMMAND")
     keys = subparser.add_parser("keys", help="print as key format")
     keys.add_argument("keys", help="print as key format", action="store_true")
+    keys.add_argument("--all", help="print also full keys", action="store_true")
     return vars(parser.parse_args())
 
 
@@ -90,9 +91,12 @@ async def main():
         for device in hon.devices:
             print("=" * 10, device.appliance_type, "-", device.nick_name, "=" * 10)
             if args.get("keys"):
-                key_print(device.data["attributes"]["parameters"])
+                data = device.data.copy()
-                key_print(device.data["appliance"])
+                attr = "get" if args.get("all") else "pop"
-                key_print(device.data)
+                key_print(data["attributes"].__getattribute__(attr)("parameters"))
+                key_print(data.__getattribute__(attr)("appliance"))
+                key_print(data.__getattribute__(attr)("commands"))
+                key_print(data)
                 pretty_print(create_command(device.commands, concat=True))
             else:
                 pretty_print({"data": device.data})

pyhon/appliances/wm.py

@@ -5,4 +5,5 @@ class Appliance:
     def get(self):
         if self._data["attributes"]["lastConnEvent"]["category"] == "DISCONNECTED":
             self._data["attributes"]["parameters"]["machMode"] = "0"
+        self._data["active"] = bool(self._data.get("activity"))
         return self._data

pyhon/device.py

@@ -23,7 +23,7 @@ class HonDevice:
         if "." in item:
             result = self.data
             for key in item.split("."):
-                if all([k in "0123456789" for k in key]):
+                if all([k in "0123456789" for k in key]) and type(result) is list:
                     result = result[int(key)]
                 else:
                     result = result[key]
@@ -31,7 +31,15 @@ class HonDevice:
         else:
             if item in self.data:
                 return self.data[item]
-            return self.attributes["parameters"].get(item, self.appliance[item])
+            if item in self.attributes["parameters"]:
+                return self.attributes["parameters"].get(item)
+            return self.appliance[item]
+
+    def get(self, item, default=None):
+        try:
+            return self[item]
+        except (KeyError, IndexError):
+            return default
 
     @property
     def appliance_model_id(self):
@@ -120,7 +128,7 @@ class HonDevice:
     @property
     def data(self):
         result = {"attributes": self.attributes, "appliance": self.appliance, "statistics": self.statistics,
-                  "commands": self.parameters}
+                  **self.parameters}
         if self._extra:
             return result | self._extra.Appliance(result).get()
         return result

setup.py

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