From c939924ec8ec2e28e6eccf7422ac7bf9eb5f3e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=98=E9=9F=AC=20=E5=BC=A0?= <hongtao_zhang@outlook.com>
Date: Thu, 7 Jan 2021 21:54:09 +0800
Subject: [PATCH] optimize code in searchsuggestions

---
 .../SuggestionSources/Bing.cs                   | 16 +++++-----------
 .../SuggestionSources/Google.cs                 | 17 ++++++-----------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Bing.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Bing.cs
index e6b0438d1..81725c3f2 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Bing.cs
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Bing.cs
@@ -17,12 +17,15 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
     {
         public override async Task<List<string>> Suggestions(string query, CancellationToken token)
         {
-            Stream resultStream;
+            JsonElement json;
 
             try
             {
                 const string api = "https://api.bing.com/qsonhs.aspx?q=";
-                resultStream = await Http.GetStreamAsync(api + Uri.EscapeUriString(query), token).ConfigureAwait(false);
+                using var resultStream = await Http.GetStreamAsync(api + Uri.EscapeUriString(query), token).ConfigureAwait(false);
+                if (resultStream.Length == 0) return new List<string>(); // this handles the cancellation
+                json = (await JsonDocument.ParseAsync(resultStream, cancellationToken: token)).RootElement.GetProperty("AS");
+
             }
             catch (TaskCanceledException)
             {
@@ -33,15 +36,6 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
                 Log.Exception("|Bing.Suggestions|Can't get suggestion from Bing", e);
                 return new List<string>();
             }
-
-            if (resultStream.Length == 0) return new List<string>(); // this handles the cancellation
-
-            JsonElement json;
-            try
-            {
-                using (resultStream)
-                    json = (await JsonDocument.ParseAsync(resultStream)).RootElement.GetProperty("AS");
-            }
             catch (JsonException e)
             {
                 Log.Exception("|Bing.Suggestions|can't parse suggestions", e);
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Google.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Google.cs
index 5c784a702..b150d26c1 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Google.cs
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Google.cs
@@ -16,11 +16,15 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
     {
         public override async Task<List<string>> Suggestions(string query, CancellationToken token)
         {
-            Stream resultStream;
+            JsonDocument json;
+
             try
             {
                 const string api = "https://www.google.com/complete/search?output=chrome&q=";
-                resultStream = await Http.GetStreamAsync(api + Uri.EscapeUriString(query)).ConfigureAwait(false);
+                using var resultStream = await Http.GetStreamAsync(api + Uri.EscapeUriString(query)).ConfigureAwait(false);
+                if (resultStream.Length == 0) return new List<string>();
+                json = await JsonDocument.ParseAsync(resultStream);
+
             }
             catch (TaskCanceledException)
             {
@@ -31,15 +35,6 @@ namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
                 Log.Exception("|Google.Suggestions|Can't get suggestion from google", e);
                 return new List<string>();
             }
-
-
-            if (resultStream.Length == 0) return new List<string>();
-            JsonDocument json;
-            try
-            {
-                using (resultStream)
-                    json = await JsonDocument.ParseAsync(resultStream);
-            }
             catch (JsonException e)
             {
                 Log.Exception("|Google.Suggestions|can't parse suggestions", e);