Changeset 1756

Timestamp:

2/8/2010 3:55:50 AM (2 years ago)

Author:

lowjoel

Message:

Fixed progress calculation -- the old method did not take into account the different erasure methods, assuming a one-pass method. Addresses #322: Eraser 6.0.6.1743 - First Last 16KB threshhold addressed in change 1745 is 28kB rather than 32kB

File:

• trunk/eraser6/Eraser.DefaultPlugins/ErasureMethods/FirstLast16KB.cs (modified) (4 diffs)

trunk/eraser6/Eraser.DefaultPlugins/ErasureMethods/FirstLast16KB.cs

@@ -85 +85 @@
             if (paths == null)
             {
-                if (targetSize <= dataSize)
+                if (targetSize <= DataSize)
                     amountToWrite = targetSize;
                 else
-                    amountToWrite = dataSize * 2;
+                    amountToWrite = DataSize * 2;
             }
             else
-                amountToWrite = paths.Count * dataSize * 2;
+                amountToWrite = paths.Count * DataSize * 2;
 
             //The final amount has to be multiplied by the number of passes.
@@ -115 +115 @@
             //If the target stream is shorter than or equal to 32kb, just forward it to
             //the default function.
-            if (strm.Length < dataSize * 2)
+            if (strm.Length < DataSize * 2)
             {
                 method.Erase(strm, erasureLength, prng, callback);
@@ -123 +123 @@
             //We need to intercept the callback function as we run the erasure method
             //twice on two parts of the file.
+            long dataSize = method.CalculateEraseDataSize(null, DataSize * 2);
             ErasureMethodProgressFunction customCallback =
                 delegate(long lastWritten, long totalData, int currentPass)
                 {
-                    callback(lastWritten, dataSize * 2, currentPass);
+                    callback(lastWritten, dataSize, currentPass);
                 };
 
@@ -141 +142 @@
         /// The amount of data to be erased from the header and the end of the file.
         /// </summary>
-        private const long dataSize = 16 * 1024;
+        private const long DataSize = 16 * 1024;
 
         private ErasureMethod method;