Allow for name and icon change

Author: hendriksen-mark

BridgeEmulator/HueObjects/__init__.py

@@ -396,6 +396,13 @@ def setV1State(self, state, advertise=True):
             for key, value in state.items():
                 if key in self.state:
                     self.state[key] = value
+                if key in self.config:
+                    if key == "archetype":
+                        self.config[key] = value.replace("_","")
+                    else:
+                        self.config[key] = value
+                if key == "name":
+                    self.name = value
             if "bri" in state:
                 if "min_bri" in self.protocol_cfg and self.protocol_cfg["min_bri"] > state["bri"]:
                     state["bri"] = self.protocol_cfg["min_bri"]
@@ -422,6 +429,11 @@ def setV2State(self, state):
             self.effect = v1State["effect"]
         if "dynamics" in state and "speed" in state["dynamics"]:
             self.dynamics["speed"] = state["dynamics"]["speed"]
+        if "metadata" in state:
+            if "archetype" in state["metadata"]:
+                v1State["archetype"] = state["metadata"]["archetype"]
+            if "name" in state["metadata"]:
+                v1State["name"] = state["metadata"]["name"]
         self.setV1State(v1State, advertise=False)
         self.genStreamEvent(state)
 
@@ -443,7 +455,7 @@ def getDevice(self):
         result["id_v1"] = "/lights/" + self.id_v1
         result["identify"] = {}
         result["metadata"] = {
-            "archetype": lightTypes[self.modelid]["device"]["product_archetype"],
+            "archetype": archetype[self.config["archetype"]],
             "name": self.name
         }
         result["product_data"] = lightTypes[self.modelid]["device"]

BridgeEmulator/flaskUI/templates/login.html

@@ -38,7 +38,7 @@ <h1>DIYHUE LOGIN</h1>
                     <div class="input-group-prepend">
                       <div class="input-group-text"><i class="fas fa-user"></i></div>
                     </div>
-                    <input class="form-control" id="inlineFormInputUsername" name="email" placeholder="[email protected]" required type="text" value="">
+                    <input class="form-control" id="inlineFormInputUsername" name="email" placeholder="[email protected]" required type="text" value="" autocomplete="username">
                   </div>
 
 
@@ -47,7 +47,7 @@ <h1>DIYHUE LOGIN</h1>
                     <div class="input-group-prepend">
                       <div class="input-group-text"><i class="fas fa-key"></i></div>
                     </div>
-                    <input class="form-control" id="inlineFormInputPassword" name="password" placeholder="changeme" required type="password" value="">
+                    <input class="form-control" id="inlineFormInputPassword" name="password" placeholder="changeme" required type="password" value="" autocomplete="current-password">
                   </div>
 
                   <div class="btn-group">

BridgeEmulator/flaskUI/v2restapi.py

@@ -602,7 +602,10 @@ def put(self, resource, resourceid):
                 object.setV1State({"alert": "select"})
             if "metadata" in putDict:
                 if "name" in putDict["metadata"]:
-                    bridgeConfig["config"]["name"] = putDict["metadata"]["name"]
+                    if object:
+                        object.name = putDict["metadata"]["name"]
+                    elif resourceid == v2BridgeDevice()["id"]:
+                        bridgeConfig["config"]["name"] = putDict["metadata"]["name"]
                     configManager.bridgeConfig.save_config(backup=False, resource="config")
         elif resource == "motion":
             if "enabled" in putDict: