From d203a7a5f3d374b62a752878b4156be2de095c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=BC=98=E9=9F=AC?= <hongtao_zhang@outlook.com>
Date: Sun, 17 Jan 2021 18:42:01 +0800
Subject: [PATCH] Add Cancellation Token

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

diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs
index 1bea7d1be..1d473a82a 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs
@@ -70,7 +70,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
             return search switch
             {
-                var s when s.StartsWith(Settings.HotKeyInstall) => await pluginManager.RequestInstallOrUpdate(s),
+                var s when s.StartsWith(Settings.HotKeyInstall) => await pluginManager.RequestInstallOrUpdate(s, token),
                 var s when s.StartsWith(Settings.HotkeyUninstall) => pluginManager.RequestUninstall(s),
                 var s when s.StartsWith(Settings.HotkeyUpdate) => pluginManager.RequestUpdate(s),
                 _ => pluginManager.GetDefaultHotKeys().Where(hotkey =>
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index a02cce339..06e97438e 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -276,13 +276,18 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
         private Task _downloadManifestTask = Task.CompletedTask;
 
-        internal async ValueTask<List<Result>> RequestInstallOrUpdate(string searchName)
+        internal async ValueTask<List<Result>> RequestInstallOrUpdate(string searchName, CancellationToken token)
         {
-            if (!pluginsManifest.UserPlugins.Any() && _downloadManifestTask.IsCompleted)
+            if (!pluginsManifest.UserPlugins.Any() &&
+                _downloadManifestTask.IsCompleted ||
+                _downloadManifestTask.IsFaulted)
                 _downloadManifestTask = pluginsManifest.DownloadManifest();
 
             await _downloadManifestTask;
 
+            if (token.IsCancellationRequested)
+                return null;
+            
             var searchNameWithoutKeyword = searchName.Replace(Settings.HotKeyInstall, string.Empty).Trim();
 
             var results =