Improve WebSearch project code quality

Jack251970 · Jack251970 · commit 3de8005297fc · 2025-04-02T18:26:22.000+08:00
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Baidu.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Baidu.cs
@@ -4,8 +4,6 @@
 using System.Text.Json;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using Flow.Launcher.Infrastructure.Http;
-using Flow.Launcher.Infrastructure.Logger;
 using System.Net.Http;
 using System.Threading;
 
@@ -22,11 +20,11 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella
             try
             {
                 const string api = "http://suggestion.baidu.com/su?json=1&wd=";
-                result = await Http.GetAsync(api + Uri.EscapeDataString(query), token).ConfigureAwait(false);
+                result = await Main._context.API.HttpGetStringAsync(api + Uri.EscapeDataString(query), token).ConfigureAwait(false);
             }
             catch (Exception e) when (e is HttpRequestException or {InnerException: TimeoutException})
             {
-                Log.Exception("|Baidu.Suggestions|Can't get suggestion from baidu", e);
+                Main._context.API.LogException(nameof(Baidu), "Can't get suggestion from baidu", e);
                 return null;
             }
 
@@ -41,7 +39,7 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella
                 }
                 catch (JsonException e)
                 {
-                    Log.Exception("|Baidu.Suggestions|can't parse suggestions", e);
+                    Main._context.API.LogException(nameof(Baidu), "Can't parse suggestions", e);
                     return new List<string>();
                 }
 
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Bing.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Bing.cs
@@ -1,6 +1,4 @@
-﻿using Flow.Launcher.Infrastructure.Http;
-using Flow.Launcher.Infrastructure.Logger;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -10,16 +8,15 @@
 
 namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources
 {
-    class Bing : SuggestionSource
+    public class Bing : SuggestionSource
     {
         public override async Task<List<string>> SuggestionsAsync(string query, CancellationToken token)
         {
-
             try
             {
                 const string api = "https://api.bing.com/qsonhs.aspx?q=";
 
-                await using var resultStream = await Http.GetStreamAsync(api + Uri.EscapeDataString(query), token).ConfigureAwait(false);
+                await using var resultStream = await Main._context.API.HttpGetStreamAsync(api + Uri.EscapeDataString(query), token).ConfigureAwait(false);
 
                 using var json = (await JsonDocument.ParseAsync(resultStream, cancellationToken: token));
                 var root = json.RootElement.GetProperty("AS");
@@ -33,18 +30,15 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella
                         .EnumerateArray()
                         .Select(s => s.GetProperty("Txt").GetString()))
                     .ToList();
-
-
-
             }
             catch (Exception e) when (e is HttpRequestException or { InnerException: TimeoutException })
             {
-                Log.Exception("|Baidu.Suggestions|Can't get suggestion from baidu", e);
+                Main._context.API.LogException(nameof(Bing), "Can't get suggestion from baidu", e);
                 return null;
             }
             catch (JsonException e)
             {
-                Log.Exception("|Bing.Suggestions|can't parse suggestions", e);
+                Main._context.API.LogException(nameof(Bing), "Can't parse suggestions", e);
                 return new List<string>();
             }
         }
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/DuckDuckGo.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/DuckDuckGo.cs
@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Flow.Launcher.Infrastructure.Http;
-using Flow.Launcher.Infrastructure.Logger;
 using System.Net.Http;
 using System.Threading;
 using System.Text.Json;
@@ -25,7 +23,7 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella
             {
                 const string api = "https://duckduckgo.com/ac/?type=list&q=";
 
-                await using var resultStream = await Http.GetStreamAsync(api + Uri.EscapeDataString(query), token: token).ConfigureAwait(false);
+                await using var resultStream = await Main._context.API.HttpGetStreamAsync(api + Uri.EscapeDataString(query), token: token).ConfigureAwait(false);
 
                 using var json = await JsonDocument.ParseAsync(resultStream, cancellationToken: token);
 
@@ -36,12 +34,12 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella
             }
             catch (Exception e) when (e is HttpRequestException or {InnerException: TimeoutException})
             {
-                Log.Exception("|DuckDuckGo.Suggestions|Can't get suggestion from DuckDuckGo", e);
+                Main._context.API.LogException(nameof(DuckDuckGo), "Can't get suggestion from DuckDuckGo", e);
                 return null;
             }
             catch (JsonException e)
             {
-                Log.Exception("|DuckDuckGo.Suggestions|can't parse suggestions", e);
+                Main._context.API.LogException(nameof(DuckDuckGo), "Can't parse suggestions", e);
                 return new List<string>();
             }
         }
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Google.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SuggestionSources/Google.cs
@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Flow.Launcher.Infrastructure.Http;
-using Flow.Launcher.Infrastructure.Logger;
 using System.Net.Http;
 using System.Threading;
 using System.Text.Json;
@@ -18,7 +16,7 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella
             {
                 const string api = "https://www.google.com/complete/search?output=chrome&q=";
 
-                await using var resultStream = await Http.GetStreamAsync(api + Uri.EscapeDataString(query), token: token).ConfigureAwait(false);
+                await using var resultStream = await Main._context.API.HttpGetStreamAsync(api + Uri.EscapeDataString(query), token: token).ConfigureAwait(false);
 
                 using var json = await JsonDocument.ParseAsync(resultStream, cancellationToken: token);
 
@@ -29,12 +27,12 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella
             }
             catch (Exception e) when (e is HttpRequestException or {InnerException: TimeoutException})
             {
-                Log.Exception("|Baidu.Suggestions|Can't get suggestion from baidu", e);
+                Main._context.API.LogException(nameof(Google), "Can't get suggestion from baidu", e);
                 return null;
             }
             catch (JsonException e)
             {
-                Log.Exception("|Google.Suggestions|can't parse suggestions", e);
+                Main._context.API.LogException(nameof(Google), "Can't parse suggestions", e);
                 return new List<string>();
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@`
`4`	`4`	`using System.Text.Json;`
`5`	`5`	`using System.Text.RegularExpressions;`
`6`	`6`	`using System.Threading.Tasks;`
`7`		`-using Flow.Launcher.Infrastructure.Http;`
`8`		`-using Flow.Launcher.Infrastructure.Logger;`
`9`	`7`	`using System.Net.Http;`
`10`	`8`	`using System.Threading;`
`11`	`9`
`@@ -22,11 +20,11 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella`
`22`	`20`	`try`
`23`	`21`	`{`
`24`	`22`	`const string api = "http://suggestion.baidu.com/su?json=1&wd=";`
`25`		`- result = await Http.GetAsync(api + Uri.EscapeDataString(query), token).ConfigureAwait(false);`
	`23`	`+ result = await Main._context.API.HttpGetStringAsync(api + Uri.EscapeDataString(query), token).ConfigureAwait(false);`
`26`	`24`	`}`
`27`	`25`	`catch (Exception e) when (e is HttpRequestException or {InnerException: TimeoutException})`
`28`	`26`	`{`
`29`		`- Log.Exception("\|Baidu.Suggestions\|Can't get suggestion from baidu", e);`
	`27`	`+ Main._context.API.LogException(nameof(Baidu), "Can't get suggestion from baidu", e);`
`30`	`28`	`return null;`
`31`	`29`	`}`
`32`	`30`
`@@ -41,7 +39,7 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella`
`41`	`39`	`}`
`42`	`40`	`catch (JsonException e)`
`43`	`41`	`{`
`44`		`- Log.Exception("\|Baidu.Suggestions\|can't parse suggestions", e);`
	`42`	`+ Main._context.API.LogException(nameof(Baidu), "Can't parse suggestions", e);`
`45`	`43`	`return new List<string>();`
`46`	`44`	`}`
`47`	`45`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using Flow.Launcher.Infrastructure.Http;`
`2`		`-using Flow.Launcher.Infrastructure.Logger;`
`3`		`-using System;`
	`1`	`+using System;`
`4`	`2`	`using System.Collections.Generic;`
`5`	`3`	`using System.Net.Http;`
`6`	`4`	`using System.Threading.Tasks;`
`@@ -10,16 +8,15 @@`
`10`	`8`
`11`	`9`	`namespace Flow.Launcher.Plugin.WebSearch.SuggestionSources`
`12`	`10`	`{`
`13`		`- class Bing : SuggestionSource`
	`11`	`+ public class Bing : SuggestionSource`
`14`	`12`	`{`
`15`	`13`	`public override async Task<List<string>> SuggestionsAsync(string query, CancellationToken token)`
`16`	`14`	`{`
`17`		`-`
`18`	`15`	`try`
`19`	`16`	`{`
`20`	`17`	`const string api = "https://api.bing.com/qsonhs.aspx?q=";`
`21`	`18`
`22`		`- await using var resultStream = await Http.GetStreamAsync(api + Uri.EscapeDataString(query), token).ConfigureAwait(false);`
	`19`	`+ await using var resultStream = await Main._context.API.HttpGetStreamAsync(api + Uri.EscapeDataString(query), token).ConfigureAwait(false);`
`23`	`20`
`24`	`21`	`using var json = (await JsonDocument.ParseAsync(resultStream, cancellationToken: token));`
`25`	`22`	`var root = json.RootElement.GetProperty("AS");`
`@@ -33,18 +30,15 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella`
`33`	`30`	`.EnumerateArray()`
`34`	`31`	`.Select(s => s.GetProperty("Txt").GetString()))`
`35`	`32`	`.ToList();`
`36`		`-`
`37`		`-`
`38`		`-`
`39`	`33`	`}`
`40`	`34`	`catch (Exception e) when (e is HttpRequestException or { InnerException: TimeoutException })`
`41`	`35`	`{`
`42`		`- Log.Exception("\|Baidu.Suggestions\|Can't get suggestion from baidu", e);`
	`36`	`+ Main._context.API.LogException(nameof(Bing), "Can't get suggestion from baidu", e);`
`43`	`37`	`return null;`
`44`	`38`	`}`
`45`	`39`	`catch (JsonException e)`
`46`	`40`	`{`
`47`		`- Log.Exception("\|Bing.Suggestions\|can't parse suggestions", e);`
	`41`	`+ Main._context.API.LogException(nameof(Bing), "Can't parse suggestions", e);`
`48`	`42`	`return new List<string>();`
`49`	`43`	`}`
`50`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Threading.Tasks;`
`5`		`-using Flow.Launcher.Infrastructure.Http;`
`6`		`-using Flow.Launcher.Infrastructure.Logger;`
`7`	`5`	`using System.Net.Http;`
`8`	`6`	`using System.Threading;`
`9`	`7`	`using System.Text.Json;`
`@@ -25,7 +23,7 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella`
`25`	`23`	`{`
`26`	`24`	`const string api = "https://duckduckgo.com/ac/?type=list&q=";`
`27`	`25`
`28`		`- await using var resultStream = await Http.GetStreamAsync(api + Uri.EscapeDataString(query), token: token).ConfigureAwait(false);`
	`26`	`+ await using var resultStream = await Main._context.API.HttpGetStreamAsync(api + Uri.EscapeDataString(query), token: token).ConfigureAwait(false);`
`29`	`27`
`30`	`28`	`using var json = await JsonDocument.ParseAsync(resultStream, cancellationToken: token);`
`31`	`29`
`@@ -36,12 +34,12 @@ public override async Task<List<string>> SuggestionsAsync(string query, Cancella`
`36`	`34`	`}`
`37`	`35`	`catch (Exception e) when (e is HttpRequestException or {InnerException: TimeoutException})`
`38`	`36`	`{`
`39`		`- Log.Exception("\|DuckDuckGo.Suggestions\|Can't get suggestion from DuckDuckGo", e);`
	`37`	`+ Main._context.API.LogException(nameof(DuckDuckGo), "Can't get suggestion from DuckDuckGo", e);`
`40`	`38`	`return null;`
`41`	`39`	`}`
`42`	`40`	`catch (JsonException e)`
`43`	`41`	`{`
`44`		`- Log.Exception("\|DuckDuckGo.Suggestions\|can't parse suggestions", e);`
	`42`	`+ Main._context.API.LogException(nameof(DuckDuckGo), "Can't parse suggestions", e);`
`45`	`43`	`return new List<string>();`
`46`	`44`	`}`
`47`	`45`	`}`