fix username not being saved

zim514 · Jul 16, 2019 · 1610a6a · 1610a6a
1 parent 47d63ed
commit 1610a6a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/script.service.hue/addon.xml b/script.service.hue/addon.xml
@@ -26,10 +26,13 @@
 		<disclaimer lang="en_GB">Automate Hue lights with Kodi playback</disclaimer>
 		<news>v0.6.5:
 - Change some ambilight default settings to better values
-- Change Hue NuPNP Discovery URL until SSL chain is fixed by Pphillips
+- Change Hue NuPNP Discovery URL until SSL chain is fixed by Philips
+- Fix Hue username not saving properly
+
 v0.6.0: 
 - Choice of fallback colour to replace blacks and whites
 - Support multiple colours
+
 v0.5.0:
 - Experimental Ambilight support. See Forum for more information
 v0.4.2:

diff --git a/script.service.hue/resources/lib/kodiHue.py b/script.service.hue/resources/lib/kodiHue.py
@@ -157,20 +157,22 @@ def bridgeDiscover(monitor):
             monitor.waitForAbort(1)
 
             bridgeUser = createUser(monitor, bridgeIP, progressBar)
+
             if bridgeUser:
+                logger.debug("User created: {}".format(bridgeUser))
                 progressBar.update(90,_("User Found!"),_("Saving settings"))
 
                 kodiutils.set_setting("bridgeIP",bridgeIP)
-                kodiutils.set_setting("bridgeIP",bridgeIP)
+                kodiutils.set_setting("bridgeUser",bridgeUser)
                 complete = True
                 globals.connected = True
                 progressBar.update(100, _("Complete!"))
                 monitor.waitForAbort(5)
                 progressBar.close()
                 globals.ADDON.openSettings()
                 return True
-
             else:
+                logger.debug("User not created, received: {}".format(bridgeUser))
                 progressBar.update(100, _("User not found"),_("Check your bridge and network"))
                 monitor.waitForAbort(5)
                 complete = True
@@ -238,6 +240,7 @@ def discoverBridgeIP(monitor):
 
 
 def createUser(monitor, bridgeIP, progressBar=False):
+    logger.debug("In createUser")
     #device = 'kodi#'+getfqdn()
     data = '{{"devicetype": "kodi#{}"}}'.format(getfqdn()) #Create a devicetype named kodi#localhostname. Eg: kodi#LibreELEC
 
@@ -263,11 +266,12 @@ def createUser(monitor, bridgeIP, progressBar=False):
         progress = progress + 1
 
     res = req.json()
+    logger.debug("json response: {}, content: {}".format(res,req.content))
 
     try:
         username = res[0]['success']['username']
         return username
-    except (requests.exceptions.ConnectionError, qhue.QhueException):
+    except Exception:
         return False