Fixup trailing slash issue with scan ignore patterns

configcat · Jul 24, 2024 · b1dd6b5 · b1dd6b5
1 parent 78df3d9
commit b1dd6b5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/ConfigCat.Cli.Services/FileSystem/Ignore/GlobalIgnorePolicy.cs b/src/ConfigCat.Cli.Services/FileSystem/Ignore/GlobalIgnorePolicy.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 
 namespace ConfigCat.Cli.Services.FileSystem.Ignore;
 
@@ -19,5 +20,5 @@ public GlobalIgnorePolicy(DirectoryInfo rootDirectory, params string[] patterns)
     public override bool IsIgnoring(FileInfo file) => base.IsIgnoringInternal(file.FullName.Replace(this.rootDirectory.FullName, string.Empty));
 
     public override bool Handles(FileInfo file) =>
-        file.DirectoryName.IndexOf(this.rootDirectory.FullName) != -1;
+        file.DirectoryName.AsSlash().Contains(this.rootDirectory.FullName.AsSlash().TrimEnd('/'));
 }
diff --git a/src/ConfigCat.Cli.Services/FileSystem/Ignore/IgnoreFile.cs b/src/ConfigCat.Cli.Services/FileSystem/Ignore/IgnoreFile.cs
@@ -29,7 +29,7 @@ public async Task LoadIgnoreFileAsync(CancellationToken token)
     public override bool IsIgnoring(FileInfo file) => base.IsIgnoringInternal(file.FullName.Replace(this.File.DirectoryName, string.Empty));
 
     public override bool Handles(FileInfo file) =>
-        file.DirectoryName.IndexOf(this.File.DirectoryName) != -1;
+        file.DirectoryName.AsSlash().Contains(this.File.DirectoryName.AsSlash().TrimEnd('/'));
 
     private void ProcessPatterns(string[] patterns)
     {

diff --git a/src/ConfigCat.Cli.Services/FileSystem/Ignore/IgnorePolicy.cs b/src/ConfigCat.Cli.Services/FileSystem/Ignore/IgnorePolicy.cs
@@ -5,8 +5,8 @@ namespace ConfigCat.Cli.Services.FileSystem.Ignore;
 
 internal abstract class IgnorePolicy
 {
-    protected readonly IgnoreRuleSet AcceptMatcher = new IgnoreRuleSet();
-    protected readonly IgnoreRuleSet IgnoreMatcher = new IgnoreRuleSet();
+    protected readonly IgnoreRuleSet AcceptMatcher = new();
+    protected readonly IgnoreRuleSet IgnoreMatcher = new();
 
     public abstract bool IsAccepting(FileInfo file);