Changeset 1082

Timestamp:

6/1/2009 1:18:30 PM (4 years ago)

Author:

lowjoel

Message:

When erasing folders which don't exist, just ignore the error and continue since this is not an error (if you're deleting something that already is deleted then it's a success.)

Location:

trunk/eraser6/Eraser.Manager

Files:

• DirectExecutor.cs (modified) (1 diff)
• Task.cs (modified) (1 diff)

trunk/eraser6/Eraser.Manager/DirectExecutor.cs

@@ -907 +907 @@
                     //If the folder is a mount point, then don't delete it. If it isn't,
                     //search for files under the folder to see if it is empty.
-                    if (!isVolumeRoot && info.GetFiles("*", SearchOption.AllDirectories).Length == 0)
+                    if (!isVolumeRoot && info.Exists && info.GetFiles("*", SearchOption.AllDirectories).Length == 0)
                     {
                         FileSystem fsManager = FileSystem.Get(VolumeInfo.FromMountpoint(fldr.Path));

trunk/eraser6/Eraser.Manager/Task.cs

@@ -600 +600 @@
         {
             List<FileInfo> result = new List<FileInfo>();
-            foreach (DirectoryInfo dir in info.GetDirectories())
-                try
-                {
-                    result.AddRange(GetFiles(dir));
-                }
-                catch (Exception e)
-                {
-                    //Ignore, but log.
-                    Task.Log.LastSessionEntries.Add(new LogEntry(S._("Could not erase {0} because {1}",
-                        dir.FullName, e.Message), LogLevel.Error));
-                }
-
-            if (includeMask.Length == 0)
-                result.AddRange(info.GetFiles());
-            else
-                result.AddRange(info.GetFiles(includeMask, SearchOption.TopDirectoryOnly));
+            if (info.Exists)
+            {
+                foreach (DirectoryInfo dir in info.GetDirectories())
+                    try
+                    {
+                        result.AddRange(GetFiles(dir));
+                    }
+                    catch (Exception e)
+                    {
+                        //Ignore, but log.
+                        Task.Log.LastSessionEntries.Add(new LogEntry(S._("Could not erase {0} because {1}",
+                            dir.FullName, e.Message), LogLevel.Error));
+                    }
+
+                if (includeMask.Length == 0)
+                    result.AddRange(info.GetFiles());
+                else
+                    result.AddRange(info.GetFiles(includeMask, SearchOption.TopDirectoryOnly));
+            }
+
             return result.ToArray();
         }