From 852fb5c03fcc142bf108728a36ef1c4d0dea82c9 Mon Sep 17 00:00:00 2001 From: howartp84 Date: Sun, 20 Jun 2021 22:06:39 +0100 Subject: [PATCH] v1.0.8 --- Sense.indigoPlugin.zip | Bin 308428 -> 308579 bytes Sense.indigoPlugin/Contents/Info.plist | 2 +- .../Contents/Resources/Thumbs.db | Bin 49664 -> 49664 bytes .../Contents/Server Plugin/plugin.py | 10 +++++++++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Sense.indigoPlugin.zip b/Sense.indigoPlugin.zip index eff3f826cfeeb268947fd2f11ac2d122f0cbd372..098da78e338b3be18d0b6166450734f68d49915d 100644 GIT binary patch delta 5405 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 delta 5368 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 ha$vz<`)T2?K PluginVersion - 1.0.7 + 1.0.8 ServerApiVersion 2.0 IwsApiVersion diff --git a/Sense.indigoPlugin/Contents/Resources/Thumbs.db b/Sense.indigoPlugin/Contents/Resources/Thumbs.db index 8f48db28608f9c791e16367909f38e6263beaee7..4d1d4d9ccfecba1544641222cdc0f8085af5a27b 100644 GIT binary patch delta 22 dcmZo@VQy$)-jKt>9>6&9s(9M<&BZLedjVUt2(ZjiEkdYbCB&BZLedjVa}2;Bex diff --git a/Sense.indigoPlugin/Contents/Server Plugin/plugin.py b/Sense.indigoPlugin/Contents/Server Plugin/plugin.py index 7c67378..7d750cd 100644 --- a/Sense.indigoPlugin/Contents/Server Plugin/plugin.py +++ b/Sense.indigoPlugin/Contents/Server Plugin/plugin.py @@ -182,9 +182,17 @@ def getDevices(self): else: if (sID in self.devIDs): dev = indigo.devices[self.devFromSid[sID]] + devOldName = dev.name if (dev.name != dName): dev.name = dName - dev.replaceOnServer() + try: + dev.replaceOnServer() + except ValueError as e: + if (str(e) == "NameNotUniqueError"): + self.debugLog("Trying to rename %s to %s" % (devOldName,dName)) + self.debugLog("Failed to rename - duplicate device found - please ensure Sense devices are all uniquely named") + else: + self.errorLog(e) if (str(sID) in self.rt.keys()): dev.updateStateOnServer(key='power', value=str(self.rt[sID]), uiValue=str("{} w".format(self.rt[sID]))) dev.updateStateImageOnServer(indigo.kStateImageSel.PowerOn)