Merge pull request #2332 from VictoriousRaptor/fix-exclude-path-check

Fix exclude path check for index search

Author: VictoriousRaptor

Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs

@@ -263,7 +263,7 @@ public static string ReturnPreviousDirectoryIfIncompleteString(string path)
         }
 
         /// <summary>
-        /// Returns if <paramref name="parentPath"/> contains <paramref name="subPath"/>.
+        /// Returns if <paramref name="parentPath"/> contains <paramref name="subPath"/>. Equal paths are not considered to be contained by default.
         /// From https://stackoverflow.com/a/66877016
         /// </summary>
         /// <param name="parentPath">Parent path</param>

Flow.Launcher.Test/FilesFoldersTest.cs

@@ -1,4 +1,4 @@
-using Flow.Launcher.Plugin.SharedCommands;
+using Flow.Launcher.Plugin.SharedCommands;
 using NUnit.Framework;
 
 namespace Flow.Launcher.Test
@@ -33,21 +33,21 @@ public class FilesFoldersTest
         [TestCase(@"c:\foo", @"c:\foo\..\bar\baz", false)]
         [TestCase(@"c:\bar", @"c:\foo\..\bar\baz", true)]
         [TestCase(@"c:\barr", @"c:\foo\..\bar\baz", false)]
-        // Equality
-        [TestCase(@"c:\foo", @"c:\foo", false)]
-        [TestCase(@"c:\foo\", @"c:\foo", false)]
-        [TestCase(@"c:\foo", @"c:\foo\", false)]
         public void GivenTwoPaths_WhenCheckPathContains_ThenShouldBeExpectedResult(string parentPath, string path, bool expectedResult)
         {
             Assert.AreEqual(expectedResult, FilesFolders.PathContains(parentPath, path));
         }
 
+        // Equality
+        [TestCase(@"c:\foo", @"c:\foo", false)]
+        [TestCase(@"c:\foo\", @"c:\foo", false)]
+        [TestCase(@"c:\foo", @"c:\foo\", false)]
         [TestCase(@"c:\foo", @"c:\foo", true)]
         [TestCase(@"c:\foo\", @"c:\foo", true)]
         [TestCase(@"c:\foo", @"c:\foo\", true)]
-        public void GivenTwoPathsAreTheSame_WhenCheckPathContains_ThenShouldBeTrue(string parentPath, string path, bool expectedResult)
+        public void GivenTwoPathsAreTheSame_WhenCheckPathContains_ThenShouldBeExpectedResult(string parentPath, string path, bool expectedResult)
         {
-            Assert.AreEqual(expectedResult, FilesFolders.PathContains(parentPath, path, true));
+            Assert.AreEqual(expectedResult, FilesFolders.PathContains(parentPath, path, allowEqual: expectedResult));
         }
     }
 }

Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs

@@ -123,7 +123,7 @@ when ActionKeywordMatch(query, Settings.ActionKeyword.IndexSearchActionKeyword)
             }
 
             results.RemoveWhere(r => Settings.IndexSearchExcludedSubdirectoryPaths.Any(
-                excludedPath => FilesFolders.PathContains(excludedPath.Path, r.SubTitle)));
+                excludedPath => FilesFolders.PathContains(excludedPath.Path, r.SubTitle, allowEqual: true)));
 
             return results.ToList();
         }