Changeset 1668 for trunk/eraser6

Timestamp:

1/25/2010 4:12:10 AM (3 years ago)

Author:

lowjoel

Message:

Fixed ArgumentOutOfRangeException? when erasing free space using an erasure method containing more than 1 pass.

• Added checks to the ProgressManager? class to ensure that the Progress property will never exceed 1.0
• When computing the total amount of data needed to be written to the disk, take into account the number of passes.

Location:

trunk/eraser6/Eraser.Manager

Files:

• DirectExecutor.cs (modified) (1 diff)
• ProgressManager.cs (modified) (3 diffs)

trunk/eraser6/Eraser.Manager/DirectExecutor.cs

@@ -443 +443 @@
                         //Set the length of the file to be the amount of free space left
                         //or the maximum size of one of these dumps.
-                        mainProgress.Total = mainProgress.Completed + volInfo.AvailableFreeSpace;
+                        mainProgress.Total = mainProgress.Completed +
+                            method.CalculateEraseDataSize(null, volInfo.AvailableFreeSpace);
                         long streamLength = Math.Min(ErasureMethod.FreeSpaceFileUnit,
                             mainProgress.Total);

trunk/eraser6/Eraser.Manager/ProgressManager.cs

@@ -100 +100 @@
         public long Completed
         {
-            get;
-            set;
+            get
+            {
+                return completed;
+            }
+            set
+            {
+                if (value > Total)
+                    throw new ArgumentOutOfRangeException("value", value, "The Completed " +
+                        "property of the Progress Manager cannot exceed the total work units for " +
+                        "the task.");
+
+                completed = value;
+            }
         }
 
@@ -109 +120 @@
         public long Total
         {
-            get;
-            set;
+            get
+            {
+                return Total;
+            }
+            set
+            {
+                if (value < Completed)
+                    throw new ArgumentOutOfRangeException("value", value, "The Total property " +
+                        "of the Progress Manager must be greater than or equal to the completed " +
+                        "work units for the task.");
+
+                Total = value;
+            }
         }
 
@@ -172 +194 @@
         /// </summary>
         private int lastSpeed;
+
+        /// <summary>
+        /// The backing field for <see cref="Completed"/>
+        /// </summary>
+        private long completed;
+
+        /// <summary>
+        /// The backing field for <see cref="Total"/>
+        /// </summary>
+        private long total;
     }