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

Change TaskCanceledException in WebSearch plugin to operationCanceledException

Browse source
This commit is contained in:
弘韬 张 2021-02-23 09:53:17 +08:00
parent e2fa9683b9
commit b07b1ddb31
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Plugins/Flow.Launcher.Plugin.WebSearch/Main.cs
View file

@ -125,8 +125,7 @@ namespace Flow.Launcher.Plugin.WebSearch
{ {
var suggestions = await source.Suggestions(keyword, token).ConfigureAwait(false); var suggestions = await source.Suggestions(keyword, token).ConfigureAwait(false);
if (token.IsCancellationRequested) token.ThrowIfCancellationRequested();
return null;
var resultsFromSuggestion = suggestions?.Select(o => new Result var resultsFromSuggestion = suggestions?.Select(o => new Result
{ {

2
Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Baidu.cs
View file

@ -25,7 +25,7 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
const string api = "http://suggestion.baidu.com/su?json=1&wd="; const string api = "http://suggestion.baidu.com/su?json=1&wd=";
result = await Http.GetAsync(api + Uri.EscapeUriString(query), token).ConfigureAwait(false); result = await Http.GetAsync(api + Uri.EscapeUriString(query), token).ConfigureAwait(false);
} }
catch (TaskCanceledException) catch (OperationCanceledException)
{ {
return null; return null;
} }

2
Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Bing.cs
View file

@ -28,7 +28,7 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
json = (await JsonDocument.ParseAsync(resultStream, cancellationToken: token)).RootElement.GetProperty("AS"); json = (await JsonDocument.ParseAsync(resultStream, cancellationToken: token)).RootElement.GetProperty("AS");
} }
catch (TaskCanceledException) catch (OperationCanceledException)
{ {
return new List<string>(); return new List<string>();
} }

4
Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Google.cs
View file

@ -24,10 +24,10 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
using var resultStream = await Http.GetStreamAsync(api + Uri.EscapeUriString(query)).ConfigureAwait(false); using var resultStream = await Http.GetStreamAsync(api + Uri.EscapeUriString(query)).ConfigureAwait(false);
json = await JsonDocument.ParseAsync(resultStream); json = await JsonDocument.ParseAsync(resultStream, cancellationToken: token);
} }
catch (TaskCanceledException) catch (OperationCanceledException)
{ {
return new List<string>(); return new List<string>();
} }