Only release handles on retry

Author: BlythMeister

src/Ensconce.Cli/FileInteraction.cs

@@ -20,39 +20,42 @@ internal static void DeleteDirectory(string directory)
             // Try and kill processes we know about in the dir
             ApplicationInteraction.StopProcessesInDirectory(directory);
 
-            // Try and kill handles in the dir
-            ApplicationInteraction.ReleaseHandlesInDirectory(directory);
-
             Logging.Log("Deleting from {0}", directory);
-            PerformDelete(new DirectoryInfo(directory));
-
-            Logging.Log("Ensure Directory {0} has been deleted", directory);
-            Retry.Do(() =>
-            {
-                if (Directory.Exists(directory))
-                {
-                    throw new Exception("Directory still exists");
-                }
-            }, TimeSpan.FromMilliseconds(1000));
-        }
+            var directoryInfo = new DirectoryInfo(directory);
 
-        private static void PerformDelete(DirectoryInfo directory)
-        {
             // Disable any read-only flags
-            directory.Attributes = FileAttributes.Normal;
+            directoryInfo.Attributes = FileAttributes.Normal;
 
-            foreach (var dir in directory.EnumerateDirectories("*", SearchOption.AllDirectories))
+            foreach (var dir in directoryInfo.EnumerateDirectories("*", SearchOption.AllDirectories))
             {
                 dir.Attributes = FileAttributes.Normal;
             }
 
-            foreach (var file in directory.EnumerateFiles("*", SearchOption.AllDirectories))
+            foreach (var file in directoryInfo.EnumerateFiles("*", SearchOption.AllDirectories))
             {
                 file.Attributes = FileAttributes.Normal;
             }
 
             // Delete directory tree
-            Retry.Do(() => directory.Delete(true), TimeSpan.FromMilliseconds(1000));
+            Retry.Do(retry =>
+            {
+                if (retry > 0)
+                {
+                    // Try and kill handles in the dir
+                    ApplicationInteraction.ReleaseHandlesInDirectory(directory);
+                }
+
+                directoryInfo.Delete(true);
+            }, TimeSpan.FromMilliseconds(1000));
+
+            Logging.Log("Ensure Directory {0} has been deleted", directory);
+            Retry.Do(() =>
+            {
+                if (directoryInfo.Exists)
+                {
+                    throw new Exception("Directory still exists");
+                }
+            }, TimeSpan.FromMilliseconds(1000));
         }
 
         internal static void CopyDirectory(string from, string to)

src/Ensconce.Helpers/Retry.cs

@@ -15,24 +15,34 @@ public static class Retry
 
         public static void Do(Action action, TimeSpan retryInterval, Type[] doNotRetryTheseExceptions = null)
         {
-            Do<object>(() =>
+            Do(_ => action(), retryInterval, doNotRetryTheseExceptions);
+        }
+
+        public static void Do(Action<int> action, TimeSpan retryInterval, Type[] doNotRetryTheseExceptions = null)
+        {
+            Do<object>(retry =>
                 {
-                    action();
+                    action(retry);
                     return null;
                 },
                 retryInterval,
                 doNotRetryTheseExceptions);
         }
 
         public static T Do<T>(Func<T> action, TimeSpan retryInterval, Type[] doNotRetryTheseExceptions = null)
+        {
+            return Do(_ => action(), retryInterval, doNotRetryTheseExceptions);
+        }
+
+        public static T Do<T>(Func<int, T> action, TimeSpan retryInterval, Type[] doNotRetryTheseExceptions = null)
         {
             var exceptions = new List<Exception>();
 
             for (var retry = 0; retry < retryCount; retry++)
             {
                 try
                 {
-                    return action();
+                    return action(retry);
                 }
                 catch (Exception ex) when (doNotRetryTheseExceptions?.Any(t => ex.GetType() == t) == true)
                 {