Changeset 486 for branches/eraser6/Manager/Task.cs

Timestamp:

11/10/2008 9:03:31 AM (5 years ago)

Author:

lowjoel

Message:

-The ErasureTarget?.Method property should always return a valid Erasure method. Therefore, to check if the user specified to use defaults, I've added the MethodDefined? property
-Fixed the Task data selection form: the erasure method was not set even if it was defined

File:

• branches/eraser6/Manager/Task.cs (modified) (6 diffs)

branches/eraser6/Manager/Task.cs

@@ -72 +72 @@
             /// task type.
             /// </summary>
-            public ErasureMethod Method
-            {
-                get { return method; }
-                set { method = value; }
+            public abstract ErasureMethod Method
+            {
+                get;
+                set;
+            }
+
+            /// <summary>
+            /// Checks whether a method has been selected for this target. This is
+            /// because the Method property will return non-default erasure methods
+            /// only.
+            /// </summary>
+            public bool MethodDefined
+            {
+                get
+                {
+                    return method != ErasureMethodManager.Default;
+                }
             }
 
@@ -86 +99 @@
             }
 
-            private ErasureMethod method = null;
+            /// <summary>
+            /// Retrieves the amount of data that needs to be written in order to
+            /// complete the erasure.
+            /// </summary>
+            public abstract long TotalData
+            {
+                get;
+            }
+
+            protected ErasureMethod method = null;
         }
 
@@ -154 +176 @@
             }
 
+            public override ErasureMethod Method
+            {
+                get
+                {
+                    if (method != ErasureMethodManager.Default)
+                        return method;
+                    return ErasureMethodManager.GetInstance(
+                        ManagerLibrary.Instance.Settings.DefaultFileErasureMethod);
+                }
+                set
+                {
+                    method = value;
+                }
+            }
+
             public override string UIText
             {
                 get { return Path; }
+            }
+
+            public override long TotalData
+            {
+                get
+                {
+                    long totalSize = 0;
+                    List<string> paths = GetPaths(out totalSize);
+                    return Method.CalculateEraseDataSize(paths, totalSize);
+                }
             }
 
@@ -192 +239 @@
             }
 
+            public override ErasureMethod Method
+            {
+                get
+                {
+                    if (method != ErasureMethodManager.Default)
+                        return method;
+                    return ErasureMethodManager.GetInstance(
+                        ManagerLibrary.Instance.Settings.DefaultUnusedSpaceErasureMethod);
+                }
+                set
+                {
+                    method = value;
+                }
+            }
+
             public override string UIText
             {
                 get { return string.Format("Unused disk space ({0})", Drive); }
+            }
+
+            public override long TotalData
+            {
+                get
+                {
+                    VolumeInfo info = VolumeInfo.FromMountpoint(Drive);
+                    return Method.CalculateEraseDataSize(null, info.AvailableFreeSpace);
+                }
             }
 
@@ -683 +754 @@
         public TimeSpan TimeLeft
         {
-            get { return new TimeSpan(timeLeft * 10000000L); }
+            get { return timeLeft; }
         }
 
@@ -746 +817 @@
 
         private float overallProgress = 0.0f;
-        internal int timeLeft = -1;
+        internal TimeSpan timeLeft = new TimeSpan(0, 0, -1);
 
         internal Task.ErasureTarget currentTarget;