From 37058f765185341a08007d4c713d944e25303b79 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 4 Jan 2025 21:55:44 +0800
Subject: [PATCH 01/28] Improve code quality.

---
 .../Flow.Launcher.Plugin.PluginsManager/Main.cs    |  2 +-
 .../PluginsManager.cs                              | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs
index bec84f48410..156135f813d 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs
@@ -51,7 +51,7 @@ public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
             return query.FirstSearch.ToLower() switch
             {
                 //search could be url, no need ToLower() when passed in
-                Settings.InstallCommand => await pluginManager.RequestInstallOrUpdate(query.SecondToEndSearch, token, query.IsReQuery),
+                Settings.InstallCommand => await pluginManager.RequestInstallOrUpdateAsync(query.SecondToEndSearch, token, query.IsReQuery),
                 Settings.UninstallCommand => pluginManager.RequestUninstall(query.SecondToEndSearch),
                 Settings.UpdateCommand => await pluginManager.RequestUpdateAsync(query.SecondToEndSearch, token, query.IsReQuery),
                 _ => pluginManager.GetDefaultHotKeys().Where(hotkey =>
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index 305d248d3e8..b1b1a75021f 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -324,7 +324,7 @@ await Http.DownloadAsync(x.PluginNewUserPlugin.UrlDownload, downloadToFilePath)
                                     string.Format(
                                         Context.API.GetTranslation("plugin_pluginsmanager_install_error_subtitle"),
                                         x.Name));
-                            }, TaskContinuationOptions.OnlyOnFaulted);
+                            }, token, TaskContinuationOptions.OnlyOnFaulted, TaskScheduler.Default);
 
                             return true;
                         },
@@ -337,7 +337,7 @@ await Http.DownloadAsync(x.PluginNewUserPlugin.UrlDownload, downloadToFilePath)
                     });
 
             // Update all result
-            if (resultsForUpdate.Count() > 1)
+            if (resultsForUpdate.Count > 1)
             {
                 var updateAllResult = new Result
                 {
@@ -351,13 +351,13 @@ await Http.DownloadAsync(x.PluginNewUserPlugin.UrlDownload, downloadToFilePath)
                         {
                             message = string.Format(
                                 Context.API.GetTranslation("plugin_pluginsmanager_update_all_prompt"),
-                                resultsForUpdate.Count(), Environment.NewLine);
+                                resultsForUpdate.Count, Environment.NewLine);
                         }
                         else
                         {
                             message = string.Format(
                                 Context.API.GetTranslation("plugin_pluginsmanager_update_all_prompt_no_restart"),
-                                resultsForUpdate.Count());
+                                resultsForUpdate.Count);
                         }
 
                         if (Context.API.ShowMsgBox(message,
@@ -401,7 +401,7 @@ await Http.DownloadAsync(plugin.PluginNewUserPlugin.UrlDownload, downloadToFileP
                             Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_update_title"),
                                 string.Format(
                                     Context.API.GetTranslation("plugin_pluginsmanager_update_all_success_restart"),
-                                    resultsForUpdate.Count()));
+                                    resultsForUpdate.Count));
                             Context.API.RestartApp();
                         }
                         else
@@ -409,7 +409,7 @@ await Http.DownloadAsync(plugin.PluginNewUserPlugin.UrlDownload, downloadToFileP
                             Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_update_title"),
                                 string.Format(
                                     Context.API.GetTranslation("plugin_pluginsmanager_update_all_success_no_restart"),
-                                    resultsForUpdate.Count()));
+                                    resultsForUpdate.Count));
                         }
 
                         return true;
@@ -545,7 +545,7 @@ private bool InstallSourceKnown(string url)
                    Context.API.GetAllPlugins().Any(x => x.Metadata.Website.StartsWith(constructedUrlPart));
         }
 
-        internal async ValueTask<List<Result>> RequestInstallOrUpdate(string search, CancellationToken token,
+        internal async ValueTask<List<Result>> RequestInstallOrUpdateAsync(string search, CancellationToken token,
             bool usePrimaryUrlOnly = false)
         {
             await PluginsManifest.UpdateManifestAsync(token, usePrimaryUrlOnly);

From 562b233c157f2d11bc00f744f2772223037c4eb4 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 4 Jan 2025 23:11:13 +0800
Subject: [PATCH 02/28] Add progress box support for downloading plugin

---
 Flow.Launcher.Core/ProgressBoxEx.xaml         | 106 ++++++++++++++++++
 Flow.Launcher.Core/ProgressBoxEx.xaml.cs      |  76 +++++++++++++
 .../PluginsManager.cs                         |  59 +++++++++-
 3 files changed, 239 insertions(+), 2 deletions(-)
 create mode 100644 Flow.Launcher.Core/ProgressBoxEx.xaml
 create mode 100644 Flow.Launcher.Core/ProgressBoxEx.xaml.cs

diff --git a/Flow.Launcher.Core/ProgressBoxEx.xaml b/Flow.Launcher.Core/ProgressBoxEx.xaml
new file mode 100644
index 00000000000..4cce822217e
--- /dev/null
+++ b/Flow.Launcher.Core/ProgressBoxEx.xaml
@@ -0,0 +1,106 @@
+<Window
+    x:Class="Flow.Launcher.Core.ProgressBoxEx"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:Flow.Launcher.Core"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:Name="MessageBoxWindow"
+    Width="420"
+    Height="Auto"
+    Background="{DynamicResource PopuBGColor}"
+    Foreground="{DynamicResource PopupTextColor}"
+    ResizeMode="NoResize"
+    SizeToContent="Height"
+    WindowStartupLocation="CenterScreen"
+    mc:Ignorable="d">
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
+    </WindowChrome.WindowChrome>
+    <Window.InputBindings>
+        <KeyBinding Key="Escape" Command="Close" />
+    </Window.InputBindings>
+    <Window.CommandBindings>
+        <CommandBinding Command="Close" Executed="KeyEsc_OnPress" />
+    </Window.CommandBindings>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+            <RowDefinition MinHeight="68" />
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0">
+            <StackPanel>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Button
+                        Grid.Column="1"
+                        Click="Button_Cancel"
+                        Style="{StaticResource TitleBarCloseButtonStyle}">
+                        <Path
+                            Width="46"
+                            Height="32"
+                            Data="M 18,11 27,20 M 18,20 27,11"
+                            Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
+                            StrokeThickness="1">
+                            <Path.Style>
+                                <Style TargetType="Path">
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
+                                            <Setter Property="Opacity" Value="0.5" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Path.Style>
+                        </Path>
+                    </Button>
+                </Grid>
+            </StackPanel>
+        </StackPanel>
+        <Grid Grid.Row="1" Margin="30 0 30 24">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <TextBlock
+                x:Name="TitleTextBlock"
+                Grid.Row="0"
+                MaxWidth="400"
+                Margin="0 0 26 12"
+                VerticalAlignment="Center"
+                FontFamily="Segoe UI"
+                FontSize="20"
+                FontWeight="SemiBold"
+                TextAlignment="Left"
+                TextWrapping="Wrap" />
+            <ProgressBar
+                x:Name="ProgressBar"
+                Grid.Row="1"
+                Margin="0 0 26 0"
+                Maximum="100"
+                Minimum="0"
+                Value="0" />
+        </Grid>
+        <Border
+            Grid.Row="2"
+            Margin="0 0 0 0"
+            Background="{DynamicResource PopupButtonAreaBGColor}"
+            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
+            BorderThickness="0 1 0 0">
+            <WrapPanel
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
+                <Button
+                    x:Name="btnCancel"
+                    MinWidth="120"
+                    Margin="5 0 5 0"
+                    Click="Button_Click"
+                    Content="{DynamicResource commonCancel}" />
+            </WrapPanel>
+        </Border>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/Flow.Launcher.Core/ProgressBoxEx.xaml.cs b/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
new file mode 100644
index 00000000000..61ba397de4b
--- /dev/null
+++ b/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Windows;
+using System.Windows.Input;
+using Flow.Launcher.Infrastructure.Logger;
+
+namespace Flow.Launcher.Core
+{
+    public partial class ProgressBoxEx : Window
+    {
+        private ProgressBoxEx()
+        {
+            InitializeComponent();
+        }
+
+        public static ProgressBoxEx Show(string caption)
+        {
+            if (!Application.Current.Dispatcher.CheckAccess())
+            {
+                return Application.Current.Dispatcher.Invoke(() => Show(caption));
+            }
+
+            try
+            {
+                var prgBox = new ProgressBoxEx
+                {
+                    Title = caption
+                };
+                prgBox.TitleTextBlock.Text = caption;
+                prgBox.Show();
+                return prgBox;
+            }
+            catch (Exception e)
+            {
+                Log.Error($"|ProgressBoxEx.Show|An error occurred: {e.Message}");
+                return null;
+            }
+        }
+
+        public void ReportProgress(double progress)
+        {
+            if (!Application.Current.Dispatcher.CheckAccess())
+            {
+                Application.Current.Dispatcher.Invoke(() => ReportProgress(progress));
+                return;
+            }
+
+            if (progress < 0)
+            {
+                ProgressBar.Value = 0;
+            }
+            else if (progress >= 100)
+            {
+                ProgressBar.Value = 100;
+            }
+            else
+            {
+                ProgressBar.Value = progress;
+            }
+        }
+
+        private void KeyEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
+        {
+            Close();
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
+        private void Button_Cancel(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+    }
+}
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index b1b1a75021f..39390ae101f 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -1,4 +1,5 @@
-using Flow.Launcher.Core.ExternalPlugins;
+using Flow.Launcher.Core;
+using Flow.Launcher.Core.ExternalPlugins;
 using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Http;
@@ -142,6 +143,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
 
             var filePath = Path.Combine(Path.GetTempPath(), downloadFilename);
 
+            ProgressBoxEx prgBox = null;
             try
             {
                 if (!plugin.IsFromLocalInstallPath)
@@ -149,7 +151,42 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                     if (File.Exists(filePath))
                         File.Delete(filePath);
 
-                    await Http.DownloadAsync(plugin.UrlDownload, filePath).ConfigureAwait(false);
+                    using var httpClient = new HttpClient();
+                    using var response = await httpClient.GetAsync(plugin.UrlDownload, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false);
+
+                    response.EnsureSuccessStatusCode();
+
+                    var totalBytes = response.Content.Headers.ContentLength ?? -1L;
+                    var canReportProgress = totalBytes != -1;
+
+                    if (canReportProgress && (prgBox = ProgressBoxEx.Show("Download plugin...")) != null)
+                    {
+                        await using var contentStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+                        await using var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true);
+
+                        var buffer = new byte[8192];
+                        long totalRead = 0;
+                        int read;
+
+                        while ((read = await contentStream.ReadAsync(buffer).ConfigureAwait(false)) > 0)
+                        {
+                            await fileStream.WriteAsync(buffer.AsMemory(0, read)).ConfigureAwait(false);
+                            totalRead += read;
+
+                            var progressValue = totalRead * 100 / totalBytes;
+                            prgBox.ReportProgress(progressValue);
+                        }
+
+                        Application.Current.Dispatcher.Invoke(() =>
+                        {
+                            prgBox.Close();
+                            prgBox = null;
+                        });
+                    }
+                    else
+                    {
+                        await Http.DownloadAsync(plugin.UrlDownload, filePath).ConfigureAwait(false);
+                    }
                 }
                 else
                 {
@@ -164,6 +201,15 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                     string.Format(Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"), plugin.Name),
                     Context.API.GetTranslation("plugin_pluginsmanager_download_error"));
                 Log.Exception("PluginsManager", "An error occurred while downloading plugin", e);
+                // force close progress box
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    if (prgBox != null)
+                    {
+                        prgBox.Close();
+                        prgBox = null;
+                    }
+                });
                 return;
             }
             catch (Exception e)
@@ -172,6 +218,15 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                     string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_error_subtitle"),
                         plugin.Name));
                 Log.Exception("PluginsManager", "An error occurred while downloading plugin", e);
+                // force close progress box
+                Application.Current.Dispatcher.Invoke(() =>
+                {
+                    if (prgBox != null)
+                    {
+                        prgBox.Close();
+                        prgBox = null;
+                    }
+                });
                 return;
             }
 

From 54f02e04e6d67d46152e2480d553ec7628ed9980 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 5 Jan 2025 00:08:56 +0800
Subject: [PATCH 03/28] Use public api for ProgressBoxEx & Add support for
 force close event

---
 Flow.Launcher.Core/ProgressBoxEx.xaml.cs      | 45 +++++++++++++++----
 Flow.Launcher.Plugin/IProgressBoxEx.cs        | 20 +++++++++
 Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs | 11 ++++-
 Flow.Launcher/PublicAPIInstance.cs            |  2 +
 .../PluginsManager.cs                         |  7 ++-
 5 files changed, 72 insertions(+), 13 deletions(-)
 create mode 100644 Flow.Launcher.Plugin/IProgressBoxEx.cs

diff --git a/Flow.Launcher.Core/ProgressBoxEx.xaml.cs b/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
index 61ba397de4b..b6801d2c1f0 100644
--- a/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
+++ b/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
@@ -2,26 +2,31 @@
 using System.Windows;
 using System.Windows.Input;
 using Flow.Launcher.Infrastructure.Logger;
+using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.Core
 {
-    public partial class ProgressBoxEx : Window
+    public partial class ProgressBoxEx : Window, IProgressBoxEx
     {
-        private ProgressBoxEx()
+        private readonly Action _forceClosed;
+        private bool _isClosed;
+
+        private ProgressBoxEx(Action forceClosed)
         {
+            _forceClosed = forceClosed;
             InitializeComponent();
         }
 
-        public static ProgressBoxEx Show(string caption)
+        public static IProgressBoxEx Show(string caption, Action forceClosed)
         {
             if (!Application.Current.Dispatcher.CheckAccess())
             {
-                return Application.Current.Dispatcher.Invoke(() => Show(caption));
+                return Application.Current.Dispatcher.Invoke(() => Show(caption, forceClosed));
             }
 
             try
             {
-                var prgBox = new ProgressBoxEx
+                var prgBox = new ProgressBoxEx(forceClosed)
                 {
                     Title = caption
                 };
@@ -51,6 +56,7 @@ public void ReportProgress(double progress)
             else if (progress >= 100)
             {
                 ProgressBar.Value = 100;
+                Close();
             }
             else
             {
@@ -58,19 +64,42 @@ public void ReportProgress(double progress)
             }
         }
 
+        private new void Close()
+        {
+            if (_isClosed)
+            {
+                return;
+            }
+            
+            base.Close();
+            _isClosed = true;
+        }
+
         private void KeyEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
         {
-            Close();
+            ForceClose();
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)
         {
-            Close();
+            ForceClose();
         }
 
         private void Button_Cancel(object sender, RoutedEventArgs e)
         {
-            Close();
+            ForceClose();
+        }
+
+        private void ForceClose()
+        {
+            if (_isClosed)
+            {
+                return;
+            }
+            
+            base.Close();
+            _isClosed = true;
+            _forceClosed?.Invoke();
         }
     }
 }
diff --git a/Flow.Launcher.Plugin/IProgressBoxEx.cs b/Flow.Launcher.Plugin/IProgressBoxEx.cs
new file mode 100644
index 00000000000..0b245411ff1
--- /dev/null
+++ b/Flow.Launcher.Plugin/IProgressBoxEx.cs
@@ -0,0 +1,20 @@
+namespace Flow.Launcher.Plugin;
+
+/// <summary>
+/// Interface for progress box
+/// </summary>
+public interface IProgressBoxEx
+{
+    /// <summary>
+    /// Show progress box
+    /// </summary>
+    /// <param name="progress">
+    /// Progress value. Should be between 0 and 100. When progress is 100, the progress box will be closed.
+    /// </param>
+    public void ReportProgress(double progress);
+
+    /// <summary>
+    /// Close progress box.
+    /// </summary>
+    public void Close();
+}
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index a0186b7a214..9cd45a1d313 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -1,4 +1,4 @@
-using Flow.Launcher.Plugin.SharedModels;
+using Flow.Launcher.Plugin.SharedModels;
 using JetBrains.Annotations;
 using System;
 using System.Collections.Generic;
@@ -316,5 +316,14 @@ public interface IPublicAPI
         /// <param name="defaultResult">Specifies the default result of the message box.</param>
         /// <returns>Specifies which message box button is clicked by the user.</returns>
         public MessageBoxResult ShowMsgBox(string messageBoxText, string caption = "", MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, MessageBoxResult defaultResult = MessageBoxResult.OK);
+
+        /// <summary>
+        /// Displays a standardised Flow message box.
+        /// If there is issue when showing the message box, it will return null.
+        /// </summary>
+        /// <param name="caption">The caption of the message box.</param>
+        /// <param name="forceClosed">When user closes the progress box manually by button or esc key, this action will be called.</param>
+        /// <returns>A progress box interface.</returns>
+        public IProgressBoxEx ShowProgressBox(string caption, Action forceClosed = null);
     }
 }
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index f0295cf244a..b403d604662 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -324,6 +324,8 @@ public bool IsGameModeOn()
         public MessageBoxResult ShowMsgBox(string messageBoxText, string caption = "", MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, MessageBoxResult defaultResult = MessageBoxResult.OK) =>
             MessageBoxEx.Show(messageBoxText, caption, button, icon, defaultResult);
 
+        public IProgressBoxEx ShowProgressBox(string caption, Action forceClosed = null) => ProgressBoxEx.Show(caption, forceClosed);
+
         #endregion
 
         #region Private Methods
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index 39390ae101f..f7383ff2f9c 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -1,5 +1,4 @@
-using Flow.Launcher.Core;
-using Flow.Launcher.Core.ExternalPlugins;
+using Flow.Launcher.Core.ExternalPlugins;
 using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Infrastructure.Http;
@@ -143,7 +142,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
 
             var filePath = Path.Combine(Path.GetTempPath(), downloadFilename);
 
-            ProgressBoxEx prgBox = null;
+            IProgressBoxEx prgBox = null;
             try
             {
                 if (!plugin.IsFromLocalInstallPath)
@@ -159,7 +158,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                     var totalBytes = response.Content.Headers.ContentLength ?? -1L;
                     var canReportProgress = totalBytes != -1;
 
-                    if (canReportProgress && (prgBox = ProgressBoxEx.Show("Download plugin...")) != null)
+                    if (canReportProgress && (prgBox = Context.API.ShowProgressBox("Download plugin...")) != null)
                     {
                         await using var contentStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
                         await using var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true);

From d0bab86377d51234337ab2f682f320e9dd80cc47 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 5 Jan 2025 00:11:03 +0800
Subject: [PATCH 04/28] Improve code quality

---
 Flow.Launcher.Core/ProgressBoxEx.xaml.cs                      | 2 +-
 Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher.Core/ProgressBoxEx.xaml.cs b/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
index b6801d2c1f0..9a32f730387 100644
--- a/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
+++ b/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
@@ -17,7 +17,7 @@ private ProgressBoxEx(Action forceClosed)
             InitializeComponent();
         }
 
-        public static IProgressBoxEx Show(string caption, Action forceClosed)
+        public static IProgressBoxEx Show(string caption, Action forceClosed = null)
         {
             if (!Application.Current.Dispatcher.CheckAccess())
             {
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index f7383ff2f9c..2ac4be93e7c 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -158,7 +158,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                     var totalBytes = response.Content.Headers.ContentLength ?? -1L;
                     var canReportProgress = totalBytes != -1;
 
-                    if (canReportProgress && (prgBox = Context.API.ShowProgressBox("Download plugin...")) != null)
+                    if (canReportProgress && (prgBox = Context.API.ShowProgressBox($"Download {plugin.Name}...")) != null)
                     {
                         await using var contentStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
                         await using var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true);

From f69dd0f15572d1135ac753563d8f3ecb9ab40dcf Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 5 Jan 2025 00:13:32 +0800
Subject: [PATCH 05/28] Improve documents

---
 Flow.Launcher.Plugin/IProgressBoxEx.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Flow.Launcher.Plugin/IProgressBoxEx.cs b/Flow.Launcher.Plugin/IProgressBoxEx.cs
index 0b245411ff1..6468e3c83a6 100644
--- a/Flow.Launcher.Plugin/IProgressBoxEx.cs
+++ b/Flow.Launcher.Plugin/IProgressBoxEx.cs
@@ -6,7 +6,7 @@
 public interface IProgressBoxEx
 {
     /// <summary>
-    /// Show progress box
+    /// Show progress box. It should be called from the main ui thread.
     /// </summary>
     /// <param name="progress">
     /// Progress value. Should be between 0 and 100. When progress is 100, the progress box will be closed.
@@ -14,7 +14,7 @@ public interface IProgressBoxEx
     public void ReportProgress(double progress);
 
     /// <summary>
-    /// Close progress box.
+    /// Close progress box. It should be called from the main ui thread.
     /// </summary>
     public void Close();
 }

From c06ba595b4f784757958702a3abcec1aed9e7fea Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 5 Jan 2025 21:08:07 +0800
Subject: [PATCH 06/28] Add support for cancelling download

---
 .../PluginsManager.cs                         | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index 2ac4be93e7c..a1b37f428d6 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -143,6 +143,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
             var filePath = Path.Combine(Path.GetTempPath(), downloadFilename);
 
             IProgressBoxEx prgBox = null;
+            var downloadCancelled = false;
             try
             {
                 if (!plugin.IsFromLocalInstallPath)
@@ -158,7 +159,13 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                     var totalBytes = response.Content.Headers.ContentLength ?? -1L;
                     var canReportProgress = totalBytes != -1;
 
-                    if (canReportProgress && (prgBox = Context.API.ShowProgressBox($"Download {plugin.Name}...")) != null)
+                    if (canReportProgress && 
+                        (prgBox = Context.API.ShowProgressBox($"Download {plugin.Name}...", () =>
+                    {
+                            httpClient.CancelPendingRequests();
+                            downloadCancelled = true;
+                            prgBox = null;
+                        })) != null)
                     {
                         await using var contentStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
                         await using var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true);
@@ -173,27 +180,38 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                             totalRead += read;
 
                             var progressValue = totalRead * 100 / totalBytes;
+
+                            // check if user cancelled download before reporting progress
+                            if (downloadCancelled)
+                                return;
+
                             prgBox.ReportProgress(progressValue);
                         }
 
+                        // check if user cancelled download before closing progress box
+                        if (downloadCancelled)
+                            return;
+
                         Application.Current.Dispatcher.Invoke(() =>
                         {
                             prgBox.Close();
                             prgBox = null;
                         });
+
+                        Install(plugin, filePath);
                     }
                     else
                     {
                         await Http.DownloadAsync(plugin.UrlDownload, filePath).ConfigureAwait(false);
+                        Install(plugin, filePath);
                     }
                 }
                 else
                 {
                     filePath = plugin.LocalInstallPath;
-                }
-
                 Install(plugin, filePath);
             }
+            }
             catch (HttpRequestException e)
             {
                 Context.API.ShowMsgError(

From 07bb16c8f30813eece608b09cde5bbced5ac91a3 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 5 Jan 2025 21:08:23 +0800
Subject: [PATCH 07/28] Improve code quality

---
 .../PluginsManager.cs                         | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index a1b37f428d6..f1c634640d7 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -161,7 +161,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
 
                     if (canReportProgress && 
                         (prgBox = Context.API.ShowProgressBox($"Download {plugin.Name}...", () =>
-                    {
+                        {
                             httpClient.CancelPendingRequests();
                             downloadCancelled = true;
                             prgBox = null;
@@ -209,15 +209,11 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                 else
                 {
                     filePath = plugin.LocalInstallPath;
-                Install(plugin, filePath);
-            }
+                    Install(plugin, filePath);
+                }
             }
             catch (HttpRequestException e)
             {
-                Context.API.ShowMsgError(
-                    string.Format(Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"), plugin.Name),
-                    Context.API.GetTranslation("plugin_pluginsmanager_download_error"));
-                Log.Exception("PluginsManager", "An error occurred while downloading plugin", e);
                 // force close progress box
                 Application.Current.Dispatcher.Invoke(() =>
                 {
@@ -227,14 +223,17 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                         prgBox = null;
                     }
                 });
+
+                // show error message
+                Context.API.ShowMsgError(
+                    string.Format(Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"), plugin.Name),
+                    Context.API.GetTranslation("plugin_pluginsmanager_download_error"));
+                Log.Exception("PluginsManager", "An error occurred while downloading plugin", e);
+
                 return;
             }
             catch (Exception e)
             {
-                Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),
-                    string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_error_subtitle"),
-                        plugin.Name));
-                Log.Exception("PluginsManager", "An error occurred while downloading plugin", e);
                 // force close progress box
                 Application.Current.Dispatcher.Invoke(() =>
                 {
@@ -244,6 +243,13 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                         prgBox = null;
                     }
                 });
+
+                // show error message
+                Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),
+                    string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_error_subtitle"),
+                        plugin.Name));
+                Log.Exception("PluginsManager", "An error occurred while downloading plugin", e);
+
                 return;
             }
 

From c907c291480aeb800dba9cadd45e9c2d50917600 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 5 Jan 2025 21:16:49 +0800
Subject: [PATCH 08/28] Fix plugin install issue

---
 .../PluginsManager.cs                                  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index f1c634640d7..fd222d909e7 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -197,20 +197,22 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                             prgBox.Close();
                             prgBox = null;
                         });
-
-                        Install(plugin, filePath);
                     }
                     else
                     {
                         await Http.DownloadAsync(plugin.UrlDownload, filePath).ConfigureAwait(false);
-                        Install(plugin, filePath);
                     }
                 }
                 else
                 {
                     filePath = plugin.LocalInstallPath;
-                    Install(plugin, filePath);
                 }
+
+                // check if user cancelled download before installing plugin
+                if (downloadCancelled)
+                    return;
+
+                Install(plugin, filePath);
             }
             catch (HttpRequestException e)
             {

From 675ee9e3952fcc4093dd6f70e3da0d3bae917f47 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 6 Jan 2025 21:16:12 +0800
Subject: [PATCH 09/28] Add translation for progress box title

---
 Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index fd222d909e7..0ed849bb3ee 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -159,8 +159,9 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                     var totalBytes = response.Content.Headers.ContentLength ?? -1L;
                     var canReportProgress = totalBytes != -1;
 
+                    var prgBoxTitle = $"{Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin")} {plugin.Name}";
                     if (canReportProgress && 
-                        (prgBox = Context.API.ShowProgressBox($"Download {plugin.Name}...", () =>
+                        (prgBox = Context.API.ShowProgressBox(prgBoxTitle, () =>
                         {
                             httpClient.CancelPendingRequests();
                             downloadCancelled = true;

From 0fabe31fe4344acb49bae294ac4cf23981a1951d Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 6 Jan 2025 21:16:28 +0800
Subject: [PATCH 10/28] Improve code quality

---
 .../PluginsManager.cs                         | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index 0ed849bb3ee..bbb5c179edb 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -163,9 +163,12 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                     if (canReportProgress && 
                         (prgBox = Context.API.ShowProgressBox(prgBoxTitle, () =>
                         {
-                            httpClient.CancelPendingRequests();
-                            downloadCancelled = true;
-                            prgBox = null;
+                            if (prgBox != null)
+                            {
+                                httpClient.CancelPendingRequests();
+                                downloadCancelled = true;
+                                prgBox = null;
+                            }
                         })) != null)
                     {
                         await using var contentStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
@@ -185,19 +188,19 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                             // check if user cancelled download before reporting progress
                             if (downloadCancelled)
                                 return;
-
-                            prgBox.ReportProgress(progressValue);
+                            else
+                                prgBox.ReportProgress(progressValue);
                         }
 
                         // check if user cancelled download before closing progress box
                         if (downloadCancelled)
                             return;
-
-                        Application.Current.Dispatcher.Invoke(() =>
-                        {
-                            prgBox.Close();
-                            prgBox = null;
-                        });
+                        else
+                            Application.Current.Dispatcher.Invoke(() =>
+                            {
+                                prgBox.Close();
+                                prgBox = null;
+                            });
                     }
                     else
                     {
@@ -212,8 +215,8 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                 // check if user cancelled download before installing plugin
                 if (downloadCancelled)
                     return;
-
-                Install(plugin, filePath);
+                else
+                    Install(plugin, filePath);
             }
             catch (HttpRequestException e)
             {

From cc0fb66b2245dbc1e7f4098b5da492b19a8868ac Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 6 Jan 2025 21:26:05 +0800
Subject: [PATCH 11/28] Extract duplicate cleanup code into a method

---
 .../PluginsManager.cs                         | 32 +++++++------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index bbb5c179edb..a41a82c67f4 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -196,11 +196,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                         if (downloadCancelled)
                             return;
                         else
-                            Application.Current.Dispatcher.Invoke(() =>
-                            {
-                                prgBox.Close();
-                                prgBox = null;
-                            });
+                            CleanupProgressBoxEx(prgBox);
                     }
                     else
                     {
@@ -221,14 +217,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
             catch (HttpRequestException e)
             {
                 // force close progress box
-                Application.Current.Dispatcher.Invoke(() =>
-                {
-                    if (prgBox != null)
-                    {
-                        prgBox.Close();
-                        prgBox = null;
-                    }
-                });
+                CleanupProgressBoxEx(prgBox);
 
                 // show error message
                 Context.API.ShowMsgError(
@@ -241,14 +230,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
             catch (Exception e)
             {
                 // force close progress box
-                Application.Current.Dispatcher.Invoke(() =>
-                {
-                    if (prgBox != null)
-                    {
-                        prgBox.Close();
-                        prgBox = null;
-                    }
-                });
+                CleanupProgressBoxEx(prgBox);
 
                 // show error message
                 Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),
@@ -274,6 +256,14 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
             }
         }
 
+        private static void CleanupProgressBoxEx(IProgressBoxEx prgBox)
+        {
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                prgBox?.Close();
+            });
+        }
+
         internal async ValueTask<List<Result>> RequestUpdateAsync(string search, CancellationToken token,
             bool usePrimaryUrlOnly = false)
         {

From bc84910e56c041d59fa966737a15fa3fdb7511fa Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 6 Jan 2025 21:30:28 +0800
Subject: [PATCH 12/28] Use static HttpClient instance for heavy load issue

---
 .../PluginsManager.cs                                    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index a41a82c67f4..9670f490947 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -17,7 +17,9 @@ namespace Flow.Launcher.Plugin.PluginsManager
 {
     internal class PluginsManager
     {
-        const string zip = "zip";
+        private static readonly HttpClient HttpClient = new();
+
+        private const string zip = "zip";
 
         private PluginInitContext Context { get; set; }
 
@@ -151,8 +153,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                     if (File.Exists(filePath))
                         File.Delete(filePath);
 
-                    using var httpClient = new HttpClient();
-                    using var response = await httpClient.GetAsync(plugin.UrlDownload, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false);
+                    using var response = await HttpClient.GetAsync(plugin.UrlDownload, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false);
 
                     response.EnsureSuccessStatusCode();
 
@@ -165,7 +166,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                         {
                             if (prgBox != null)
                             {
-                                httpClient.CancelPendingRequests();
+                                HttpClient.CancelPendingRequests();
                                 downloadCancelled = true;
                                 prgBox = null;
                             }

From aff6b1aff1fa80fa79e9eecd0a630d1ce3ed7e28 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 6 Jan 2025 21:32:02 +0800
Subject: [PATCH 13/28] Perserve prgBox value when force close

---
 Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index 9670f490947..2923f7eefba 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -168,7 +168,6 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                             {
                                 HttpClient.CancelPendingRequests();
                                 downloadCancelled = true;
-                                prgBox = null;
                             }
                         })) != null)
                     {

From 8aebf958aa940770c23854167d4c0304a7890fd3 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 9 Jan 2025 12:13:46 +0800
Subject: [PATCH 14/28] Check ui thread when calling close function & Update
 documents

---
 Flow.Launcher.Core/ProgressBoxEx.xaml.cs           |  7 ++++++-
 Flow.Launcher.Plugin/IProgressBoxEx.cs             |  4 ++--
 .../PluginsManager.cs                              | 14 +++-----------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Flow.Launcher.Core/ProgressBoxEx.xaml.cs b/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
index 9a32f730387..f5d34617b86 100644
--- a/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
+++ b/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
@@ -66,11 +66,16 @@ public void ReportProgress(double progress)
 
         private new void Close()
         {
+            if (!Application.Current.Dispatcher.CheckAccess())
+            {
+                Application.Current.Dispatcher.Invoke(Close);
+            }
+
             if (_isClosed)
             {
                 return;
             }
-            
+
             base.Close();
             _isClosed = true;
         }
diff --git a/Flow.Launcher.Plugin/IProgressBoxEx.cs b/Flow.Launcher.Plugin/IProgressBoxEx.cs
index 6468e3c83a6..27b0618959b 100644
--- a/Flow.Launcher.Plugin/IProgressBoxEx.cs
+++ b/Flow.Launcher.Plugin/IProgressBoxEx.cs
@@ -6,7 +6,7 @@
 public interface IProgressBoxEx
 {
     /// <summary>
-    /// Show progress box. It should be called from the main ui thread.
+    /// Show progress box.
     /// </summary>
     /// <param name="progress">
     /// Progress value. Should be between 0 and 100. When progress is 100, the progress box will be closed.
@@ -14,7 +14,7 @@ public interface IProgressBoxEx
     public void ReportProgress(double progress);
 
     /// <summary>
-    /// Close progress box. It should be called from the main ui thread.
+    /// Close progress box.
     /// </summary>
     public void Close();
 }
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index 2923f7eefba..0af2af5ec8f 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -196,7 +196,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                         if (downloadCancelled)
                             return;
                         else
-                            CleanupProgressBoxEx(prgBox);
+                            prgBox?.Close();
                     }
                     else
                     {
@@ -217,7 +217,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
             catch (HttpRequestException e)
             {
                 // force close progress box
-                CleanupProgressBoxEx(prgBox);
+                prgBox?.Close();
 
                 // show error message
                 Context.API.ShowMsgError(
@@ -230,7 +230,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
             catch (Exception e)
             {
                 // force close progress box
-                CleanupProgressBoxEx(prgBox);
+                prgBox?.Close();
 
                 // show error message
                 Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),
@@ -256,14 +256,6 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
             }
         }
 
-        private static void CleanupProgressBoxEx(IProgressBoxEx prgBox)
-        {
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                prgBox?.Close();
-            });
-        }
-
         internal async ValueTask<List<Result>> RequestUpdateAsync(string search, CancellationToken token,
             bool usePrimaryUrlOnly = false)
         {

From 122887e6a61f629a4574fe1ebfa62b7a115e9b2f Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 9 Jan 2025 16:37:52 +0800
Subject: [PATCH 15/28] Await close event from non-ui thread

---
 Flow.Launcher.Core/ProgressBoxEx.xaml.cs               | 10 ++++++++--
 Flow.Launcher.Plugin/IProgressBoxEx.cs                 |  6 ++++--
 .../PluginsManager.cs                                  |  6 +++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Flow.Launcher.Core/ProgressBoxEx.xaml.cs b/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
index f5d34617b86..00f4a8050aa 100644
--- a/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
+++ b/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 using Flow.Launcher.Infrastructure.Logger;
@@ -64,13 +65,18 @@ public void ReportProgress(double progress)
             }
         }
 
-        private new void Close()
+        public async Task CloseAsync()
         {
             if (!Application.Current.Dispatcher.CheckAccess())
             {
-                Application.Current.Dispatcher.Invoke(Close);
+                await Application.Current.Dispatcher.InvokeAsync(Close);
             }
 
+            Close();
+        }
+
+        private new void Close()
+        {
             if (_isClosed)
             {
                 return;
diff --git a/Flow.Launcher.Plugin/IProgressBoxEx.cs b/Flow.Launcher.Plugin/IProgressBoxEx.cs
index 27b0618959b..50ee6eb5536 100644
--- a/Flow.Launcher.Plugin/IProgressBoxEx.cs
+++ b/Flow.Launcher.Plugin/IProgressBoxEx.cs
@@ -1,4 +1,6 @@
-namespace Flow.Launcher.Plugin;
+using System.Threading.Tasks;
+
+namespace Flow.Launcher.Plugin;
 
 /// <summary>
 /// Interface for progress box
@@ -16,5 +18,5 @@ public interface IProgressBoxEx
     /// <summary>
     /// Close progress box.
     /// </summary>
-    public void Close();
+    public Task CloseAsync();
 }
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index 0af2af5ec8f..f5399d53dcc 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -196,7 +196,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                         if (downloadCancelled)
                             return;
                         else
-                            prgBox?.Close();
+                            await prgBox?.CloseAsync();
                     }
                     else
                     {
@@ -217,7 +217,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
             catch (HttpRequestException e)
             {
                 // force close progress box
-                prgBox?.Close();
+                await prgBox?.CloseAsync();
 
                 // show error message
                 Context.API.ShowMsgError(
@@ -230,7 +230,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
             catch (Exception e)
             {
                 // force close progress box
-                prgBox?.Close();
+                await prgBox?.CloseAsync();
 
                 // show error message
                 Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),

From 6220b34aabc7043977ad7316aa0417e7d8e2b1c3 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 9 Jan 2025 17:33:39 +0800
Subject: [PATCH 16/28] Fix dulplicated close event

---
 Flow.Launcher.Core/ProgressBoxEx.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Flow.Launcher.Core/ProgressBoxEx.xaml.cs b/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
index 00f4a8050aa..dc1f27404a0 100644
--- a/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
+++ b/Flow.Launcher.Core/ProgressBoxEx.xaml.cs
@@ -70,6 +70,7 @@ public async Task CloseAsync()
             if (!Application.Current.Dispatcher.CheckAccess())
             {
                 await Application.Current.Dispatcher.InvokeAsync(Close);
+                return;
             }
 
             Close();

From 501633435942fa701c53e25ec0b074df0cbbe3df Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 9 Jan 2025 17:37:53 +0800
Subject: [PATCH 17/28] Avoid cancelling all pending requests on shared
 HttpClient instance

---
 .../Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index f5399d53dcc..081f8d489e6 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -153,7 +153,8 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                     if (File.Exists(filePath))
                         File.Delete(filePath);
 
-                    using var response = await HttpClient.GetAsync(plugin.UrlDownload, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false);
+                    using var cts = new CancellationTokenSource();
+                    using var response = await HttpClient.GetAsync(plugin.UrlDownload, HttpCompletionOption.ResponseHeadersRead, cts.Token).ConfigureAwait(false);
 
                     response.EnsureSuccessStatusCode();
 
@@ -166,7 +167,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                         {
                             if (prgBox != null)
                             {
-                                HttpClient.CancelPendingRequests();
+                                cts.Cancel();
                                 downloadCancelled = true;
                             }
                         })) != null)

From 381e64e69797256980d3353c150fa35fe7273dec Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 9 Jan 2025 21:13:24 +0800
Subject: [PATCH 18/28] Move ProgressBoxEx to main project for better
 development experience

---
 {Flow.Launcher.Core => Flow.Launcher}/ProgressBoxEx.xaml    | 0
 {Flow.Launcher.Core => Flow.Launcher}/ProgressBoxEx.xaml.cs | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {Flow.Launcher.Core => Flow.Launcher}/ProgressBoxEx.xaml (100%)
 rename {Flow.Launcher.Core => Flow.Launcher}/ProgressBoxEx.xaml.cs (100%)

diff --git a/Flow.Launcher.Core/ProgressBoxEx.xaml b/Flow.Launcher/ProgressBoxEx.xaml
similarity index 100%
rename from Flow.Launcher.Core/ProgressBoxEx.xaml
rename to Flow.Launcher/ProgressBoxEx.xaml
diff --git a/Flow.Launcher.Core/ProgressBoxEx.xaml.cs b/Flow.Launcher/ProgressBoxEx.xaml.cs
similarity index 100%
rename from Flow.Launcher.Core/ProgressBoxEx.xaml.cs
rename to Flow.Launcher/ProgressBoxEx.xaml.cs

From d36aef57e9bff40af03ab6143753b0cfd4b14348 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 9 Jan 2025 21:48:13 +0800
Subject: [PATCH 19/28] Change ProgressBoxEx namespace

---
 Flow.Launcher/ProgressBoxEx.xaml    | 4 ++--
 Flow.Launcher/ProgressBoxEx.xaml.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/ProgressBoxEx.xaml b/Flow.Launcher/ProgressBoxEx.xaml
index 4cce822217e..3102cfb7255 100644
--- a/Flow.Launcher/ProgressBoxEx.xaml
+++ b/Flow.Launcher/ProgressBoxEx.xaml
@@ -1,9 +1,9 @@
 <Window
-    x:Class="Flow.Launcher.Core.ProgressBoxEx"
+    x:Class="Flow.Launcher.ProgressBoxEx"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:Flow.Launcher.Core"
+    xmlns:local="clr-namespace:Flow.Launcher"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     x:Name="MessageBoxWindow"
     Width="420"
diff --git a/Flow.Launcher/ProgressBoxEx.xaml.cs b/Flow.Launcher/ProgressBoxEx.xaml.cs
index dc1f27404a0..eff0bd80c49 100644
--- a/Flow.Launcher/ProgressBoxEx.xaml.cs
+++ b/Flow.Launcher/ProgressBoxEx.xaml.cs
@@ -5,7 +5,7 @@
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Plugin;
 
-namespace Flow.Launcher.Core
+namespace Flow.Launcher
 {
     public partial class ProgressBoxEx : Window, IProgressBoxEx
     {

From ed7265d24457e2934a02ab3a1959a3222996219c Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 10 Jan 2025 13:06:37 +0800
Subject: [PATCH 20/28] Remove override close event

---
 Flow.Launcher/ProgressBoxEx.xaml.cs | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/Flow.Launcher/ProgressBoxEx.xaml.cs b/Flow.Launcher/ProgressBoxEx.xaml.cs
index eff0bd80c49..507710e90c9 100644
--- a/Flow.Launcher/ProgressBoxEx.xaml.cs
+++ b/Flow.Launcher/ProgressBoxEx.xaml.cs
@@ -10,7 +10,6 @@ namespace Flow.Launcher
     public partial class ProgressBoxEx : Window, IProgressBoxEx
     {
         private readonly Action _forceClosed;
-        private bool _isClosed;
 
         private ProgressBoxEx(Action forceClosed)
         {
@@ -76,17 +75,6 @@ public async Task CloseAsync()
             Close();
         }
 
-        private new void Close()
-        {
-            if (_isClosed)
-            {
-                return;
-            }
-
-            base.Close();
-            _isClosed = true;
-        }
-
         private void KeyEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
         {
             ForceClose();
@@ -104,13 +92,7 @@ private void Button_Cancel(object sender, RoutedEventArgs e)
 
         private void ForceClose()
         {
-            if (_isClosed)
-            {
-                return;
-            }
-            
-            base.Close();
-            _isClosed = true;
+            Close();
             _forceClosed?.Invoke();
         }
     }

From 297d1914127fd10d9ac230438e7a327d362dbc6f Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 10 Jan 2025 19:13:19 +0800
Subject: [PATCH 21/28] Use function to delegate the progress task

---
 Flow.Launcher.Plugin/IProgressBoxEx.cs        | 22 ------
 Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs |  7 +-
 Flow.Launcher/ProgressBoxEx.xaml.cs           | 50 ++++++++-----
 Flow.Launcher/PublicAPIInstance.cs            |  2 +-
 .../PluginsManager.cs                         | 72 +++++++++----------
 5 files changed, 74 insertions(+), 79 deletions(-)
 delete mode 100644 Flow.Launcher.Plugin/IProgressBoxEx.cs

diff --git a/Flow.Launcher.Plugin/IProgressBoxEx.cs b/Flow.Launcher.Plugin/IProgressBoxEx.cs
deleted file mode 100644
index 50ee6eb5536..00000000000
--- a/Flow.Launcher.Plugin/IProgressBoxEx.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Threading.Tasks;
-
-namespace Flow.Launcher.Plugin;
-
-/// <summary>
-/// Interface for progress box
-/// </summary>
-public interface IProgressBoxEx
-{
-    /// <summary>
-    /// Show progress box.
-    /// </summary>
-    /// <param name="progress">
-    /// Progress value. Should be between 0 and 100. When progress is 100, the progress box will be closed.
-    /// </param>
-    public void ReportProgress(double progress);
-
-    /// <summary>
-    /// Close progress box.
-    /// </summary>
-    public Task CloseAsync();
-}
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index 9cd45a1d313..c4bfd7033fb 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -322,8 +322,13 @@ public interface IPublicAPI
         /// If there is issue when showing the message box, it will return null.
         /// </summary>
         /// <param name="caption">The caption of the message box.</param>
+        /// <param name="reportProgressAsync">
+        /// Time-consuming task function, whose input is the action to report progress.
+        /// The input of the action is the progress value which is a double value between 0 and 100.
+        /// If there are any exceptions, this action will be null.
+        /// </param>
         /// <param name="forceClosed">When user closes the progress box manually by button or esc key, this action will be called.</param>
         /// <returns>A progress box interface.</returns>
-        public IProgressBoxEx ShowProgressBox(string caption, Action forceClosed = null);
+        public Task ShowProgressBoxAsync(string caption, Func<Action<double>, Task> reportProgressAsync, Action forceClosed = null);
     }
 }
diff --git a/Flow.Launcher/ProgressBoxEx.xaml.cs b/Flow.Launcher/ProgressBoxEx.xaml.cs
index 507710e90c9..37ee2b0cb29 100644
--- a/Flow.Launcher/ProgressBoxEx.xaml.cs
+++ b/Flow.Launcher/ProgressBoxEx.xaml.cs
@@ -3,11 +3,10 @@
 using System.Windows;
 using System.Windows.Input;
 using Flow.Launcher.Infrastructure.Logger;
-using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher
 {
-    public partial class ProgressBoxEx : Window, IProgressBoxEx
+    public partial class ProgressBoxEx : Window
     {
         private readonly Action _forceClosed;
 
@@ -17,31 +16,48 @@ private ProgressBoxEx(Action forceClosed)
             InitializeComponent();
         }
 
-        public static IProgressBoxEx Show(string caption, Action forceClosed = null)
+        public static async Task ShowAsync(string caption, Func<Action<double>, Task> reportProgressAsync, Action forceClosed = null)
         {
-            if (!Application.Current.Dispatcher.CheckAccess())
-            {
-                return Application.Current.Dispatcher.Invoke(() => Show(caption, forceClosed));
-            }
-
+            ProgressBoxEx prgBox = null;
             try
             {
-                var prgBox = new ProgressBoxEx(forceClosed)
+                if (!Application.Current.Dispatcher.CheckAccess())
                 {
-                    Title = caption
-                };
-                prgBox.TitleTextBlock.Text = caption;
-                prgBox.Show();
-                return prgBox;
+                    await Application.Current.Dispatcher.InvokeAsync(() =>
+                    {
+                        prgBox = new ProgressBoxEx(forceClosed)
+                        {
+                            Title = caption
+                        };
+                        prgBox.TitleTextBlock.Text = caption;
+                        prgBox.Show();
+                    });
+                }
+
+                await reportProgressAsync(prgBox.ReportProgress).ConfigureAwait(false);
             }
             catch (Exception e)
             {
                 Log.Error($"|ProgressBoxEx.Show|An error occurred: {e.Message}");
-                return null;
+
+                await reportProgressAsync(null).ConfigureAwait(false);
+            }
+            finally
+            {
+                if (!Application.Current.Dispatcher.CheckAccess())
+                {
+                    await Application.Current.Dispatcher.InvokeAsync(async () =>
+                    {
+                        if (prgBox != null)
+                        {
+                            await prgBox.CloseAsync();
+                        }
+                    });
+                }
             }
         }
 
-        public void ReportProgress(double progress)
+        private void ReportProgress(double progress)
         {
             if (!Application.Current.Dispatcher.CheckAccess())
             {
@@ -64,7 +80,7 @@ public void ReportProgress(double progress)
             }
         }
 
-        public async Task CloseAsync()
+        private async Task CloseAsync()
         {
             if (!Application.Current.Dispatcher.CheckAccess())
             {
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index b403d604662..95d371fb09f 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -324,7 +324,7 @@ public bool IsGameModeOn()
         public MessageBoxResult ShowMsgBox(string messageBoxText, string caption = "", MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, MessageBoxResult defaultResult = MessageBoxResult.OK) =>
             MessageBoxEx.Show(messageBoxText, caption, button, icon, defaultResult);
 
-        public IProgressBoxEx ShowProgressBox(string caption, Action forceClosed = null) => ProgressBoxEx.Show(caption, forceClosed);
+        public Task ShowProgressBoxAsync(string caption, Func<Action<double>, Task> reportProgressAsync, Action forceClosed = null) => ProgressBoxEx.ShowAsync(caption, reportProgressAsync, forceClosed);
 
         #endregion
 
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index 081f8d489e6..c3ed04a4da2 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -144,7 +144,6 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
 
             var filePath = Path.Combine(Path.GetTempPath(), downloadFilename);
 
-            IProgressBoxEx prgBox = null;
             var downloadCancelled = false;
             try
             {
@@ -162,42 +161,45 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
                     var canReportProgress = totalBytes != -1;
 
                     var prgBoxTitle = $"{Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin")} {plugin.Name}";
-                    if (canReportProgress && 
-                        (prgBox = Context.API.ShowProgressBox(prgBoxTitle, () =>
-                        {
-                            if (prgBox != null)
-                            {
-                                cts.Cancel();
-                                downloadCancelled = true;
-                            }
-                        })) != null)
+                    if (canReportProgress)
                     {
-                        await using var contentStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
-                        await using var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true);
-
-                        var buffer = new byte[8192];
-                        long totalRead = 0;
-                        int read;
+                        await Context.API.ShowProgressBoxAsync(prgBoxTitle, 
+                            async (reportProgress) =>
+                            {
+                                if (reportProgress == null)
+                                {
+                                    // cannot use progress box
+                                    await Http.DownloadAsync(plugin.UrlDownload, filePath).ConfigureAwait(false);
+                                }
+                                else
+                                {
+                                    await using var contentStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+                                    await using var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true);
 
-                        while ((read = await contentStream.ReadAsync(buffer).ConfigureAwait(false)) > 0)
-                        {
-                            await fileStream.WriteAsync(buffer.AsMemory(0, read)).ConfigureAwait(false);
-                            totalRead += read;
+                                    var buffer = new byte[8192];
+                                    long totalRead = 0;
+                                    int read;
 
-                            var progressValue = totalRead * 100 / totalBytes;
+                                    while ((read = await contentStream.ReadAsync(buffer).ConfigureAwait(false)) > 0)
+                                    {
+                                        await fileStream.WriteAsync(buffer.AsMemory(0, read)).ConfigureAwait(false);
+                                        totalRead += read;
 
-                            // check if user cancelled download before reporting progress
-                            if (downloadCancelled)
-                                return;
-                            else
-                                prgBox.ReportProgress(progressValue);
-                        }
+                                        var progressValue = totalRead * 100 / totalBytes;
 
-                        // check if user cancelled download before closing progress box
-                        if (downloadCancelled)
-                            return;
-                        else
-                            await prgBox?.CloseAsync();
+                                        // check if user cancelled download before reporting progress
+                                        if (downloadCancelled)
+                                            return;
+                                        else
+                                            reportProgress(progressValue);
+                                    }
+                                }
+                            }, 
+                            () =>
+                            {
+                                cts.Cancel();
+                                downloadCancelled = true;
+                            });
                     }
                     else
                     {
@@ -217,9 +219,6 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
             }
             catch (HttpRequestException e)
             {
-                // force close progress box
-                await prgBox?.CloseAsync();
-
                 // show error message
                 Context.API.ShowMsgError(
                     string.Format(Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"), plugin.Name),
@@ -230,9 +229,6 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
             }
             catch (Exception e)
             {
-                // force close progress box
-                await prgBox?.CloseAsync();
-
                 // show error message
                 Context.API.ShowMsgError(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),
                     string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_error_subtitle"),

From cc921c7d291b45b4128cdb2b1423a2631a6ee422 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 10 Jan 2025 19:17:54 +0800
Subject: [PATCH 22/28] Improve progress box when exception happens

---
 .../PluginsManager.cs                                | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index c3ed04a4da2..b6495d8f260 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -145,6 +145,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
             var filePath = Path.Combine(Path.GetTempPath(), downloadFilename);
 
             var downloadCancelled = false;
+            var exceptionHappened = false;
             try
             {
                 if (!plugin.IsFromLocalInstallPath)
@@ -168,8 +169,10 @@ await Context.API.ShowProgressBoxAsync(prgBoxTitle,
                             {
                                 if (reportProgress == null)
                                 {
-                                    // cannot use progress box
-                                    await Http.DownloadAsync(plugin.UrlDownload, filePath).ConfigureAwait(false);
+                                    // when reportProgress is null, it means there is expcetion with the progress box
+                                    // so we record it with exceptionHappened and return so that progress box will close instantly
+                                    exceptionHappened = true;
+                                    return;
                                 }
                                 else
                                 {
@@ -200,6 +203,11 @@ await Context.API.ShowProgressBoxAsync(prgBoxTitle,
                                 cts.Cancel();
                                 downloadCancelled = true;
                             });
+
+                        // if exception happened while downloading and user does not cancel downloading,
+                        // we need to redownload the plugin
+                        if (exceptionHappened && (!downloadCancelled))
+                            await Http.DownloadAsync(plugin.UrlDownload, filePath).ConfigureAwait(false);
                     }
                     else
                     {

From df3cb58c6c2bac0f71e73a003f99b04a881d83d1 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 11 Jan 2025 12:38:08 +0800
Subject: [PATCH 23/28] Improve code quality

---
 Flow.Launcher/ProgressBoxEx.xaml.cs | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/Flow.Launcher/ProgressBoxEx.xaml.cs b/Flow.Launcher/ProgressBoxEx.xaml.cs
index 37ee2b0cb29..a04ed057685 100644
--- a/Flow.Launcher/ProgressBoxEx.xaml.cs
+++ b/Flow.Launcher/ProgressBoxEx.xaml.cs
@@ -46,12 +46,9 @@ await Application.Current.Dispatcher.InvokeAsync(() =>
             {
                 if (!Application.Current.Dispatcher.CheckAccess())
                 {
-                    await Application.Current.Dispatcher.InvokeAsync(async () =>
+                    await Application.Current.Dispatcher.InvokeAsync(() =>
                     {
-                        if (prgBox != null)
-                        {
-                            await prgBox.CloseAsync();
-                        }
+                        prgBox?.Close();
                     });
                 }
             }
@@ -80,17 +77,6 @@ private void ReportProgress(double progress)
             }
         }
 
-        private async Task CloseAsync()
-        {
-            if (!Application.Current.Dispatcher.CheckAccess())
-            {
-                await Application.Current.Dispatcher.InvokeAsync(Close);
-                return;
-            }
-
-            Close();
-        }
-
         private void KeyEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
         {
             ForceClose();

From 029cb38c61855756cfcc4e75dc833c987bcbc50b Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 11 Jan 2025 13:19:45 +0800
Subject: [PATCH 24/28] Fix progress box action under ui thread

---
 Flow.Launcher/ProgressBoxEx.xaml.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Flow.Launcher/ProgressBoxEx.xaml.cs b/Flow.Launcher/ProgressBoxEx.xaml.cs
index a04ed057685..7c55d62c0e5 100644
--- a/Flow.Launcher/ProgressBoxEx.xaml.cs
+++ b/Flow.Launcher/ProgressBoxEx.xaml.cs
@@ -33,6 +33,15 @@ await Application.Current.Dispatcher.InvokeAsync(() =>
                         prgBox.Show();
                     });
                 }
+                else
+                {
+                    prgBox = new ProgressBoxEx(forceClosed)
+                    {
+                        Title = caption
+                    };
+                    prgBox.TitleTextBlock.Text = caption;
+                    prgBox.Show();
+                }
 
                 await reportProgressAsync(prgBox.ReportProgress).ConfigureAwait(false);
             }
@@ -51,6 +60,10 @@ await Application.Current.Dispatcher.InvokeAsync(() =>
                         prgBox?.Close();
                     });
                 }
+                else
+                {
+                    prgBox?.Close();
+                }
             }
         }
 

From 8eb5a4dfcaa063d647f31e01211a4ef947344849 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sat, 11 Jan 2025 13:24:41 +0800
Subject: [PATCH 25/28] Improve HttpDownloadAsync function & Use it in
 PluginManager plugin

---
 .../JsonRPCV2Models/JsonRPCPublicAPI.cs       |  7 +-
 Flow.Launcher.Infrastructure/Http/Http.cs     | 41 +++++++++-
 Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs |  6 +-
 Flow.Launcher/PublicAPIInstance.cs            |  4 +-
 .../PluginsManager.cs                         | 82 +++++--------------
 5 files changed, 68 insertions(+), 72 deletions(-)

diff --git a/Flow.Launcher.Core/Plugin/JsonRPCV2Models/JsonRPCPublicAPI.cs b/Flow.Launcher.Core/Plugin/JsonRPCV2Models/JsonRPCPublicAPI.cs
index b8bfee591e6..a82cae5d254 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCV2Models/JsonRPCPublicAPI.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCV2Models/JsonRPCPublicAPI.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.CompilerServices;
@@ -121,10 +120,10 @@ public Task<Stream> HttpGetStreamAsync(string url, CancellationToken token = def
             return _api.HttpGetStreamAsync(url, token);
         }
 
-        public Task HttpDownloadAsync([NotNull] string url, [NotNull] string filePath,
+        public Task HttpDownloadAsync([NotNull] string url, [NotNull] string filePath, Action<double> reportProgress = null,
             CancellationToken token = default)
         {
-            return _api.HttpDownloadAsync(url, filePath, token);
+            return _api.HttpDownloadAsync(url, filePath, reportProgress, token);
         }
 
         public void AddActionKeyword(string pluginId, string newActionKeyword)
@@ -162,13 +161,11 @@ public void OpenDirectory(string DirectoryPath, string FileNameOrFilePath = null
             _api.OpenDirectory(DirectoryPath, FileNameOrFilePath);
         }
 
-
         public void OpenUrl(string url, bool? inPrivate = null)
         {
             _api.OpenUrl(url, inPrivate);
         }
 
-
         public void OpenAppUri(string appUri)
         {
             _api.OpenAppUri(appUri);
diff --git a/Flow.Launcher.Infrastructure/Http/Http.cs b/Flow.Launcher.Infrastructure/Http/Http.cs
index 14b8eef4e16..0b5d1b05a1a 100644
--- a/Flow.Launcher.Infrastructure/Http/Http.cs
+++ b/Flow.Launcher.Infrastructure/Http/Http.cs
@@ -83,15 +83,50 @@ var userName when string.IsNullOrEmpty(userName) =>
             }
         }
 
-        public static async Task DownloadAsync([NotNull] string url, [NotNull] string filePath, CancellationToken token = default)
+        public static async Task DownloadAsync([NotNull] string url, [NotNull] string filePath, Action<double> reportProgress = null, CancellationToken token = default)
         {
             try
             {
                 using var response = await client.GetAsync(url, HttpCompletionOption.ResponseHeadersRead, token);
+
                 if (response.StatusCode == HttpStatusCode.OK)
                 {
-                    await using var fileStream = new FileStream(filePath, FileMode.CreateNew);
-                    await response.Content.CopyToAsync(fileStream, token);
+                    var totalBytes = response.Content.Headers.ContentLength ?? -1L;
+                    var canReportProgress = totalBytes != -1;
+
+                    if (canReportProgress && reportProgress != null)
+                    {
+                        await using var contentStream = await response.Content.ReadAsStreamAsync(token);
+                        await using var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true);
+
+                        var buffer = new byte[8192];
+                        long totalRead = 0;
+                        int read;
+                        double progressValue = 0;
+
+                        reportProgress(0);
+
+                        while ((read = await contentStream.ReadAsync(buffer, token)) > 0)
+                        {
+                            await fileStream.WriteAsync(buffer.AsMemory(0, read), token);
+                            totalRead += read;
+
+                            progressValue = totalRead * 100.0 / totalBytes;
+
+                            if (token.IsCancellationRequested)
+                                return;
+                            else
+                                reportProgress(progressValue);
+                        }
+
+                        if (progressValue < 100)
+                            reportProgress(100);
+                    }
+                    else
+                    {
+                        await using var fileStream = new FileStream(filePath, FileMode.CreateNew);
+                        await response.Content.CopyToAsync(fileStream, token);
+                    }
                 }
                 else
                 {
diff --git a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
index c4bfd7033fb..8376fd07ba7 100644
--- a/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
+++ b/Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs
@@ -181,9 +181,13 @@ public interface IPublicAPI
         /// </summary>
         /// <param name="url">URL to download file</param>
         /// <param name="filePath">path to save downloaded file</param>
+        /// <param name="reportProgress">
+        /// Action to report progress. The input of the action is the progress value which is a double value between 0 and 100.
+        /// It will be called if url support range request and the reportProgress is not null.
+        /// </param>
         /// <param name="token">place to store file</param>
         /// <returns>Task showing the progress</returns>
-        Task HttpDownloadAsync([NotNull] string url, [NotNull] string filePath, CancellationToken token = default);
+        Task HttpDownloadAsync([NotNull] string url, [NotNull] string filePath, Action<double> reportProgress = null, CancellationToken token = default);
 
         /// <summary>
         /// Add ActionKeyword for specific plugin
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
index 95d371fb09f..7706a64ba9d 100644
--- a/Flow.Launcher/PublicAPIInstance.cs
+++ b/Flow.Launcher/PublicAPIInstance.cs
@@ -164,8 +164,8 @@ public MatchResult FuzzySearch(string query, string stringToCompare) =>
         public Task<Stream> HttpGetStreamAsync(string url, CancellationToken token = default) =>
             Http.GetStreamAsync(url);
 
-        public Task HttpDownloadAsync([NotNull] string url, [NotNull] string filePath,
-            CancellationToken token = default) => Http.DownloadAsync(url, filePath, token);
+        public Task HttpDownloadAsync([NotNull] string url, [NotNull] string filePath, Action<double> reportProgress = null,
+            CancellationToken token = default) => Http.DownloadAsync(url, filePath, reportProgress, token);
 
         public void AddActionKeyword(string pluginId, string newActionKeyword) =>
             PluginManager.AddActionKeyword(pluginId, newActionKeyword);
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index b6495d8f260..aee76e65ebf 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -17,8 +17,6 @@ namespace Flow.Launcher.Plugin.PluginsManager
 {
     internal class PluginsManager
     {
-        private static readonly HttpClient HttpClient = new();
-
         private const string zip = "zip";
 
         private PluginInitContext Context { get; set; }
@@ -144,75 +142,37 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
 
             var filePath = Path.Combine(Path.GetTempPath(), downloadFilename);
 
-            var downloadCancelled = false;
             var exceptionHappened = false;
             try
             {
+                using var cts = new CancellationTokenSource();
+
                 if (!plugin.IsFromLocalInstallPath)
                 {
                     if (File.Exists(filePath))
                         File.Delete(filePath);
 
-                    using var cts = new CancellationTokenSource();
-                    using var response = await HttpClient.GetAsync(plugin.UrlDownload, HttpCompletionOption.ResponseHeadersRead, cts.Token).ConfigureAwait(false);
-
-                    response.EnsureSuccessStatusCode();
-
-                    var totalBytes = response.Content.Headers.ContentLength ?? -1L;
-                    var canReportProgress = totalBytes != -1;
-
                     var prgBoxTitle = $"{Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin")} {plugin.Name}";
-                    if (canReportProgress)
-                    {
-                        await Context.API.ShowProgressBoxAsync(prgBoxTitle, 
-                            async (reportProgress) =>
+                    await Context.API.ShowProgressBoxAsync(prgBoxTitle,
+                        async (reportProgress) =>
+                        {
+                            if (reportProgress == null)
                             {
-                                if (reportProgress == null)
-                                {
-                                    // when reportProgress is null, it means there is expcetion with the progress box
-                                    // so we record it with exceptionHappened and return so that progress box will close instantly
-                                    exceptionHappened = true;
-                                    return;
-                                }
-                                else
-                                {
-                                    await using var contentStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
-                                    await using var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true);
-
-                                    var buffer = new byte[8192];
-                                    long totalRead = 0;
-                                    int read;
-
-                                    while ((read = await contentStream.ReadAsync(buffer).ConfigureAwait(false)) > 0)
-                                    {
-                                        await fileStream.WriteAsync(buffer.AsMemory(0, read)).ConfigureAwait(false);
-                                        totalRead += read;
-
-                                        var progressValue = totalRead * 100 / totalBytes;
-
-                                        // check if user cancelled download before reporting progress
-                                        if (downloadCancelled)
-                                            return;
-                                        else
-                                            reportProgress(progressValue);
-                                    }
-                                }
-                            }, 
-                            () =>
+                                // when reportProgress is null, it means there is expcetion with the progress box
+                                // so we record it with exceptionHappened and return so that progress box will close instantly
+                                exceptionHappened = true;
+                                return;
+                            }
+                            else
                             {
-                                cts.Cancel();
-                                downloadCancelled = true;
-                            });
-
-                        // if exception happened while downloading and user does not cancel downloading,
-                        // we need to redownload the plugin
-                        if (exceptionHappened && (!downloadCancelled))
-                            await Http.DownloadAsync(plugin.UrlDownload, filePath).ConfigureAwait(false);
-                    }
-                    else
-                    {
-                        await Http.DownloadAsync(plugin.UrlDownload, filePath).ConfigureAwait(false);
-                    }
+                                await Http.DownloadAsync(plugin.UrlDownload, filePath, reportProgress, cts.Token).ConfigureAwait(false);
+                            }
+                        }, cts.Cancel);
+
+                    // if exception happened while downloading and user does not cancel downloading,
+                    // we need to redownload the plugin
+                    if (exceptionHappened && (!cts.IsCancellationRequested))
+                        await Http.DownloadAsync(plugin.UrlDownload, filePath, null, cts.Token).ConfigureAwait(false);
                 }
                 else
                 {
@@ -220,7 +180,7 @@ await Context.API.ShowProgressBoxAsync(prgBoxTitle,
                 }
 
                 // check if user cancelled download before installing plugin
-                if (downloadCancelled)
+                if (cts.IsCancellationRequested)
                     return;
                 else
                     Install(plugin, filePath);

From 1bf045f3e729f39e835bc1a6b3e7f9416a9c5bda Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 19 Jan 2025 15:15:02 +0800
Subject: [PATCH 26/28] Make fileMode usage between progress and non-progress
 paths consistent

---
 Flow.Launcher.Infrastructure/Http/Http.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher.Infrastructure/Http/Http.cs b/Flow.Launcher.Infrastructure/Http/Http.cs
index 0b5d1b05a1a..0b3f2be6557 100644
--- a/Flow.Launcher.Infrastructure/Http/Http.cs
+++ b/Flow.Launcher.Infrastructure/Http/Http.cs
@@ -97,7 +97,7 @@ public static async Task DownloadAsync([NotNull] string url, [NotNull] string fi
                     if (canReportProgress && reportProgress != null)
                     {
                         await using var contentStream = await response.Content.ReadAsStreamAsync(token);
-                        await using var fileStream = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true);
+                        await using var fileStream = new FileStream(filePath, FileMode.CreateNew, FileAccess.Write, FileShare.None, 8192, true);
 
                         var buffer = new byte[8192];
                         long totalRead = 0;

From c32435f2ed741249289d573c5092bbc0e8cb036a Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Sun, 19 Jan 2025 15:44:26 +0800
Subject: [PATCH 27/28] Use api to call download function & Add message box for
 all download operations

---
 .../PluginsManager.cs                         | 129 ++++++++++--------
 1 file changed, 71 insertions(+), 58 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index aee76e65ebf..ce51e8700af 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -142,37 +142,15 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
 
             var filePath = Path.Combine(Path.GetTempPath(), downloadFilename);
 
-            var exceptionHappened = false;
             try
             {
                 using var cts = new CancellationTokenSource();
 
                 if (!plugin.IsFromLocalInstallPath)
                 {
-                    if (File.Exists(filePath))
-                        File.Delete(filePath);
-
-                    var prgBoxTitle = $"{Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin")} {plugin.Name}";
-                    await Context.API.ShowProgressBoxAsync(prgBoxTitle,
-                        async (reportProgress) =>
-                        {
-                            if (reportProgress == null)
-                            {
-                                // when reportProgress is null, it means there is expcetion with the progress box
-                                // so we record it with exceptionHappened and return so that progress box will close instantly
-                                exceptionHappened = true;
-                                return;
-                            }
-                            else
-                            {
-                                await Http.DownloadAsync(plugin.UrlDownload, filePath, reportProgress, cts.Token).ConfigureAwait(false);
-                            }
-                        }, cts.Cancel);
-
-                    // if exception happened while downloading and user does not cancel downloading,
-                    // we need to redownload the plugin
-                    if (exceptionHappened && (!cts.IsCancellationRequested))
-                        await Http.DownloadAsync(plugin.UrlDownload, filePath, null, cts.Token).ConfigureAwait(false);
+                    await DeleteFileAndDownloadMsgBoxAsync(
+                        $"{Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin")} {plugin.Name}",
+                        plugin.UrlDownload, filePath, cts);
                 }
                 else
                 {
@@ -221,6 +199,34 @@ await Context.API.ShowProgressBoxAsync(prgBoxTitle,
             }
         }
 
+        private async Task DeleteFileAndDownloadMsgBoxAsync(string prgBoxTitle, string downloadUrl, string filePath, CancellationTokenSource cts)
+        {
+            if (File.Exists(filePath))
+                File.Delete(filePath);
+
+            var exceptionHappened = false;
+            await Context.API.ShowProgressBoxAsync(prgBoxTitle,
+                async (reportProgress) =>
+                {
+                    if (reportProgress == null)
+                    {
+                        // when reportProgress is null, it means there is expcetion with the progress box
+                        // so we record it with exceptionHappened and return so that progress box will close instantly
+                        exceptionHappened = true;
+                        return;
+                    }
+                    else
+                    {
+                        await Context.API.HttpDownloadAsync(downloadUrl, filePath, reportProgress, cts.Token).ConfigureAwait(false);
+                    }
+                }, cts.Cancel);
+
+            // if exception happened while downloading and user does not cancel downloading,
+            // we need to redownload the plugin
+            if (exceptionHappened && (!cts.IsCancellationRequested))
+                await Context.API.HttpDownloadAsync(downloadUrl, filePath).ConfigureAwait(false);
+        }
+
         internal async ValueTask<List<Result>> RequestUpdateAsync(string search, CancellationToken token,
             bool usePrimaryUrlOnly = false)
         {
@@ -308,43 +314,48 @@ where string.Compare(existingPlugin.Metadata.Version, pluginUpdateSource.Version
 
                             _ = Task.Run(async delegate
                             {
+                                using var cts = new CancellationTokenSource();
+
                                 if (!x.PluginNewUserPlugin.IsFromLocalInstallPath)
                                 {
-                                    if (File.Exists(downloadToFilePath))
-                                    {
-                                        File.Delete(downloadToFilePath);
-                                    }
-
-                                    await Http.DownloadAsync(x.PluginNewUserPlugin.UrlDownload, downloadToFilePath)
-                                        .ConfigureAwait(false);
+                                    await DeleteFileAndDownloadMsgBoxAsync(
+                                        $"{Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin")} {x.PluginNewUserPlugin.Name}",
+                                        x.PluginNewUserPlugin.UrlDownload, downloadToFilePath, cts);
                                 }
                                 else
                                 {
                                     downloadToFilePath = x.PluginNewUserPlugin.LocalInstallPath;
                                 }
 
-
-                                PluginManager.UpdatePlugin(x.PluginExistingMetadata, x.PluginNewUserPlugin,
-                                    downloadToFilePath);
-
-                                if (Settings.AutoRestartAfterChanging)
+                                // check if user cancelled download before installing plugin
+                                if (cts.IsCancellationRequested)
                                 {
-                                    Context.API.ShowMsg(
-                                        Context.API.GetTranslation("plugin_pluginsmanager_update_title"),
-                                        string.Format(
-                                            Context.API.GetTranslation(
-                                                "plugin_pluginsmanager_update_success_restart"),
-                                            x.Name));
-                                    Context.API.RestartApp();
+                                    return;
                                 }
                                 else
                                 {
-                                    Context.API.ShowMsg(
-                                        Context.API.GetTranslation("plugin_pluginsmanager_update_title"),
-                                        string.Format(
-                                            Context.API.GetTranslation(
-                                                "plugin_pluginsmanager_update_success_no_restart"),
-                                            x.Name));
+                                    PluginManager.UpdatePlugin(x.PluginExistingMetadata, x.PluginNewUserPlugin,
+                                        downloadToFilePath);
+
+                                    if (Settings.AutoRestartAfterChanging)
+                                    {
+                                        Context.API.ShowMsg(
+                                            Context.API.GetTranslation("plugin_pluginsmanager_update_title"),
+                                            string.Format(
+                                                Context.API.GetTranslation(
+                                                    "plugin_pluginsmanager_update_success_restart"),
+                                                x.Name));
+                                        Context.API.RestartApp();
+                                    }
+                                    else
+                                    {
+                                        Context.API.ShowMsg(
+                                            Context.API.GetTranslation("plugin_pluginsmanager_update_title"),
+                                            string.Format(
+                                                Context.API.GetTranslation(
+                                                    "plugin_pluginsmanager_update_success_no_restart"),
+                                                x.Name));
+                                    }
                                 }
                             }).ContinueWith(t =>
                             {
@@ -405,16 +416,18 @@ await Task.WhenAll(resultsForUpdate.Select(async plugin =>
 
                             try
                             {
-                                if (File.Exists(downloadToFilePath))
-                                {
-                                    File.Delete(downloadToFilePath);
-                                }
+                                using var cts = new CancellationTokenSource();
 
-                                await Http.DownloadAsync(plugin.PluginNewUserPlugin.UrlDownload, downloadToFilePath)
-                                    .ConfigureAwait(false);
+                                await DeleteFileAndDownloadMsgBoxAsync(
+                                    $"{Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin")} {plugin.PluginNewUserPlugin.Name}",
+                                    plugin.PluginNewUserPlugin.UrlDownload, downloadToFilePath, cts);
 
-                                PluginManager.UpdatePlugin(plugin.PluginExistingMetadata, plugin.PluginNewUserPlugin,
-                                    downloadToFilePath);
+                                // check if user cancelled download before installing plugin
+                                if (cts.IsCancellationRequested)
+                                    return;
+                                else
+                                    PluginManager.UpdatePlugin(plugin.PluginExistingMetadata, plugin.PluginNewUserPlugin,
+                                        downloadToFilePath);
                             }
                             catch (Exception ex)
                             {

From 646bad6deba7d2c7ac671c21d8f85330e78b8911 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 7 Feb 2025 14:15:01 +0800
Subject: [PATCH 28/28] Use parameter for function for readability

---
 .../PluginsManager.cs                         | 55 +++++++++++--------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index ce51e8700af..67148984624 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -148,7 +148,7 @@ internal async Task InstallOrUpdateAsync(UserPlugin plugin)
 
                 if (!plugin.IsFromLocalInstallPath)
                 {
-                    await DeleteFileAndDownloadMsgBoxAsync(
+                    await DownloadFileAsync(
                         $"{Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin")} {plugin.Name}",
                         plugin.UrlDownload, filePath, cts);
                 }
@@ -199,32 +199,39 @@ await DeleteFileAndDownloadMsgBoxAsync(
             }
         }
 
-        private async Task DeleteFileAndDownloadMsgBoxAsync(string prgBoxTitle, string downloadUrl, string filePath, CancellationTokenSource cts)
+        private async Task DownloadFileAsync(string prgBoxTitle, string downloadUrl, string filePath, CancellationTokenSource cts, bool deleteFile = true, bool showProgress = true)
         {
-            if (File.Exists(filePath))
+            if (deleteFile && File.Exists(filePath))
                 File.Delete(filePath);
 
-            var exceptionHappened = false;
-            await Context.API.ShowProgressBoxAsync(prgBoxTitle,
-                async (reportProgress) =>
-                {
-                    if (reportProgress == null)
-                    {
-                        // when reportProgress is null, it means there is expcetion with the progress box
-                        // so we record it with exceptionHappened and return so that progress box will close instantly
-                        exceptionHappened = true;
-                        return;
-                    }
-                    else
+            if (showProgress)
+            {
+                var exceptionHappened = false;
+                await Context.API.ShowProgressBoxAsync(prgBoxTitle,
+                    async (reportProgress) =>
                     {
-                        await Context.API.HttpDownloadAsync(downloadUrl, filePath, reportProgress, cts.Token).ConfigureAwait(false);
-                    }
-                }, cts.Cancel);
+                        if (reportProgress == null)
+                        {
+                            // when reportProgress is null, it means there is expcetion with the progress box
+                            // so we record it with exceptionHappened and return so that progress box will close instantly
+                            exceptionHappened = true;
+                            return;
+                        }
+                        else
+                        {
+                            await Context.API.HttpDownloadAsync(downloadUrl, filePath, reportProgress, cts.Token).ConfigureAwait(false);
+                        }
+                    }, cts.Cancel);
 
-            // if exception happened while downloading and user does not cancel downloading,
-            // we need to redownload the plugin
-            if (exceptionHappened && (!cts.IsCancellationRequested))
-                await Context.API.HttpDownloadAsync(downloadUrl, filePath).ConfigureAwait(false);
+                // if exception happened while downloading and user does not cancel downloading,
+                // we need to redownload the plugin
+                if (exceptionHappened && (!cts.IsCancellationRequested))
+                    await Context.API.HttpDownloadAsync(downloadUrl, filePath, token: cts.Token).ConfigureAwait(false);
+            }
+            else
+            {
+                await Context.API.HttpDownloadAsync(downloadUrl, filePath, token: cts.Token).ConfigureAwait(false);
+            }
         }
 
         internal async ValueTask<List<Result>> RequestUpdateAsync(string search, CancellationToken token,
@@ -318,7 +325,7 @@ where string.Compare(existingPlugin.Metadata.Version, pluginUpdateSource.Version
 
                                 if (!x.PluginNewUserPlugin.IsFromLocalInstallPath)
                                 {
-                                    await DeleteFileAndDownloadMsgBoxAsync(
+                                    await DownloadFileAsync(
                                         $"{Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin")} {x.PluginNewUserPlugin.Name}",
                                         x.PluginNewUserPlugin.UrlDownload, downloadToFilePath, cts);
                                 }
@@ -418,7 +425,7 @@ await Task.WhenAll(resultsForUpdate.Select(async plugin =>
                             {
                                 using var cts = new CancellationTokenSource();
 
-                                await DeleteFileAndDownloadMsgBoxAsync(
+                                await DownloadFileAsync(
                                     $"{Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin")} {plugin.PluginNewUserPlugin.Name}",
                                     plugin.PluginNewUserPlugin.UrlDownload, downloadToFilePath, cts);