Merge pull request #1848 from TheBestPessimist/#1800_Everything_search_full_path

Everything Search: Match Path

Author: taooceros

Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingAPI.cs

@@ -13,13 +13,12 @@
 
 namespace Flow.Launcher.Plugin.Explorer.Search.Everything
 {
-
     public static class EverythingApi
     {
-
         private const int BufferSize = 4096;
 
         private static SemaphoreSlim _semaphore = new(1, 1);
+
         // cached buffer to remove redundant allocations.
         private static readonly StringBuilder buffer = new(BufferSize);
 
@@ -35,46 +34,6 @@ public enum StateCode
             InvalidCallError
         }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether [match path].
-        /// </summary>
-        /// <value><c>true</c> if [match path]; otherwise, <c>false</c>.</value>
-        public static bool MatchPath
-        {
-            get => EverythingApiDllImport.Everything_GetMatchPath();
-            set => EverythingApiDllImport.Everything_SetMatchPath(value);
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [match case].
-        /// </summary>
-        /// <value><c>true</c> if [match case]; otherwise, <c>false</c>.</value>
-        public static bool MatchCase
-        {
-            get => EverythingApiDllImport.Everything_GetMatchCase();
-            set => EverythingApiDllImport.Everything_SetMatchCase(value);
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [match whole word].
-        /// </summary>
-        /// <value><c>true</c> if [match whole word]; otherwise, <c>false</c>.</value>
-        public static bool MatchWholeWord
-        {
-            get => EverythingApiDllImport.Everything_GetMatchWholeWord();
-            set => EverythingApiDllImport.Everything_SetMatchWholeWord(value);
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [enable regex].
-        /// </summary>
-        /// <value><c>true</c> if [enable regex]; otherwise, <c>false</c>.</value>
-        public static bool EnableRegex
-        {
-            get => EverythingApiDllImport.Everything_GetRegex();
-            set => EverythingApiDllImport.Everything_SetRegex(value);
-        }
-
         /// <summary>
         /// Checks whether the sort option is Fast Sort.
         /// </summary>
@@ -95,7 +54,7 @@ public static async ValueTask<bool> IsEverythingRunningAsync(CancellationToken t
 
             try
             {
-                EverythingApiDllImport.Everything_GetMajorVersion(); 
+                EverythingApiDllImport.Everything_GetMajorVersion();
                 var result = EverythingApiDllImport.Everything_GetLastError() != StateCode.IPCError;
                 return result;
             }
@@ -122,7 +81,7 @@ public static async IAsyncEnumerable<SearchResult> SearchAsync(EverythingSearchO
 
             await _semaphore.WaitAsync(token);
 
-            
+
             try
             {
                 if (token.IsCancellationRequested)
@@ -152,6 +111,7 @@ public static async IAsyncEnumerable<SearchResult> SearchAsync(EverythingSearchO
                 EverythingApiDllImport.Everything_SetMax(option.MaxCount);
 
                 EverythingApiDllImport.Everything_SetSort(option.SortOption);
+                EverythingApiDllImport.Everything_SetMatchPath(option.IsFullPathSearch);
 
                 if (token.IsCancellationRequested) yield break;
 

Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingSearchOption.cs

@@ -3,12 +3,15 @@
 
 namespace Flow.Launcher.Plugin.Explorer.Search.Everything
 {
-    public record struct EverythingSearchOption(string Keyword, 
+    public record struct EverythingSearchOption(
+        string Keyword,
         SortOption SortOption,
-        bool IsContentSearch = false, 
+        bool IsContentSearch = false,
         string ContentSearchKeyword = default,
         string ParentPath = default,
         bool IsRecursive = true,
-        int Offset = 0, 
-        int MaxCount = 100);
+        int Offset = 0,
+        int MaxCount = 100,
+        bool IsFullPathSearch = true
+    );
 }