refactored argument parsing

Author: dragon7307

src/Format.cs

@@ -0,0 +1,8 @@
+namespace LineCount;
+
+public enum Format
+{
+    Normal,
+    Raw,
+    Json
+}

src/LineCountData.cs

@@ -5,23 +5,22 @@ namespace LineCount;
 
 public class LineCountData
 {
-    public required string? Filter { get; init; }
-    public required Regex? LineFilter { get; init; }
-    public required string? ExcludeFilter { get; init; }
-    public required Regex? ExcludeLineFilter { get; init; }
+    public string? Filter { get; }
+    public Regex? LineFilter { get; }
+    public string? ExcludeFilter { get; }
+    public Regex? ExcludeLineFilter { get; }
 
     public FilterType FilterType { get; } = (FilterType)(-1);
     public required bool ListFiles { get; init; }
+    public required Format Format { get; init; }
 
     public static readonly TimeSpan TimeOut = TimeSpan.FromMilliseconds(500);
 
-    [SetsRequiredMembers]
-    public LineCountData(string? filter, string? lineFilter, string? filterNot, string? lineFilterNot, bool listFiles)
+    public LineCountData(string? filter, string? lineFilter, string? filterNot, string? lineFilterNot)
     {
         Filter = filter;
         ExcludeFilter = filterNot;
-        ListFiles = listFiles;
-
+        
         if (lineFilter is null)
         {
             FilterType = lineFilterNot is null ? FilterType.None : FilterType.FilteredExcept;
@@ -36,7 +35,5 @@ public LineCountData(string? filter, string? lineFilter, string? filterNot, stri
         {
             ExcludeLineFilter = new Regex(lineFilterNot, RegexOptions.Singleline | RegexOptions.Compiled, TimeOut);
         }
-
-        ListFiles = listFiles;
     }
 }

src/Program.cs

@@ -1,4 +1,5 @@
 using System.CommandLine;
+using System.CommandLine.Invocation;
 using LineCount;
 using LineCount.Logging;
 
@@ -9,6 +10,7 @@
 var exceptFilterOption = new Option<string>(["-x", "--exclude-filter"], "A glob-pattern for files not to include.");
 var exceptLineFilterOption = new Option<string>(["-w", "--exlude-line-filter"], "A RegEx for the lines not to count.");
 var listFilesOption = new Option<bool>("--list", "Whether to list the files as they are being processed.");
+var formatOption = new Option<Format>("--format", "The output format of the result.");
 var excludeDirectoriesOption = new Option<string[]>("--exclude-directories", "A list of directories to exclude.")
 {
     Arity = ArgumentArity.OneOrMore,
@@ -30,11 +32,27 @@
 rootCommand.AddOption(exceptFilterOption);
 rootCommand.AddOption(exceptLineFilterOption);
 rootCommand.AddOption(listFilesOption);
+rootCommand.AddOption(formatOption);
 
-rootCommand.SetHandler(async (path, filter, lineFilter, exceptFilter, exceptLineFilter, excludeDirectories, excludeFilesOption, listFiles) =>
-{   
-    LineCountData data = new LineCountData(filter, lineFilter, exceptFilter, exceptLineFilter, listFiles);    
-    var result = await LineCount.LineCount.Run(path, data, excludeDirectories, excludeFilesOption);
+rootCommand.SetHandler(async (InvocationContext context) =>
+{
+    var filter = context.ParseResult.GetValueForOption(filterOption);
+    var lineFilter = context.ParseResult.GetValueForOption(lineFilterOption);
+    var exceptFilter = context.ParseResult.GetValueForOption(exceptFilterOption);
+    var exceptLineFilter = context.ParseResult.GetValueForOption(exceptLineFilterOption);
+    var listFiles = context.ParseResult.GetValueForOption(listFilesOption);
+    var format = context.ParseResult.GetValueForOption(formatOption);
+    var excludeDirectories = context.ParseResult.GetValueForOption(excludeDirectoriesOption);
+    var excludeFiles = context.ParseResult.GetValueForOption(excludeFilesOption);
+    var path = context.ParseResult.GetValueForArgument(pathArgument);
+
+    LineCountData data = new LineCountData(filter, lineFilter, exceptFilter, exceptLineFilter)
+    {
+        ListFiles = listFiles,
+        Format = format
+    };
+    
+    var result = await LineCount.LineCount.Run(path, data, excludeDirectories ?? [], excludeFiles ?? []);
 
     if(listFiles)
     {
@@ -45,6 +63,6 @@
         report => Logger.LogReport(report),
         error => Logger.LogError(error)
         );
-}, pathArgument, filterOption, lineFilterOption, exceptFilterOption, exceptLineFilterOption, excludeDirectoriesOption, excludeFilesOption, listFilesOption);
+});
 
 return await rootCommand.InvokeAsync(args);