Changeset 2486 for branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/FileSystemObjectErasureTarget.cs

Timestamp:

3/13/2012 11:06:57 PM (15 months ago)

Author:

lowjoel

Message:

Report progress updates by pushing information to the SteppedProgressManager? instance associated with each erasure target. Furthermore, do not manipulate the state of the Task object, instead, let the Task object manage its own Progress state.

Because of this, a new property Tag is created in ProgressManagerBase?, to hold state information.

File:

• branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/FileSystemObjectErasureTarget.cs (modified) (3 diffs)

branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/FileSystemObjectErasureTarget.cs

@@ -205 +205 @@
             if (Progress == null)
                 throw new InvalidOperationException("The Progress property must not be null.");
-            Task.Progress.Steps.Add(new SteppedProgressManagerStep(Progress,
-                1.0f / Task.Targets.Count));
 
             //Iterate over every path, and erase the path.
             for (int i = 0; i < paths.Count; ++i)
             {
+                //Create a new progress manager for the file.
                 ProgressManager step = new ProgressManager();
                 Progress.Steps.Add(new SteppedProgressManagerStep(step,
                     dataTotal == 0 ? 0.0f : paths[i].Length / (float)dataTotal,
-                    S._("Erasing files...")));
+                    paths[i].FullName));
                 EraseStream(paths[i], step);
-                step.MarkComplete();
             }
         }
@@ -247 +245 @@
                 //Update the task progress
                 IErasureMethod method = EffectiveMethod;
-                /*OnProgressChanged(this, new ProgressChangedEventArgs(progress,
-                    new TaskProgressChangedEventArgs(info.FullName, 0, method.Passes)));*/
-
+                
                 //Remove the read-only flag, if it is set.
                 if (isReadOnly = info.IsReadOnly)
@@ -261 +257 @@
                             throw new OperationCanceledException(S._("The task was cancelled."));
 
+                        progress.Tag = new object[2] { currentPass, method.Passes };
                         progress.Total = totalData;
                         progress.Completed += lastWritten;
-                        /*OnProgressChanged(this, new ProgressChangedEventArgs(progress,
-                            new TaskProgressChangedEventArgs(info.FullName, currentPass, method.Passes)));*/
                     };