Changeset 2108 for trunk/eraser

Timestamp:

5/15/2010 4:37:21 AM (3 years ago)

Author:

lowjoel

Message:

Addresses #60: Eraser Secure Cut.

• Implemented GetPaths? for secure move directories
• Re-implemented the destruction of the destination file using the FileSystemErasureTarget?.EraseStream? function

File:

• trunk/eraser/Eraser.DefaultPlugins/ErasureTargets/SecureMoveErasureTarget.cs (modified) (4 diffs)

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

@@ -97 +97 @@
                 return result;
 
+            FileInfo[] files = null;
             if ((File.GetAttributes(Path) & FileAttributes.Directory) == 0)
+                files = new FileInfo[] { new FileInfo(Path) };
+            else
+                files = GetFiles(new DirectoryInfo(Path));
+
+            foreach (FileInfo info in files)
             {
-                FileInfo info = new FileInfo(Path);
-
                 //Add the alternate data streams
                 result.AddRange(GetPathADSes(info));
@@ -106 +110 @@
                 //And the file itself
                 result.Add(new StreamInfo(info.FullName));
-            }
-            else
-            {
-
             }
 
@@ -138 +138 @@
                     CopyFile(info);
                 }
-
-                //Then erase the source paths.
-                base.Execute();
             }
             finally
@@ -179 +176 @@
 
                 //We need to erase the partially copied copy of the file.
-                Task task = new Task();
-                FileErasureTarget fileTarget = new FileErasureTarget();
-                fileTarget.Path = Destination;
-                task.Targets.Add(fileTarget);
+                FileInfo copiedFile = new FileInfo(Destination);
+                List<StreamInfo> streams = new List<StreamInfo>(
+                    copiedFile.GetADSes().Select(x => new StreamInfo(copiedFile.FullName, x));
+                streams.Add(new StreamInfo(copiedFile.FullName));
+                long totalSize = streams.Sum(x => x.Length);
 
-                Progress.Steps.Add(new SteppedProgressManagerStep(task.Progress, 0.5f,
-                    S._("Erasing incomplete destination file")));
-                task.ProgressChanged += delegate(object sender, ProgressChangedEventArgs e)
-                    {
-                        OnProgressChanged(this, new ProgressChangedEventArgs(Progress,
-                            e.UserState));
-                    };
-
-                fileTarget.Execute();
+                foreach (StreamInfo stream in streams)
+                {
+                    ProgressManager destroyProgress = new ProgressManager();
+                    Progress.Steps.Add(new SteppedProgressManagerStep(destroyProgress,
+                        0.5f * stream.Length / totalSize,
+                        S._("Erasing incomplete destination file")));
+                    EraseStream(stream, destroyProgress);
+                }
 
                 //Rethrow the exception.