Skip to content

Add ConfigureWait and cancellation token & remove unnecessary OperationCanceledException #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 18, 2021
Merged

Add ConfigureWait and cancellation token & remove unnecessary OperationCanceledException #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b138838
add ConfigureWait and cancellation token
jjw24 Mar 16, 2021
f4971e2
remove async and task run
jjw24 Mar 17, 2021
9479923
remove unnecessary catching OperationCanceledException
jjw24 Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/IndexSearch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ internal async static Task<List<Result>> ExecuteWindowsIndexSearchAsync(string i
}
}
}
catch (OperationCanceledException)
{
return new List<Result>(); // The source code indicates that without adding members, it won't allocate an array
}
catch (InvalidOperationException e)
{
// Internal error from ExecuteReader(): Connection closed.
Expand Down Expand Up @@ -95,12 +91,13 @@ internal async static Task<List<Result>> WindowsIndexSearchAsync(string searchSt
return new List<Result>();

var constructedQuery = constructQuery(searchString);
return await RemoveResultsInExclusionList(
await ExecuteWindowsIndexSearchAsync(constructedQuery, connectionString, query, token),
exclusionList);
return RemoveResultsInExclusionList(
await ExecuteWindowsIndexSearchAsync(constructedQuery, connectionString, query, token).ConfigureAwait(false),
exclusionList,
token);
}

private async static Task<List<Result>> RemoveResultsInExclusionList(List<Result> results, List<AccessLink> exclusionList)
private static List<Result> RemoveResultsInExclusionList(List<Result> results, List<AccessLink> exclusionList, CancellationToken token)
{
var indexExclusionListCount = exclusionList.Count;

Expand All @@ -109,25 +106,26 @@ private async static Task<List<Result>> RemoveResultsInExclusionList(List<Result

var filteredResults = new List<Result>();

await Task.Run(() =>
for (var index = 0; index < results.Count; index++)
{
for (var index = 0; index < results.Count; index++)
token.ThrowIfCancellationRequested();

var excludeResult = false;

for (var i = 0; i < indexExclusionListCount; i++)
{
var excludeResult = false;
token.ThrowIfCancellationRequested();

for (var i = 0; i < indexExclusionListCount; i++)
if (results[index].SubTitle.StartsWith(exclusionList[i].Path, StringComparison.OrdinalIgnoreCase))
{
if (results[index].SubTitle.StartsWith(exclusionList[i].Path, StringComparison.OrdinalIgnoreCase))
{
excludeResult = true;
break;
}
excludeResult = true;
break;
}

if (!excludeResult)
filteredResults.Add(results[index]);
}
});

if (!excludeResult)
filteredResults.Add(results[index]);
}

return filteredResults;
}
Expand Down
42 changes: 14 additions & 28 deletions Plugins/Flow.Launcher.Plugin.Program/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,35 +50,21 @@ public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
win32 = _win32s;
uwps = _uwps;

try
var result = await Task.Run(delegate
{
var result = await Task.Run(delegate
{
try
{
return win32.Cast<IProgram>()
.Concat(uwps)
.AsParallel()
.WithCancellation(token)
.Where(p => p.Enabled)
.Select(p => p.Result(query.Search, _context.API))
.Where(r => r?.Score > 0)
.ToList();
}
catch (OperationCanceledException)
{
return null;
}
}, token).ConfigureAwait(false);

token.ThrowIfCancellationRequested();

return result;
}
catch (OperationCanceledException)
{
return null;
}
return win32.Cast<IProgram>()
.Concat(uwps)
.AsParallel()
.WithCancellation(token)
.Where(p => p.Enabled)
.Select(p => p.Result(query.Search, _context.API))
.Where(r => r?.Score > 0)
.ToList();
}, token).ConfigureAwait(false);

token.ThrowIfCancellationRequested();

return result;
}

public async Task InitAsync(PluginInitContext context)
Expand Down
5 changes: 0 additions & 5 deletions Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Baidu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ public override async Task<List<string>> Suggestions(string query, CancellationT
Log.Exception("|Baidu.Suggestions|Can't get suggestion from baidu", e);
return null;
}
catch (OperationCanceledException)
{
return null;
}


if (string.IsNullOrEmpty(result)) return new List<string>();
Match match = _reg.Match(result);
Expand Down
4 changes: 0 additions & 4 deletions Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Bing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ public override async Task<List<string>> Suggestions(string query, CancellationT
Log.Exception("|Baidu.Suggestions|Can't get suggestion from baidu", e);
return null;
}
catch (OperationCanceledException)
{
return new List<string>();
}
catch (JsonException e)
{
Log.Exception("|Bing.Suggestions|can't parse suggestions", e);
Expand Down
4 changes: 0 additions & 4 deletions Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Google.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ public override async Task<List<string>> Suggestions(string query, CancellationT
Log.Exception("|Baidu.Suggestions|Can't get suggestion from baidu", e);
return null;
}
catch (OperationCanceledException)
{
return new List<string>();
}
catch (JsonException e)
{
Log.Exception("|Google.Suggestions|can't parse suggestions", e);
Expand Down