Changeset 2118

Timestamp:

5/15/2010 9:45:01 AM (3 years ago)

Author:

lowjoel

Message:

When we use File.Exists, we have to also check using Directory.Exists as File.Exists returns false if the path points to a directory.

Location:

trunk/eraser

Files:

• Eraser.DefaultPlugins/ErasureTargets/SecureMoveErasureTarget.cs (modified) (1 diff)
• Eraser.DefaultPlugins/ErasureTargets/SecureMoveErasureTargetConfigurer.cs (modified) (1 diff)
• Eraser.Manager/FileSystem.cs (modified) (1 diff)
• Eraser/Program.cs (modified) (1 diff)
• Eraser/SchedulerPanel.cs (modified) (1 diff)

trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/SecureMoveErasureTarget.cs

@@ -118 +118 @@
         {
             //If the path doesn't exist, exit.
-            if (!File.Exists(Path) && !Directory.Exists(Path))
+            if (!(File.Exists(Path) || Directory.Exists(Path)))
                 return;
 

trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/SecureMoveErasureTargetConfigurer.cs

@@ -55 +55 @@
             toTxt.Text = secureMove.Destination;
 
-            moveFolderRadio.Checked = File.Exists(secureMove.Path) &&
+            moveFolderRadio.Checked =
+                File.Exists(secureMove.Path) || Directory.Exists(secureMove.Path) &&
                 (File.GetAttributes(secureMove.Path) & FileAttributes.Directory) != 0;
         }

trunk/eraser/Eraser.Manager/FileSystem.cs

@@ -144 +144 @@
                     int index = prng.Next(entries.Count - 1);
                     shadowFile = entries[index];
-                    if (File.Exists(shadowFile))
+                    if (File.Exists(shadowFile) || Directory.Exists(shadowFile))
                     {
                         if ((File.GetAttributes(shadowFile) & FileAttributes.Directory) != 0)

trunk/eraser/Eraser/Program.cs

@@ -490 +490 @@
                     {
                         //If the path doesn't exist, skip the file
-                        if (!File.Exists(path))
+                        if (!(File.Exists(path) || Directory.Exists(path)))
                             continue;
 

trunk/eraser/Eraser/SchedulerPanel.cs

@@ -538 +538 @@
                     {
                         //If the path doesn't exist, skip the file
-                        if (!File.Exists(file))
+                        if (!(File.Exists(file) && Directory.Exists(file)))
                             continue;