Merge pull request #3462 from pyrevitlabs/cursor/fix-clone-already-exists-99fc

fix(cli): allow clone registration after failed install rollback

Author: jmcouffin

dev/pyRevitLabs/pyRevitLabs.PyRevit/PyRevitClones.cs

@@ -46,18 +46,20 @@ public static void RegisterClone(string cloneName, string repoPath, bool forceUp
 
             var registeredClones = GetRegisteredClones();
 
-            if (forceUpdate && registeredClones.Contains(clone))
-                registeredClones.Remove(clone);
-
-            if (!registeredClones.Contains(clone))
+            if (forceUpdate)
             {
-                registeredClones.Add(clone);
-                SaveRegisteredClones(registeredClones);
+                registeredClones.RemoveAll(
+                    registeredClone => registeredClone.Matches(cloneName) || registeredClone.Equals(clone));
             }
-            else
+            else if (registeredClones.Contains(clone))
+            {
                 throw new PyRevitException(
                     string.Format("Clone with repo path \"{0}\" already exists.", clone.ClonePath)
                     );
+            }
+
+            registeredClones.Add(clone);
+            SaveRegisteredClones(registeredClones);
         }
 
         // renames a clone in a configs
@@ -241,6 +243,9 @@ public static void DeployFromRepo(string cloneName,
             // make sure destPath exists
             CommonUtils.EnsurePath(destPath);
 
+            // Drop stale registrations before cloning so a retried install can register cleanly.
+            PruneStaleCloneRegistrations();
+
             // check existing destination path
             if (CommonUtils.VerifyPath(destPath))
             {
@@ -273,7 +278,7 @@ public static void DeployFromRepo(string cloneName,
                     PyRevitClone.VerifyCloneValidity(clonedPath);
                     InstallBinariesForRepoClone(clonedPath, repoSourcePath, BinArtifactInstallMode.Clone);
                     logger.Debug("Clone successful \"{0}\"", clonedPath);
-                    RegisterClone(cloneName, clonedPath);
+                    RegisterClone(cloneName, clonedPath, forceUpdate: true);
                 }
                 catch (pyRevitBinArtifactNotFoundException ex)
                 {
@@ -287,6 +292,7 @@ public static void DeployFromRepo(string cloneName,
                 {
                     logger.Debug(string.Format("Exception occured after clone complete. Deleting clone \"{0}\" | {1}",
                                                clonedPath, ex.Message));
+                    UnregisterCloneAtPath(clonedPath);
                     try
                     {
                         CommonUtils.DeleteDirectory(clonedPath);
@@ -346,6 +352,9 @@ public static void DeployFromImage(string cloneName,
 
             logger.Debug("Destination path determined as \"{0}\"", destPath);
 
+            // Drop stale registrations before deploying so a retried install can register cleanly.
+            PruneStaleCloneRegistrations();
+
             // process source
             // decide to download if source is a url
             if (imageSource.IsValidHttpUrl())
@@ -463,6 +472,7 @@ public static void DeployFromImage(string cloneName,
                 {
                     logger.Debug(string.Format("Exception occured after clone from image complete. " +
                                                "Deleting clone \"{0}\" | {1}", destPath, ex.Message));
+                    UnregisterCloneAtPath(destPath);
                     try
                     {
                         CommonUtils.DeleteDirectory(destPath);
@@ -506,12 +516,13 @@ private static void VerifyAndRegisterClone(string cloneName, string clonePath)
             {
                 PyRevitClone.VerifyCloneValidity(clonePath);
                 logger.Debug("Clone successful \"{0}\"", clonePath);
-                RegisterClone(cloneName, clonePath);
+                RegisterClone(cloneName, clonePath, forceUpdate: true);
             }
             catch (Exception ex)
             {
                 logger.Debug(string.Format("Exception occured after clone complete. Deleting clone \"{0}\" | {1}",
                                            clonePath, ex.Message));
+                UnregisterCloneAtPath(clonePath);
                 try
                 {
                     CommonUtils.DeleteDirectory(clonePath);
@@ -731,6 +742,24 @@ private static void InstallBinariesForImageClone(
             }
         }
 
+        private static void PruneStaleCloneRegistrations()
+        {
+            GetRegisteredClones();
+        }
+
+        private static void UnregisterCloneAtPath(string clonePath)
+        {
+            if (string.IsNullOrWhiteSpace(clonePath))
+                return;
+
+            var normalizedPath = clonePath.NormalizeAsPath();
+            foreach (var clone in GetRegisteredClones().ToList())
+            {
+                if (clone.ClonePath.Equals(normalizedPath, StringComparison.OrdinalIgnoreCase))
+                    UnregisterClone(clone);
+            }
+        }
+
         private static void WarnIfBinEnginesMissing(string clonePath) {
             var netfxEngines = Path.Combine(clonePath, "bin", "netfx", "engines");
             var netcoreEngines = Path.Combine(clonePath, "bin", "netcore", "engines");

dev/pyRevitLoader/pyRevitExtensionParserTester/ExtensionAuthUsersTests.cs

@@ -19,7 +19,7 @@ public void ResetParserConfig()
             ClearAllCaches();
         }
 
-        private static void UseTestPyRevitConfig(string iniContent)
+        private void UseTestPyRevitConfig(string iniContent)
         {
             var configPath = Path.Combine(TestTempDir, "pyRevit_config.ini");
             File.WriteAllText(configPath, iniContent);