From a4ca486a6c5a185a8cb2944d2f64b35dc9fe903e Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 29 Nov 2022 20:44:28 +1100 Subject: [PATCH] formatting --- .../Search/SearchManager.cs | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs index 2752e57b0..dcfa8977d 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs @@ -69,36 +69,35 @@ namespace Flow.Launcher.Plugin.Explorer.Search switch (isPathSearch) { case true - when (ActionKeywordMatch(query, Settings.ActionKeyword.PathSearchActionKeyword) - || ActionKeywordMatch(query, Settings.ActionKeyword.SearchActionKeyword)): + when ActionKeywordMatch(query, Settings.ActionKeyword.PathSearchActionKeyword) + || ActionKeywordMatch(query, Settings.ActionKeyword.SearchActionKeyword): + results.UnionWith(await PathSearchAsync(query, token).ConfigureAwait(false)); + return results.ToList(); - break; - case false when ActionKeywordMatch(query, Settings.ActionKeyword.FileContentSearchActionKeyword): - { - // A backdoor to prevent everything to do content search + + case false + when ActionKeywordMatch(query, Settings.ActionKeyword.FileContentSearchActionKeyword): + + // Intentionally require enabling of Everything's content search due to its slowness if (Settings.ContentIndexProvider is EverythingSearchManager && !Settings.EnableEverythingContentSearch) - { return EverythingContentSearchResult(query); - } + searchResults = Settings.ContentIndexProvider.ContentSearchAsync("", query.Search, token); + break; - } + case false: searchResults = Settings.IndexProvider.SearchAsync(query.Search, token); + break; } - if (searchResults == null) - { return results.ToList(); - } await foreach (var search in searchResults.WithCancellation(token).ConfigureAwait(false)) - { results.Add(ResultManager.CreateResult(query, search)); - } results.RemoveWhere(r => Settings.IndexSearchExcludedSubdirectoryPaths.Any( excludedPath => r.SubTitle.StartsWith(excludedPath.Path, StringComparison.OrdinalIgnoreCase)));