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

Timestamp:

8/4/2010 9:44:20 AM (22 months ago)

Author:

lowjoel

Message:

Allow the user to specify the Name or the GUID of the erasure method, to increase usability of the CLI. The name can be used as a convenient shorthand, the GUID must be used in the event of ambiguity.

File:

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

trunk/eraser/Eraser/Program.cs

@@ -93 +93 @@
             /// The erasure method which the user specified on the command line.
             /// </summary>
-            [Arg("method", "The erasure method to use", typeof(Guid), false, null, null)]
-            public Guid ErasureMethod { get; set; }
+            [Arg("method", "The erasure method to use", typeof(string), false, null, null)]
+            public string ErasureMethod { get; set; }
 
             /// <summary>
@@ -322 +322 @@
 
 parameters for addtask:
-  eraser addtask [/method=<methodGUID>] [/schedule=(now|manually|restart)] <target> [target [...]]
+  eraser addtask [/method=(<methodGUID>|<methodName>)] [/schedule=(now|manually|restart)] <target> [target [...]]
 
   /method             The Erasure method to use.
@@ -332 +332 @@
                       is next restarted.
 
-  where target is:
+  where target is one of more of:
 {0}
 
@@ -341 +341 @@
 
 parameters for importtasklist:
-  eraser importtasklist (file)[...]
-
-  [file]              A list of one or more files to import.
+  eraser importtasklist <file>[...]
+
+    file               A list of one or more files to import.
 
 All arguments are case sensitive.
@@ -398 +398 @@
             AddTaskArguments arguments = (AddTaskArguments)arg;
 
-            //Create the task then set the method as well as schedule
+            //Create the task
             Task task = new Task();
-            ErasureMethod method = arguments.ErasureMethod == Guid.Empty ?
+
+            //Get the erasure method the user wants to use
+            ErasureMethod method = string.IsNullOrEmpty(arguments.ErasureMethod) ?
                 ErasureMethodRegistrar.Default :
-                ManagerLibrary.Instance.ErasureMethodRegistrar[arguments.ErasureMethod];
+                ErasureMethodFromNameOrGuid(arguments.ErasureMethod);
+
+            //Define the schedule
             switch (arguments.Schedule.ToUpperInvariant())
             {
@@ -442 +446 @@
                         {
                             //Yes, it is an ambiguity. Throw an error.
-                            throw new InvalidOperationException("Ambiguous argument: {0} can be " +
-                                "handled by more than one erasure target.");
+                            throw new ArgumentException(S._("Ambiguous argument: {0} can be " +
+                                "handled by more than one erasure target.", argument));
                         }
                     }
@@ -467 +471 @@
             using (eraserClient = CommandConnect())
                 eraserClient.Tasks.Add(task);
+        }
+
+        private static ErasureMethod ErasureMethodFromNameOrGuid(string param)
+        {
+            try
+            {
+                return ManagerLibrary.Instance.ErasureMethodRegistrar[new Guid(param)];
+            }
+            catch (FormatException)
+            {
+                //Invalid GUID. Check every registered erasure method for the name
+                string upperParam = param.ToUpperInvariant();
+                ErasureMethod result = null;
+                foreach (ErasureMethod method in ManagerLibrary.Instance.ErasureMethodRegistrar)
+                {
+                    if (method.Name.ToUpperInvariant() == upperParam)
+                        if (result == null)
+                            result = method;
+                        else
+                            throw new ArgumentException(S._("Ambiguous erasure method name: {0} " +
+                                "identifies more than one erasure method.", param));
+                }
+            }
+
+            throw new ArgumentException(S._("The provided Erasure Method '{0}' does not exist.",
+                param));
         }