Removing unnecessary text output.

orakist · Feb 2, 2024 · 85e7d40 · 85e7d40
1 parent f8e0348
commit 85e7d40
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 28 deletions.
diff --git a/src/Oaksoft.ArgumentParser/Parser/ArgumentParser.cs b/src/Oaksoft.ArgumentParser/Parser/ArgumentParser.cs
@@ -23,6 +23,7 @@ internal sealed class ArgumentParser<TOptions>
     public override VerbosityLevelType VerbosityLevel => GetBuiltInOptions().Verbosity ?? Settings.VerbosityLevel;
 
     private readonly TOptions _appOptions;
+    private bool _commentPrinted;
 
     public ArgumentParser(BaseArgumentParserBuilder builder)
         : base(builder)
@@ -216,7 +217,7 @@ private void RunInner(string? comment, string[]? args, Action callback)
         {
             EvaluateArguments(args, callback);
 
-            args = GetInputArguments();
+            args = GetInputArguments(comment);
         }
     }
 
@@ -228,7 +229,7 @@ private async Task RunInnerAsync(string? comment, string[]? args, Func<Task> cal
         {
             await EvaluateArgumentsAsync(args, callback);
 
-            args = await GetInputArgumentsAsync();
+            args = await GetInputArgumentsAsync(comment);
         }
     }
 
@@ -248,14 +249,6 @@ private async Task RunOnceInnerAsync(string? comment, string[]? args, Func<Task>
 
     private string[] InitializeArguments(string? comment, string[]? args)
     {
-        if (!string.IsNullOrWhiteSpace(comment))
-        {
-            if (!CommandLine.DisableTextWriter)
-            {
-                _writer.WriteLine(comment);
-            }
-        }
-
         if (args?.Length > 0)
         {
             if (!CommandLine.DisableTextWriter && Settings.AutoPrintArguments)
@@ -265,22 +258,14 @@ private string[] InitializeArguments(string? comment, string[]? args)
         }
         else
         {
-            args = GetInputArguments();
+            args = GetInputArguments(comment);
         }
 
         return args;
     }
 
     private async Task<string[]> InitializeArgumentsAsync(string? comment, string[]? args)
     {
-        if (!string.IsNullOrWhiteSpace(comment))
-        {
-            if (!CommandLine.DisableTextWriter)
-            {
-                await _writer.WriteLineAsync(comment);
-            }
-        }
-
         if (args?.Length > 0)
         {
             if (!CommandLine.DisableTextWriter && Settings.AutoPrintArguments)
@@ -290,7 +275,7 @@ private async Task<string[]> InitializeArgumentsAsync(string? comment, string[]?
         }
         else
         {
-            args = await GetInputArgumentsAsync();
+            args = await GetInputArgumentsAsync(comment);
         }
 
         return args;
@@ -361,8 +346,17 @@ private static bool IsQuitArgument(string[] args)
         return args[0].Equals("quit", StringComparison.OrdinalIgnoreCase);
     }
 
-    private string[] GetInputArguments()
+    private string[] GetInputArguments(string? comment = null)
     {
+        if (!CommandLine.DisableTextWriter && !string.IsNullOrWhiteSpace(comment))
+        {
+            if (!_commentPrinted)
+            {
+                _writer.WriteLine(comment);
+                _commentPrinted = true;
+            }
+        }
+
         if (!CommandLine.DisableTextWriter)
         {
             _writer.Write("./> ");
@@ -371,7 +365,7 @@ private string[] GetInputArguments()
         var commandLine = _reader.ReadLine();
 
         var result = commandLine?.SplitToArguments().ToArray() ??
-               Array.Empty<string>();
+                     Array.Empty<string>();
 
         if (!CommandLine.DisableTextWriter && Settings.AutoPrintArguments)
         {
@@ -381,8 +375,17 @@ private string[] GetInputArguments()
         return result;
     }
 
-    private async Task<string[]> GetInputArgumentsAsync()
+    private async Task<string[]> GetInputArgumentsAsync(string? comment = null)
     {
+        if (!CommandLine.DisableTextWriter && !string.IsNullOrWhiteSpace(comment))
+        {
+            if (!_commentPrinted)
+            {
+                await _writer.WriteLineAsync(comment);
+                _commentPrinted = true;
+            }
+        }
+
         if (!CommandLine.DisableTextWriter)
         {
             await _writer.WriteAsync("./> ");

diff --git a/src/Oaksoft.ArgumentParser/Parser/BaseArgumentParser.cs b/src/Oaksoft.ArgumentParser/Parser/BaseArgumentParser.cs
@@ -367,7 +367,6 @@ protected void AutoPrintHeaderText()
         }
 
         _writer.Write(BuildHeaderText(true, true).ToString());
-        _writer.WriteLine();
     }
 
     private void AutoPrintHelpText()
@@ -387,8 +386,7 @@ private void AutoPrintVersion()
             return;
         }
 
-        _writer.Write(AssemblyHelper.GetAssemblyVersion());
-        _writer.WriteLine();
+        _writer.WriteLine(AssemblyHelper.GetAssemblyVersion());
     }
 
     protected void AutoPrintErrorText()
@@ -399,7 +397,6 @@ protected void AutoPrintErrorText()
         }
 
         _writer.Write(BuildErrorText(Settings.EnableColoring).ToString());
-        _writer.WriteLine();
     }
 
     private StringBuilder BuildHeaderText(bool showTitle, bool showDescription, bool showSectionName = false)

diff --git a/test/Oaksoft.ArgumentParser.Console/Program.cs b/test/Oaksoft.ArgumentParser.Console/Program.cs
@@ -77,7 +77,6 @@ private static void EvaluateOptions(IArgumentParser parser, CalculatorOptions op
         };
 
         Console.WriteLine($"Result: {equation}");
-        Console.WriteLine();
     }
 
     private static IArgumentParser<CalculatorOptions> ConfigureOptions(this IArgumentParserBuilder<CalculatorOptions> builder)