Changeset 1835 for trunk/eraser6

Timestamp:

2/12/2010 9:38:46 AM (3 years ago)

Author:

lowjoel

Message:

Go back to the v6.0 behaviour that the progress is calculated based on the total amount of data to be erased, not number of files.

Location:

trunk/eraser6/Eraser.Manager

Files:

• DirectExecutor.cs (modified) (2 diffs)
• Strings.en.resx (modified) (1 diff)
• Strings.it.resx (modified) (1 diff)
• Strings.nl.resx (modified) (1 diff)
• Strings.resx (modified) (1 diff)

trunk/eraser6/Eraser.Manager/DirectExecutor.cs

@@ -598 +598 @@
             //Get the erasure method if the user specified he wants the default.
             ErasureMethod method = target.Method;
+            dataTotal = method.CalculateEraseDataSize(paths, dataTotal);
 
             //Set the event's current target status.
@@ -607 +608 @@
             for (int i = 0; i < paths.Count; ++i)
             {
+                //Check that the file exists - we do not want to bother erasing nonexistant files
+                StreamInfo info = new StreamInfo(paths[i]);
+                if (!info.Exists)
+                {
+                    Logger.Log(S._("The file {0} was not erased as the file does not exist.",
+                        paths[i]), LogLevel.Notice);
+                    continue;
+                }
+
+                //Get the filesystem provider to handle the secure file erasures
+                FileSystem fsManager = ManagerLibrary.Instance.FileSystemRegistrar[
+                    VolumeInfo.FromMountPoint(info.DirectoryName)];
+
                 //Update the task progress
                 ProgressManager step = new ProgressManager();
                 progress.Steps.Add(new SteppedProgressManagerStep(step,
-                    1.0f / paths.Count, S._("Erasing files...")));
+                    info.Length / (float)dataTotal, S._("Erasing files...")));
                 task.OnProgressChanged(target,
                     new ProgressChangedEventArgs(step,
                         new TaskProgressChangedEventArgs(paths[i], 0, method.Passes)));
-
-                //Check that the file exists - we do not want to bother erasing nonexistant files
-                StreamInfo info = new StreamInfo(paths[i]);
-                if (!info.Exists)
-                {
-                    Logger.Log(S._("The file {0} was not erased as the file does not exist.",
-                        paths[i]), LogLevel.Notice);
-                    continue;
-                }
-
-                //Get the filesystem provider to handle the secure file erasures
-                FileSystem fsManager = ManagerLibrary.Instance.FileSystemRegistrar[
-                    VolumeInfo.FromMountPoint(info.DirectoryName)];
 
                 bool isReadOnly = false;

trunk/eraser6/Eraser.Manager/Strings.en.resx

@@ -151 +151 @@
     <value>Erasing unused directory structures...</value>
   </data>
+  <data name="The file {0} was not erased as the file does not exist." xml:space="preserve">
+    <value>The file {0} was not erased as the file does not exist.</value>
+  </data>
   <data name="Erasing files..." xml:space="preserve">
     <value>Erasing files...</value>
   </data>
-  <data name="The file {0} was not erased as the file does not exist." xml:space="preserve">
-    <value>The file {0} was not erased as the file does not exist.</value>
-  </data>
   <data name="The file {0} could not be erased because the file was either compressed, encrypted or a sparse file." xml:space="preserve">
     <value>The file {0} could not be erased because the file was either compressed, encrypted or a sparse file.</value>

trunk/eraser6/Eraser.Manager/Strings.it.resx

@@ -151 +151 @@
     <value>Pulizia delle strutture di cartelle non usate...</value>
   </data>
+  <data name="The file {0} was not erased as the file does not exist." xml:space="preserve">
+    <value>Il file {0} non è stato pulito perchè il file non esiste.</value>
+  </data>
   <data name="Erasing files..." xml:space="preserve">
     <value>Pulizia dei files...</value>
   </data>
-  <data name="The file {0} was not erased as the file does not exist." xml:space="preserve">
-    <value>Il file {0} non è stato pulito perchè il file non esiste.</value>
-  </data>
   <data name="The file {0} could not be erased because the file was either compressed, encrypted or a sparse file." xml:space="preserve">
     <value>Il file {0} non può essere pulito perchè è compresso, crittato o distribuito.</value>

trunk/eraser6/Eraser.Manager/Strings.nl.resx

@@ -151 +151 @@
     <value>(Untranslated)</value>
   </data>
+  <data name="The file {0} was not erased as the file does not exist." xml:space="preserve">
+    <value>(Untranslated)</value>
+  </data>
   <data name="Erasing files..." xml:space="preserve">
     <value>(Untranslated)</value>
   </data>
-  <data name="The file {0} was not erased as the file does not exist." xml:space="preserve">
-    <value>(Untranslated)</value>
-  </data>
   <data name="The file {0} could not be erased because the file was either compressed, encrypted or a sparse file." xml:space="preserve">
     <value>(Untranslated)</value>

trunk/eraser6/Eraser.Manager/Strings.resx

@@ -151 +151 @@
     <value>Erasing unused directory structures...</value>
   </data>
+  <data name="The file {0} was not erased as the file does not exist." xml:space="preserve">
+    <value>The file {0} was not erased as the file does not exist.</value>
+  </data>
   <data name="Erasing files..." xml:space="preserve">
     <value>Erasing files...</value>
   </data>
-  <data name="The file {0} was not erased as the file does not exist." xml:space="preserve">
-    <value>The file {0} was not erased as the file does not exist.</value>
-  </data>
   <data name="The file {0} could not be erased because the file was either compressed, encrypted or a sparse file." xml:space="preserve">
     <value>The file {0} could not be erased because the file was either compressed, encrypted or a sparse file.</value>