fixed filecount when filtering by line

Author: dragon7307

src/LineCount.cs

@@ -4,7 +4,6 @@
 using LineCount.Errors;
 using LineCount.Logging;
 using LineCount.Result;
-using System.Threading.Tasks;
 
 namespace LineCount;
 
@@ -38,7 +37,7 @@ static async Task<ReportResult> GetLineCount(string path, LineCountData data, Pa
 
             if(!attributes.HasFlag(FileAttributes.Directory))
             {
-                return await GetSingleFileLineCount(path, data, cancellationToken).ConfigureAwait(false);
+                return await GetSingleFileLineCountReport(path, data, cancellationToken).ConfigureAwait(false);
             }
 
             var filesReportResult = await CountInFiles(path, data, excludeFilePatterns, cancellationToken).ConfigureAwait(false);
@@ -211,6 +210,7 @@ static async Task<ReportResult> CountInFiles(string path, LineCountData data, Pa
         }
 
         int rootLineCount = 0;
+        int fileCount = 0; 
         int index = 0;
 
         await foreach (var result in Task.WhenEach(filetasks))
@@ -234,10 +234,16 @@ static async Task<ReportResult> CountInFiles(string path, LineCountData data, Pa
             }
 
             rootLineCount += lines;
+            
+            if(lines > 0)
+            {
+                fileCount++;
+            }
+            
             index++;
         }
 
-        return new LineCountReport(rootLineCount, index);
+        return new LineCountReport(rootLineCount, fileCount);
     }
 
     static IEnumerable<string> GetFilterFilePaths(string path, LineCountData data)
@@ -259,7 +265,7 @@ static Task<LineCountReport> GetSingleFileLineCountReport(string path, LineCount
             FilterType.FilteredExcept => GetFilteredFileLineCount(path, line => !data.ExcludeLineFilter!.IsMatch(line), cancellationToken),
             FilterType.FilteredBoth => GetFilteredFileLineCount(path, line => data.LineFilter!.IsMatch(line) && !data.ExcludeLineFilter!.IsMatch(line), cancellationToken),
             _ => throw new InvalidOperationException($"CountType.{data.FilterType} not recognized"),
-        }).ContinueWith(task => new LineCountReport(task.Result), cancellationToken, TaskContinuationOptions.NotOnCanceled, TaskScheduler.Current);
+        }).ContinueWith(task => LineCountReport.FromLines(task.Result), cancellationToken, TaskContinuationOptions.NotOnCanceled, TaskScheduler.Current);
     }
 
     static async Task<ReportResult> GetSingleFileLineCount(string path, LineCountData data, CancellationToken cancellationToken = default)

src/LineCountReport.cs

@@ -1,9 +1,14 @@
 namespace LineCount;
 
-public record LineCountReport(int Lines, int Files = 1)
+public record LineCountReport(int Lines, int Files)
 {
     public static LineCountReport operator +(LineCountReport left, LineCountReport right)
     {
         return new LineCountReport(left.Lines + right.Lines, left.Files + right.Files);
     }
+
+    public static LineCountReport FromLines(int lines)
+    {
+        return new LineCountReport(lines, lines > 0 ? 1 : 0);
+    }
 }