Changeset 2653

Timestamp:

5/24/2012 2:57:09 AM (13 months ago)

Author:

lowjoel

Message:

When enumerating folders for erasure, it is possible that in the time we got the listings to the time we got the sizes or when we are trying to find the ADSes the file could have been deleted. In those situations, we'd get a FileNotFoundException? or DirectoryNotFoundException?. Handle those and move on.

Location:

trunk/eraser/Eraser.DefaultPlugins/ErasureTargets

Files:

• FileSystemObjectErasureTarget.cs (modified) (1 diff)
• FolderErasureTarget.cs (modified) (1 diff)
• RecycleBinErasureTarget.cs (modified) (1 diff)

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

@@ -224 +224 @@
             //Retrieve the list of files to erase.
             List<StreamInfo> paths = GetPaths();
-            long dataTotal = paths.Sum(x => x.Length);
+            long dataTotal = paths.Sum(delegate(StreamInfo x) {
+                try
+                {
+                    return x.Length;
+                }
+                catch (DirectoryNotFoundException)
+                {
+                    return 0;
+                }
+                catch (FileNotFoundException)
+                {
+                    return 0;
+                }
+            });
 
             //Set the event's current target status.

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

@@ -147 +147 @@
                     continue;
 
-                //Add the size of the file and its alternate data streams
-                result.AddRange(GetPathADSes(file));
-
-                //And the file itself
-                result.Add(new StreamInfo(file.FullName));
+                try
+                {
+                    //Add the size of the file and its alternate data streams
+                    result.AddRange(GetPathADSes(file));
+
+                    //And the file itself
+                    result.Add(new StreamInfo(file.FullName));
+                }
+                catch (FileNotFoundException)
+                {
+                    Logger.Log(S._("The file {0} was not erased because it was deleted " +
+                        "before it could be erased.", file.FullName), LogLevel.Information);
+                }
+                catch (DirectoryNotFoundException)
+                {
+                    Logger.Log(S._("The file {0} was not erased because the containing " +
+                        "directory was deleted before it could be erased", file.FullName),
+                        LogLevel.Information);
+                }
             }
 

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

@@ -141 +141 @@
                 foreach (FileInfo file in GetFiles(directory))
                 {
-                    //Add the ADSes
-                    result.AddRange(GetPathADSes(file));
+                    try
+                    {
+                        //Add the ADSes
+                        result.AddRange(GetPathADSes(file));
 
-                    //Then the file itself
-                    result.Add(new StreamInfo(file.FullName));
+                        //Then the file itself
+                        result.Add(new StreamInfo(file.FullName));
+                    }
+                    catch (FileNotFoundException)
+                    {
+                        Logger.Log(S._("The file {0} was not erased because it was deleted " +
+                            "before it could be erased.", file.FullName), LogLevel.Information);
+                    }
+                    catch (DirectoryNotFoundException)
+                    {
+                        Logger.Log(S._("The file {0} was not erased because the containing " +
+                            "directory was deleted before it could be erased", file.FullName),
+                            LogLevel.Information);
+                    }
                 }