prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Handle Search Exception more carefully

Browse source
This commit is contained in:
Hongtao Zhang 2022-12-17 10:43:17 -06:00
parent 00c229d82c
commit 9da322f840
No known key found for this signature in database
GPG key ID: 75F655B91C7AC9BB
1 changed files with 51 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
View file

@ -62,46 +62,57 @@ namespace Flow.Launcher.Plugin.Explorer.Search
return new List<Result>();
}
IAsyncEnumerable<SearchResult> searchResults = null;
IAsyncEnumerable<SearchResult> searchResults;
bool isPathSearch = query.Search.IsLocationPathString();
bool isPathSearch = query.Search.IsLocationPathString() || query.Search.StartsWith("%");
string EngineName;
switch (isPathSearch)
{
case true
when ActionKeywordMatch(query, Settings.ActionKeyword.PathSearchActionKeyword)
|| ActionKeywordMatch(query, Settings.ActionKeyword.SearchActionKeyword):
|| ActionKeywordMatch(query, Settings.ActionKeyword.SearchActionKeyword):
results.UnionWith(await PathSearchAsync(query, token).ConfigureAwait(false));
return results.ToList();
case false
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);
EngineName = Enum.GetName(Settings.ContentSearchEngine);
break;
case false
when ActionKeywordMatch(query, Settings.ActionKeyword.IndexSearchActionKeyword)
|| ActionKeywordMatch(query, Settings.ActionKeyword.SearchActionKeyword):
|| ActionKeywordMatch(query, Settings.ActionKeyword.SearchActionKeyword):
searchResults = Settings.IndexProvider.SearchAsync(query.Search, token);
EngineName = Enum.GetName(Settings.IndexSearchEngine);
break;
default:
return results.ToList();
}
if (searchResults == null)
return results.ToList();
await foreach (var search in searchResults.WithCancellation(token).ConfigureAwait(false))
results.Add(ResultManager.CreateResult(query, search));
try
{
await foreach (var search in searchResults.WithCancellation(token).ConfigureAwait(false))
results.Add(ResultManager.CreateResult(query, search));
}
catch (Exception e)
{
if (e is OperationCanceledException)
return results.ToList();
throw new SearchException(EngineName, e.Message, e);
}
results.RemoveWhere(r => Settings.IndexSearchExcludedSubdirectoryPaths.Any(
excludedPath => r.SubTitle.StartsWith(excludedPath.Path, StringComparison.OrdinalIgnoreCase)));
@ -175,46 +186,47 @@ namespace Flow.Launcher.Plugin.Explorer.Search
var retrievedDirectoryPath = FilesFolders.ReturnPreviousDirectoryIfIncompleteString(locationPath);
results.Add(retrievedDirectoryPath.EndsWith(":\\")
results.Add(retrievedDirectoryPath.EndsWith(":\\")
? ResultManager.CreateDriveSpaceDisplayResult(retrievedDirectoryPath, query.ActionKeyword, useIndexSearch)
: ResultManager.CreateOpenCurrentFolderResult(retrievedDirectoryPath, query.ActionKeyword, useIndexSearch));
if (token.IsCancellationRequested)
return new List<Result>();
IEnumerable<SearchResult> directoryResult;
IAsyncEnumerable<SearchResult> directoryResult;
var recursiveIndicatorIndex = query.Search.IndexOf('>');
if (recursiveIndicatorIndex > 0 && Settings.PathEnumerationEngine != Settings.PathEnumerationEngineOption.DirectEnumeration)
{
directoryResult =
await Settings.PathEnumerator.EnumerateAsync(
query.Search[..recursiveIndicatorIndex],
query.Search[(recursiveIndicatorIndex + 1)..],
true,
token)
.ToListAsync(cancellationToken: token)
.ConfigureAwait(false);
Settings.PathEnumerator.EnumerateAsync(
query.Search[..recursiveIndicatorIndex],
query.Search[(recursiveIndicatorIndex + 1)..],
true,
token);
}
else
{
try
{
directoryResult = DirectoryInfoSearch.TopLevelDirectorySearch(query, query.Search, token);
}
catch (Exception e)
{
throw new SearchException("DirectoryInfoSearch", e.Message, e);
}
directoryResult = DirectoryInfoSearch.TopLevelDirectorySearch(query, query.Search, token).ToAsyncEnumerable();
}
if (token.IsCancellationRequested)
return new List<Result>();
try
{
await foreach (var directory in directoryResult.WithCancellation(token).ConfigureAwait(false))
{
results.Add(ResultManager.CreateResult(query, directory));
}
}
catch (Exception e)
{
throw new SearchException(Enum.GetName(Settings.PathEnumerationEngine), e.Message, e);
}
token.ThrowIfCancellationRequested();
results.UnionWith(directoryResult.Select(searchResult => ResultManager.CreateResult(query, searchResult)));
return results.ToList();
}
@ -227,7 +239,7 @@ namespace Flow.Launcher.Plugin.Explorer.Search
var pathToDirectory = FilesFolders.ReturnPreviousDirectoryIfIncompleteString(locationPath);
return !Settings.IndexSearchExcludedSubdirectoryPaths.Any(
x => FilesFolders.ReturnPreviousDirectoryIfIncompleteString(pathToDirectory).StartsWith(x.Path, StringComparison.OrdinalIgnoreCase))
x => FilesFolders.ReturnPreviousDirectoryIfIncompleteString(pathToDirectory).StartsWith(x.Path, StringComparison.OrdinalIgnoreCase))
&& WindowsIndex.WindowsIndex.PathIsIndexed(pathToDirectory);
}
}