Better commandline handling

OpenCGSS · Oct 17, 2018 · 4b42a38 · 4b42a38
1 parent fdfed37
commit 4b42a38
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/Apps/Acb2Wavs/Options.cs b/Apps/Acb2Wavs/Options.cs
@@ -4,7 +4,7 @@
 namespace DereTore.Apps.BatchDecodeFromAcb {
     public sealed class Options {
 
-        [Value(0)]
+        [Value(0, HelpText = "Input file name", Required = true)]
         public string InputFileName { get; set; } = string.Empty;
 
         [Option('o', "out", HelpText = "Output file name", Required = false)]

diff --git a/Apps/Acb2Wavs/Program.cs b/Apps/Acb2Wavs/Program.cs
@@ -51,7 +51,7 @@ private static int ParseOptions(string[] args, out Options options) {
             }
 
             if (!succeeded) {
-                var helpText = CommandLine.Text.HelpText.AutoBuild(parsedResult);
+                var helpText = CommandLine.Text.HelpText.AutoBuild(parsedResult, null, null);
 
                 helpText.AddPreOptionsLine(" ");
                 helpText.AddPreOptionsLine("Usage: acb2wavs <input ACB> [options]");

diff --git a/Apps/Hca2Wav/Options.cs b/Apps/Hca2Wav/Options.cs
@@ -5,7 +5,7 @@
 namespace DereTore.Apps.Hca2Wav {
     public sealed class Options {
 
-        [Value(0)]
+        [Value(0, HelpText = "Input file name", Required = true)]
         public string InputFileName { get; set; } = string.Empty;
 
         [Option('o', "out", HelpText = "Output file name", Required = false)]

diff --git a/Apps/Hca2Wav/Program.cs b/Apps/Hca2Wav/Program.cs
@@ -29,7 +29,7 @@ private static int Main(string[] args) {
             }
 
             if (!succeeded) {
-                var helpText = CommandLine.Text.HelpText.AutoBuild(parsedResult);
+                var helpText = CommandLine.Text.HelpText.AutoBuild(parsedResult, null, null);
                 helpText.AddPreOptionsLine(" ");
                 helpText.AddPreOptionsLine("Usage: hca2wav <input HCA> [options]");
                 Console.Error.WriteLine(helpText);

diff --git a/Apps/JacketCreator/Program.cs b/Apps/JacketCreator/Program.cs
@@ -14,7 +14,11 @@ internal static class Program {
         private static int Main(string[] args) {
             const int defaultReturnCodeFail = -1;
 
-            var parsedResult = Parser.Default.ParseArguments<Options>(args);
+            var parser = new Parser(settings => {
+                settings.IgnoreUnknownArguments = true;
+            });
+
+            var parsedResult = parser.ParseArguments<Options>(args);
             var isOptionsValid = parsedResult.Tag == ParserResultType.Parsed;
 
             if (!isOptionsValid) {