Changeset 1725

Timestamp:

1/30/2010 2:15:30 AM (2 years ago)

Author:

lowjoel

Message:

Fixed progress reporting for FL16KB as we call the erasure method twice so the total amount of data is 32KB, not 16KB. The progress function will then be called beyond 16KB and we get an ArgumentOutOfRange? exception.

File:

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

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

@@ -113 +113 @@
                     "limited, since this is a self-limiting erasure method."));
 
-            //If the target stream is shorter than 16kb, just forward it to the default
-            //function.
-            if (strm.Length < dataSize)
+            //If the target stream is shorter than or equal to 32kb, just forward it to
+            //the default function.
+            if (strm.Length < dataSize * 2)
             {
                 method.Erase(strm, erasureLength, prng, callback);
@@ -121 +121 @@
             }
 
+            //We need to intercept the callback function as we run the erasure method
+            //twice on two parts of the file.
+            ErasureMethodProgressFunction customCallback =
+                delegate(long lastWritten, long totalData, int currentPass)
+                {
+                    callback(lastWritten, dataSize * 2, currentPass);
+                };
+
             //Seek to the beginning and write 16kb.
             strm.Seek(0, SeekOrigin.Begin);
-            method.Erase(strm, dataSize, prng, callback);
+            method.Erase(strm, dataSize, prng, callback == null ? null: customCallback);
 
             //Seek to the end - 16kb, and write.
             strm.Seek(-dataSize, SeekOrigin.End);
-            method.Erase(strm, long.MaxValue, prng, callback);
+            method.Erase(strm, long.MaxValue, prng, callback == null ? null : customCallback);
         }