Changeset 2234 for trunk/eraser/Eraser/Program.cs

Timestamp:

08/04/10 10:01:58 (22 months ago)

Author:

lowjoel

Message:

Remove the querymethods command, display all the registered erasure methods in the Help command.

File:

• trunk/eraser/Eraser/Program.cs (modified) (6 diffs)

trunk/eraser/Eraser/Program.cs

@@ -260 +260 @@
                     program.Handlers.Add("help",
                         new ConsoleActionData(CommandHelp, new ConsoleArguments()));
-                    program.Handlers.Add("querymethods",
-                        new ConsoleActionData(CommandQueryMethods, new ConsoleArguments()));
                     program.Handlers.Add("addtask",
                         new ConsoleActionData(CommandAddTask, new AddTaskArguments()));
@@ -304 +302 @@
             }
 
+            //Get the list of registered Erasure Methods. First, output the header.
+            const string methodFormat = "    {0,-2} {1,-35} {2}\n";
+            StringBuilder methods = new StringBuilder();
+            methods.AppendFormat(methodFormat, "", "Erasure Method", "GUID");
+            methods.AppendLine("    " + new string('-', 75));
+
+            //Generate the list of erasure methods.
+            foreach (ErasureMethod method in ManagerLibrary.Instance.ErasureMethodRegistrar)
+            {
+                methods.AppendFormat(methodFormat, (method is UnusedSpaceErasureMethod) ?
+                    "U" : "", method.Name, method.Guid);
+            }
+
             //Print the message
             Console.WriteLine(S._(@"usage: Eraser <action> <arguments>
@@ -309 +320 @@
   help                Show this help message.
   addtask             Adds a task to the current task list.
-  querymethods        Lists all registered Erasure methods.
   importtasklist      Imports an Eraser Task list to the current user's Task
                       List.
@@ -332 +342 @@
                       is next restarted.
 
-  where target is one of more of:
+  where methodGUID and methodName any GUID/Name from the following list:
 {0}
-
-parameters for querymethods:
-  eraser querymethods
-
-  no parameters to set.
+  Only erasure methods labelled ""U"" can be used to erase unused disk space.
+
+where target is one or more of:
+{1}
 
 parameters for importtasklist:
@@ -351 +360 @@
 ""@"" to the path to the file, and passing it into the command line. The
 contents of the response files' will be substituted at the same position into
-the command line.", targets));
+the command line.", methods, targets));
 
             Console.Out.Flush();
@@ -368 +377 @@
 
             PrintCommandHelp();
-        }
-
-        /// <summary>
-        /// Lists all registered erasure methods.
-        /// </summary>
-        /// <param name="arguments">Not used.</param>
-        private static void CommandQueryMethods(ConsoleArguments arguments)
-        {
-            //Output the header
-            const string methodFormat = "{0,-2} {1,-39} {2}";
-            Console.WriteLine(methodFormat, "", "Erasure Method", "GUID");
-            Console.WriteLine(new string('-', 79));
-
-            //Refresh the list of erasure methods
-            foreach (ErasureMethod method in ManagerLibrary.Instance.ErasureMethodRegistrar)
-            {
-                Console.WriteLine(methodFormat, (method is UnusedSpaceErasureMethod) ?
-                    "U" : "", method.Name, method.Guid.ToString());
-            }
         }