From a7da84439df70571f5ba72a7cdcdf2380bca06dc Mon Sep 17 00:00:00 2001
From: Joe Keenan <joe@flyingdiver.com>
Date: Sat, 4 Jun 2022 22:57:31 -0400
Subject: [PATCH] Added flag to force rename on device creation

---
 .../Contents/Info.plist                         |  2 +-
 .../Contents/Server Plugin/MenuItems.xml        |  4 ++++
 .../Contents/Server Plugin/plugin.py            | 17 +++++++++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Lutron RadioRA 2.indigoPlugin/Contents/Info.plist b/Lutron RadioRA 2.indigoPlugin/Contents/Info.plist
index 99c9b81..a71145a 100755
--- a/Lutron RadioRA 2.indigoPlugin/Contents/Info.plist	
+++ b/Lutron RadioRA 2.indigoPlugin/Contents/Info.plist	
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
     <key>PluginVersion</key>
-    <string>2022.0.3</string>
+    <string>2022.0.4</string>
     <key>ServerApiVersion</key>
     <string>3.0</string>
     <key>IwsApiVersion</key>
diff --git a/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/MenuItems.xml b/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/MenuItems.xml
index fdaee7b..b526e1e 100644
--- a/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/MenuItems.xml	
+++ b/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/MenuItems.xml	
@@ -90,6 +90,10 @@
 				<Label>Create Triggers for all Room Groups:</Label>
 			</Field>            
     		<Field id="separator2" type="separator" />
+			<Field id="rename_devices" type="checkbox" defaultValue="false">
+				<Label>Force rename existing devices:</Label>
+			</Field>
+    		<Field id="separator3" type="separator" />
 			<Field id="local_note" type="label">
 				<Label>To use an existing XML file instead of downloading the XML data from the repeater, check this box and enter the path/name of the file. 
 You MUST have a repeater selected above.
diff --git a/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/plugin.py b/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/plugin.py
index 891352b..f263a26 100644
--- a/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/plugin.py	
+++ b/Lutron RadioRA 2.indigoPlugin/Contents/Server Plugin/plugin.py	
@@ -2254,6 +2254,7 @@ def createRRA2Devices(self, valuesDict):
         self.create_unused_phantom = bool(valuesDict["create_unused_phantom"])
         self.create_event_triggers = bool(valuesDict["create_event_triggers"])
         self.create_group_triggers = bool(valuesDict["create_group_triggers"])
+        self.rename_devices = bool(valuesDict["rename_devices"])
 
         if bool(valuesDict["use_local"]):
             self.logger.info(
@@ -2758,14 +2759,18 @@ def createLutronDevice(self, devType, name, address, props, room):
         # If it does exist, update with the new properties
 
         for dev in indigo.devices.iter("self"):
-            if dev.address == address:
-                if dev.pluginProps.get(PROP_ROOM, None):
-                    self.logger.debug(f"Skipping existing device: '{name}' ({address})")
-                    return dev
-                else:
+            if dev.address == address:      # existing device
+
+                if not dev.pluginProps.get(PROP_ROOM, None):
                     self.logger.debug(f"Adding ROOM property to existing device: '{name}' ({address})")
                     self.update_plugin_property(dev, PROP_ROOM, new_value=room)
-                    return dev
+
+                if self.rename_devices and dev.name != name:
+                    self.logger.debug(f"Renaming '{dev.name}' to '{name}'")
+                    dev.name = name
+                    dev.replaceOnServer()
+
+                return dev
 
         # Pick the folder for this device, create it if necessary