refined filtering

Author: dragon7307

src/Globbing.cs

@@ -0,0 +1,36 @@
+using SpanExtensions;
+
+namespace LineCount;
+
+public static class Globbing
+{
+    public static string ToRegex(string pattern)
+    {
+        if (!pattern.All(IsValidGlobPatternChar))
+        {
+            return pattern;
+        }
+
+        if (pattern.StartsWith('*') && pattern.EndsWith('*'))
+        {
+            return pattern[1..^1];
+        }
+
+        if (pattern.StartsWith('*'))
+        {
+            return $"{pattern[1..]}$";
+        }
+
+        if (pattern.EndsWith('*'))
+        {
+            return $"^{pattern[..^1]}";
+        }
+
+        return $"^{pattern}$";
+    }
+
+    static bool IsValidGlobPatternChar(char c)
+    {
+        return c == '*' || c == '_' || c == '-' || c == '.' || char.IsLetterOrDigit(c);
+    }
+}

src/LineCount.cs

@@ -1,9 +1,10 @@
-using System.Globalization;
-using System.Security;
-using System.Text.RegularExpressions;
-using LineCount.Errors;
+using LineCount.Errors;
 using LineCount.Logging;
 using LineCount.Result;
+using System.Globalization;
+using System.Linq;
+using System.Security;
+using System.Text.RegularExpressions;
 
 namespace LineCount;
 
@@ -27,7 +28,7 @@ public static class LineCount
         {
             return null;
         }
-     }
+    }
 
     static async Task<ReportResult> GetLineCount(string path, LineCountData data, PathPatterns excludeFilePatterns, PathPatterns excludeDirectoryPatterns, CancellationToken cancellationToken = default)
     {
@@ -245,12 +246,19 @@ static async Task<ReportResult> CountInFiles(string path, LineCountData data, Pa
 
     static IEnumerable<string> GetFilterFilePaths(string path, LineCountData data)
     {
-        if (data.Filter is null)
+        var files = Directory.EnumerateFiles(path);
+
+        if (data.Filter is not null)
         {
-            return Directory.EnumerateFiles(path).Select(Path.GetFullPath);
+            files = files.Where(line => data.Filter.IsMatch(Path.GetFileName(line)));
         }
-      
-        return Directory.EnumerateFiles(path, data.Filter).Select(Path.GetFullPath);
+
+        if (data.ExcludeFilter is not null)
+        {
+            files = files.Where(line => !data.ExcludeFilter.IsMatch(Path.GetFileName(line)));
+        }
+
+        return files.Select(Path.GetFullPath);
     }
 
     static Task<LineCountReport> GetSingleFileLineCountReport(string path, LineCountData data, CancellationToken cancellationToken = default)

src/LineCountData.cs

@@ -1,13 +1,14 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Security.Cryptography;
 using System.Text.RegularExpressions;
 
 namespace LineCount;
 
 public class LineCountData
 {
-    public string? Filter { get; }
+    public Regex? Filter { get; }
     public Regex? LineFilter { get; }
-    public string? ExcludeFilter { get; }
+    public Regex? ExcludeFilter { get; }
     public Regex? ExcludeLineFilter { get; }
 
     public FilterType FilterType { get; } = (FilterType)(-1);
@@ -17,17 +18,26 @@ public class LineCountData
 
     public LineCountData(string? filter, string? lineFilter, string? filterNot, string? lineFilterNot)
     {
-        Filter = filter;
-        ExcludeFilter = filterNot;
-        
+        if(filter is not null)
+        {
+            string filterPattern = Globbing.ToRegex(filter);
+            Filter = new Regex(filterPattern, RegexOptions.Singleline | RegexOptions.Compiled, TimeOut);
+        }
+
+        if (filterNot is not null)
+        {
+            string filterNotPattern = Globbing.ToRegex(filterNot);
+            ExcludeFilter = new Regex(filterNotPattern, RegexOptions.Singleline | RegexOptions.Compiled, TimeOut);
+        }
+
         if (lineFilter is null)
         {
             FilterType = lineFilterNot is null ? FilterType.None : FilterType.FilteredExcept;
         }
         else
         {
-            LineFilter = new Regex(lineFilter, RegexOptions.Singleline | RegexOptions.Compiled, TimeOut);
             FilterType = lineFilterNot is null ? FilterType.Filtered : FilterType.FilteredBoth;
+            LineFilter = new Regex(lineFilter, RegexOptions.Singleline | RegexOptions.Compiled, TimeOut);
         }
 
         if (lineFilterNot is not null)