From bfdf1dd67c35e609a3ac22b8e45bdbe7ba3ebbd2 Mon Sep 17 00:00:00 2001 From: TheBestPessimist Date: Mon, 3 Apr 2023 15:59:17 +0300 Subject: [PATCH 1/4] Better field name --- .../Search/SearchManager.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs index 51c4c3d9d..b8c80c999 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs @@ -196,23 +196,22 @@ namespace Flow.Launcher.Plugin.Explorer.Search if (token.IsCancellationRequested) return new List(); - IAsyncEnumerable directoryResult; + IAsyncEnumerable userSelectionResult; var recursiveIndicatorIndex = query.Search.IndexOf('>'); if (recursiveIndicatorIndex > 0 && Settings.PathEnumerationEngine != Settings.PathEnumerationEngineOption.DirectEnumeration) { - directoryResult = + userSelectionResult = Settings.PathEnumerator.EnumerateAsync( query.Search[..recursiveIndicatorIndex], query.Search[(recursiveIndicatorIndex + 1)..], true, token); - } else { - directoryResult = DirectoryInfoSearch.TopLevelDirectorySearch(query, query.Search, token).ToAsyncEnumerable(); + userSelectionResult = DirectoryInfoSearch.TopLevelDirectorySearch(query, query.Search, token).ToAsyncEnumerable(); } if (token.IsCancellationRequested) @@ -220,7 +219,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search try { - await foreach (var directory in directoryResult.WithCancellation(token).ConfigureAwait(false)) + await foreach (var directory in userSelectionResult.WithCancellation(token).ConfigureAwait(false)) { results.Add(ResultManager.CreateResult(query, directory)); } From 29a9def96966ef767977b2f376aa1f700a9b20c4 Mon Sep 17 00:00:00 2001 From: TheBestPessimist Date: Mon, 3 Apr 2023 16:00:08 +0300 Subject: [PATCH 2/4] In path search, ignore extra whitespace around the `>` character --- Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs index b8c80c999..1e5d6b5a3 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs @@ -204,7 +204,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search { userSelectionResult = Settings.PathEnumerator.EnumerateAsync( - query.Search[..recursiveIndicatorIndex], + query.Search[..recursiveIndicatorIndex].Trim(), query.Search[(recursiveIndicatorIndex + 1)..], true, token); From 8051a03481a74ca5649340d683766cee5c3f18ed Mon Sep 17 00:00:00 2001 From: TheBestPessimist Date: Mon, 3 Apr 2023 16:00:26 +0300 Subject: [PATCH 3/4] Cosmetic --- .../Search/Everything/EverythingSearchManager.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingSearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingSearchManager.cs index 1ea23777c..2bb9a73c2 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingSearchManager.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingSearchManager.cs @@ -94,8 +94,8 @@ namespace Flow.Launcher.Plugin.Explorer.Search.Everything var option = new EverythingSearchOption(plainSearch, Settings.SortOption, - true, - contentSearch, + IsContentSearch: true, + ContentSearchKeyword: contentSearch, IsFullPathSearch: Settings.EverythingSearchFullPath); await foreach (var result in EverythingApi.SearchAsync(option, token)) @@ -118,9 +118,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search.Everything IsFullPathSearch: Settings.EverythingSearchFullPath); await foreach (var result in EverythingApi.SearchAsync(option, token)) - { yield return result; - } } } } From 1699b17d4330216c8b6c1bf8a818e9ae45bf48c8 Mon Sep 17 00:00:00 2001 From: TheBestPessimist Date: Thu, 6 Apr 2023 08:48:31 +0300 Subject: [PATCH 4/4] Revert "Better field name" This reverts commit bfdf1dd67c35e609a3ac22b8e45bdbe7ba3ebbd2. --- .../Search/SearchManager.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs index 1e5d6b5a3..f58ac43e8 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs @@ -196,22 +196,23 @@ namespace Flow.Launcher.Plugin.Explorer.Search if (token.IsCancellationRequested) return new List(); - IAsyncEnumerable userSelectionResult; + IAsyncEnumerable directoryResult; var recursiveIndicatorIndex = query.Search.IndexOf('>'); if (recursiveIndicatorIndex > 0 && Settings.PathEnumerationEngine != Settings.PathEnumerationEngineOption.DirectEnumeration) { - userSelectionResult = + directoryResult = Settings.PathEnumerator.EnumerateAsync( query.Search[..recursiveIndicatorIndex].Trim(), query.Search[(recursiveIndicatorIndex + 1)..], true, token); + } else { - userSelectionResult = DirectoryInfoSearch.TopLevelDirectorySearch(query, query.Search, token).ToAsyncEnumerable(); + directoryResult = DirectoryInfoSearch.TopLevelDirectorySearch(query, query.Search, token).ToAsyncEnumerable(); } if (token.IsCancellationRequested) @@ -219,7 +220,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search try { - await foreach (var directory in userSelectionResult.WithCancellation(token).ConfigureAwait(false)) + await foreach (var directory in directoryResult.WithCancellation(token).ConfigureAwait(false)) { results.Add(ResultManager.CreateResult(query, directory)); }