Merge pull request #3412 from Jack251970/load_image_async

jjw24 · web-flow · commit 75f23aa87645 · 2025-04-08T17:53:48.000+10:00
New API Function LoadImageAsync
diff --git a/Flow.Launcher.Infrastructure/Image/ImageLoader.cs b/Flow.Launcher.Infrastructure/Image/ImageLoader.cs
@@ -284,7 +284,7 @@ public static bool TryGetValue(string path, bool loadFullImage, out ImageSource
             return ImageCache.TryGetValue(path, loadFullImage, out image);
         }
 
-        public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullImage = false)
+        public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullImage = false, bool cacheImage = true)
         {
             var imageResult = await LoadInternalAsync(path, loadFullImage);
 
@@ -300,16 +300,18 @@ public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullI
                         // image already exists
                         img = ImageCache[key, loadFullImage] ?? img;
                     }
-                    else
+                    else if (cacheImage)
                     {
-                        // new guid
-
+                        // save guid key
                         GuidToKey[hash] = path;
                     }
                 }
 
-                // update cache
-                ImageCache[path, loadFullImage] = img;
+                if (cacheImage)
+                {
+                    // update cache
+                    ImageCache[path, loadFullImage] = img;
+                }
             }
 
             return img;
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -8,6 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Media;
 
 namespace Flow.Launcher.Plugin
 {
@@ -346,6 +347,20 @@ public interface IPublicAPI
         public void StopLoadingBar();
 
         /// <summary>
+        /// Load image from path. Support local, remote and data:image url.
+        /// If image path is missing, it will return a missing icon.
+        /// </summary>
+        /// <param name="path">The path of the image.</param>
+        /// <param name="loadFullImage">
+        /// Load full image or not.
+        /// </param>
+        /// <param name="cacheImage">
+        /// Cache the image or not. Cached image will be stored in FL cache.
+        /// If the image is just used one time, it's better to set this to false.
+        /// </param>
+        /// <returns></returns>
+        ValueTask<ImageSource> LoadImageAsync(string path, bool loadFullImage = false, bool cacheImage = true);
+
         /// Update the plugin manifest
         /// </summary>
         /// <param name="usePrimaryUrlOnly">
diff --git a/Flow.Launcher/MessageBoxEx.xaml.cs b/Flow.Launcher/MessageBoxEx.xaml.cs
@@ -156,7 +156,7 @@ private static async Task SetImageOfMessageBoxAsync(MessageBoxImage icon)
         private async Task SetImageAsync(string imageName)
         {
             var imagePath = Path.Combine(Constant.ProgramDirectory, "Images", imageName);
-            var imageSource = await ImageLoader.LoadAsync(imagePath);
+            var imageSource = await App.API.LoadImageAsync(imagePath);
             Img.Source = imageSource;
         }
 
diff --git a/Flow.Launcher/Msg.xaml.cs b/Flow.Launcher/Msg.xaml.cs
@@ -43,7 +43,7 @@ public Msg()
 
         private async System.Threading.Tasks.Task LoadImageAsync()
         {
-            imgClose.Source = await ImageLoader.LoadAsync(Path.Combine(Infrastructure.Constant.ProgramDirectory, "Images\\close.png"));
+            imgClose.Source = await App.API.LoadImageAsync(Path.Combine(Constant.ProgramDirectory, "Images\\close.png"));
         }
 
         void imgClose_MouseUp(object sender, MouseButtonEventArgs e)
@@ -71,11 +71,11 @@ public async void Show(string title, string subTitle, string iconPath)
             
             if (!File.Exists(iconPath))
             {
-                imgIco.Source = await ImageLoader.LoadAsync(Path.Combine(Constant.ProgramDirectory, "Images\\app.png"));
+                imgIco.Source = await App.API.LoadImageAsync(Path.Combine(Constant.ProgramDirectory, "Images\\app.png"));
             }
             else 
             {
-                imgIco.Source = await ImageLoader.LoadAsync(iconPath);
+                imgIco.Source = await App.API.LoadImageAsync(iconPath);
             }
 
             Show();
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
@@ -10,6 +10,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Media;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Squirrel;
 using Flow.Launcher.Core;
@@ -355,6 +356,9 @@ public MessageBoxResult ShowMsgBox(string messageBoxText, string caption = "", M
 
         public Task ShowProgressBoxAsync(string caption, Func<Action<double>, Task> reportProgressAsync, Action cancelProgress = null) => ProgressBoxEx.ShowAsync(caption, reportProgressAsync, cancelProgress);
 
+        public ValueTask<ImageSource> LoadImageAsync(string path, bool loadFullImage = false, bool cacheImage = true) =>
+            ImageLoader.LoadAsync(path, loadFullImage, cacheImage);
+
         public Task<bool> UpdatePluginManifestAsync(bool usePrimaryUrlOnly = false, CancellationToken token = default) =>
             PluginsManifest.UpdateManifestAsync(usePrimaryUrlOnly, token);
 
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -1168,7 +1168,7 @@ private async Task QueryResultsAsync(bool searchDelay, bool isReQuery = false, b
             else if (plugins.Count == 1)
             {
                 PluginIconPath = plugins.Single().Metadata.IcoPath;
-                PluginIconSource = await ImageLoader.LoadAsync(PluginIconPath);
+                PluginIconSource = await App.API.LoadImageAsync(PluginIconPath);
                 SearchIconVisibility = Visibility.Hidden;
             }
             else
diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs
@@ -45,7 +45,7 @@ private static string PluginManagerActionKeyword
 
         private async Task LoadIconAsync()
         {
-            Image = await ImageLoader.LoadAsync(PluginPair.Metadata.IcoPath);
+            Image = await App.API.LoadImageAsync(PluginPair.Metadata.IcoPath);
             OnPropertyChanged(nameof(Image));
         }
 
diff --git a/Flow.Launcher/ViewModel/ResultViewModel.cs b/Flow.Launcher/ViewModel/ResultViewModel.cs
@@ -199,7 +199,7 @@ private async Task<ImageSource> LoadImageInternalAsync(string imagePath, Result.
                 }
             }
 
-            return await ImageLoader.LoadAsync(imagePath, loadFullImage).ConfigureAwait(false);
+            return await App.API.LoadImageAsync(imagePath, loadFullImage).ConfigureAwait(false);
         }
 
         private async Task LoadImageAsync()
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml.cs
@@ -7,7 +7,6 @@
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using Flow.Launcher.Infrastructure.Image;
 using Flow.Launcher.Plugin.Explorer.Search;
 
 namespace Flow.Launcher.Plugin.Explorer.Views;
@@ -89,7 +88,7 @@ public PreviewPanel(Settings settings, string filePath)
 
     private async Task LoadImageAsync()
     {
-        PreviewImage = await ImageLoader.LoadAsync(FilePath, true).ConfigureAwait(false);
+        PreviewImage = await Main.Context.API.LoadImageAsync(FilePath, true).ConfigureAwait(false);
     }
 
     public event PropertyChangedEventHandler? PropertyChanged;
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceViewModel.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceViewModel.cs
@@ -1,5 +1,4 @@
-﻿using Flow.Launcher.Infrastructure.Image;
-using System;
+﻿using System;
 using System.IO;
 using System.Threading.Tasks;
 #pragma warning disable IDE0005
@@ -41,8 +40,8 @@ public void CopyNewImageToUserDataDirectoryIfRequired(
 #if DEBUG
                     throw;
 #else
-                Main._context.API.ShowMsgBox(string.Format("Copying the selected image file to {0} has failed, changes will now be reverted", destinationFileNameFullPath));
-                UpdateIconAttributes(selectedSearchSource, fullPathToOriginalImage);
+                    Main._context.API.ShowMsgBox(string.Format("Copying the selected image file to {0} has failed, changes will now be reverted", destinationFileNameFullPath));
+                    UpdateIconAttributes(selectedSearchSource, fullPathToOriginalImage);
 #endif
                 }
             }
@@ -61,7 +60,7 @@ internal bool ShouldProvideHint(string fullPathToSelectedImage)
 
         internal async ValueTask<ImageSource> LoadPreviewIconAsync(string pathToPreviewIconImage)
         {
-            return await ImageLoader.LoadAsync(pathToPreviewIconImage);
+            return await Main._context.API.LoadImageAsync(pathToPreviewIconImage);
         }
     }
 }
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 Bing", 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 Google", 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
`@@ -284,7 +284,7 @@ public static bool TryGetValue(string path, bool loadFullImage, out ImageSource`
`284`	`284`	`return ImageCache.TryGetValue(path, loadFullImage, out image);`
`285`	`285`	`}`
`286`	`286`
`287`		`- public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullImage = false)`
	`287`	`+ public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullImage = false, bool cacheImage = true)`
`288`	`288`	`{`
`289`	`289`	`var imageResult = await LoadInternalAsync(path, loadFullImage);`
`290`	`290`
`@@ -300,16 +300,18 @@ public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullI`
`300`	`300`	`// image already exists`
`301`	`301`	`img = ImageCache[key, loadFullImage] ?? img;`
`302`	`302`	`}`
`303`		`- else`
	`303`	`+ else if (cacheImage)`
`304`	`304`	`{`
`305`		`- // new guid`
`306`		`-`
	`305`	`+ // save guid key`
`307`	`306`	`GuidToKey[hash] = path;`
`308`	`307`	`}`
`309`	`308`	`}`
`310`	`309`
`311`		`- // update cache`
`312`		`- ImageCache[path, loadFullImage] = img;`
	`310`	`+ if (cacheImage)`
	`311`	`+ {`
	`312`	`+ // update cache`
	`313`	`+ ImageCache[path, loadFullImage] = img;`
	`314`	`+ }`
`313`	`315`	`}`
`314`	`316`
`315`	`317`	`return img;`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ private static async Task SetImageOfMessageBoxAsync(MessageBoxImage icon)`
`156`	`156`	`private async Task SetImageAsync(string imageName)`
`157`	`157`	`{`
`158`	`158`	`var imagePath = Path.Combine(Constant.ProgramDirectory, "Images", imageName);`
`159`		`- var imageSource = await ImageLoader.LoadAsync(imagePath);`
	`159`	`+ var imageSource = await App.API.LoadImageAsync(imagePath);`
`160`	`160`	`Img.Source = imageSource;`
`161`	`161`	`}`
`162`	`162`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public Msg()`
`43`	`43`
`44`	`44`	`private async System.Threading.Tasks.Task LoadImageAsync()`
`45`	`45`	`{`
`46`		`- imgClose.Source = await ImageLoader.LoadAsync(Path.Combine(Infrastructure.Constant.ProgramDirectory, "Images\\close.png"));`
	`46`	`+ imgClose.Source = await App.API.LoadImageAsync(Path.Combine(Constant.ProgramDirectory, "Images\\close.png"));`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`void imgClose_MouseUp(object sender, MouseButtonEventArgs e)`
`@@ -71,11 +71,11 @@ public async void Show(string title, string subTitle, string iconPath)`
`71`	`71`
`72`	`72`	`if (!File.Exists(iconPath))`
`73`	`73`	`{`
`74`		`- imgIco.Source = await ImageLoader.LoadAsync(Path.Combine(Constant.ProgramDirectory, "Images\\app.png"));`
	`74`	`+ imgIco.Source = await App.API.LoadImageAsync(Path.Combine(Constant.ProgramDirectory, "Images\\app.png"));`
`75`	`75`	`}`
`76`	`76`	`else`
`77`	`77`	`{`
`78`		`- imgIco.Source = await ImageLoader.LoadAsync(iconPath);`
	`78`	`+ imgIco.Source = await App.API.LoadImageAsync(iconPath);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`Show();`
Original file line number	Diff line number	Diff line change
`@@ -1168,7 +1168,7 @@ private async Task QueryResultsAsync(bool searchDelay, bool isReQuery = false, b`
`1168`	`1168`	`else if (plugins.Count == 1)`
`1169`	`1169`	`{`
`1170`	`1170`	`PluginIconPath = plugins.Single().Metadata.IcoPath;`
`1171`		`- PluginIconSource = await ImageLoader.LoadAsync(PluginIconPath);`
	`1171`	`+ PluginIconSource = await App.API.LoadImageAsync(PluginIconPath);`
`1172`	`1172`	`SearchIconVisibility = Visibility.Hidden;`
`1173`	`1173`	`}`
`1174`	`1174`	`else`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ private static string PluginManagerActionKeyword`
`45`	`45`
`46`	`46`	`private async Task LoadIconAsync()`
`47`	`47`	`{`
`48`		`- Image = await ImageLoader.LoadAsync(PluginPair.Metadata.IcoPath);`
	`48`	`+ Image = await App.API.LoadImageAsync(PluginPair.Metadata.IcoPath);`
`49`	`49`	`OnPropertyChanged(nameof(Image));`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ private async Task<ImageSource> LoadImageInternalAsync(string imagePath, Result.`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`
`202`		`- return await ImageLoader.LoadAsync(imagePath, loadFullImage).ConfigureAwait(false);`
	`202`	`+ return await App.API.LoadImageAsync(imagePath, loadFullImage).ConfigureAwait(false);`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`private async Task LoadImageAsync()`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`using System.Windows.Controls;`
`8`	`8`	`using System.Windows.Media;`
`9`	`9`	`using System.Windows.Media.Imaging;`
`10`		`-using Flow.Launcher.Infrastructure.Image;`
`11`	`10`	`using Flow.Launcher.Plugin.Explorer.Search;`
`12`	`11`
`13`	`12`	`namespace Flow.Launcher.Plugin.Explorer.Views;`
`@@ -89,7 +88,7 @@ public PreviewPanel(Settings settings, string filePath)`
`89`	`88`
`90`	`89`	`private async Task LoadImageAsync()`
`91`	`90`	`{`
`92`		`- PreviewImage = await ImageLoader.LoadAsync(FilePath, true).ConfigureAwait(false);`
	`91`	`+ PreviewImage = await Main.Context.API.LoadImageAsync(FilePath, true).ConfigureAwait(false);`
`93`	`92`	`}`
`94`	`93`
`95`	`94`	`public event PropertyChangedEventHandler? PropertyChanged;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using Flow.Launcher.Infrastructure.Image;`
`2`		`-using System;`
	`1`	`+using System;`
`3`	`2`	`using System.IO;`
`4`	`3`	`using System.Threading.Tasks;`
`5`	`4`	`#pragma warning disable IDE0005`
`@@ -41,8 +40,8 @@ public void CopyNewImageToUserDataDirectoryIfRequired(`
`41`	`40`	`#if DEBUG`
`42`	`41`	`throw;`
`43`	`42`	`#else`
`44`		`- Main._context.API.ShowMsgBox(string.Format("Copying the selected image file to {0} has failed, changes will now be reverted", destinationFileNameFullPath));`
`45`		`- UpdateIconAttributes(selectedSearchSource, fullPathToOriginalImage);`
	`43`	`+ Main._context.API.ShowMsgBox(string.Format("Copying the selected image file to {0} has failed, changes will now be reverted", destinationFileNameFullPath));`
	`44`	`+ UpdateIconAttributes(selectedSearchSource, fullPathToOriginalImage);`
`46`	`45`	`#endif`
`47`	`46`	`}`
`48`	`47`	`}`
`@@ -61,7 +60,7 @@ internal bool ShouldProvideHint(string fullPathToSelectedImage)`
`61`	`60`
`62`	`61`	`internal async ValueTask<ImageSource> LoadPreviewIconAsync(string pathToPreviewIconImage)`
`63`	`62`	`{`
`64`		`- return await ImageLoader.LoadAsync(pathToPreviewIconImage);`
	`63`	`+ return await Main._context.API.LoadImageAsync(pathToPreviewIconImage);`
`65`	`64`	`}`
`66`	`65`	`}`
`67`	`66`	`}`
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 Bing", 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`	`}`