prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Await Update when manifest is not ready

Browse source
This commit is contained in:
弘韬 张 2021-01-29 11:37:26 +08:00
parent 5d894ec154
commit 89453f441d
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Plugins/Flow.Launcher.Plugin.PluginsManager/Main.cs
View file

@ -88,7 +88,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
{ {
var s when s.StartsWith(Settings.HotKeyInstall) => await pluginManager.RequestInstallOrUpdate(s, token), 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.HotkeyUninstall) => pluginManager.RequestUninstall(s),
var s when s.StartsWith(Settings.HotkeyUpdate) => pluginManager.RequestUpdate(s), var s when s.StartsWith(Settings.HotkeyUpdate) => await pluginManager.RequestUpdate(s, token),
_ => pluginManager.GetDefaultHotKeys().Where(hotkey => _ => pluginManager.GetDefaultHotKeys().Where(hotkey =>
{ {
hotkey.Score = StringMatcher.FuzzySearch(search, hotkey.Title).Score; hotkey.Score = StringMatcher.FuzzySearch(search, hotkey.Title).Score;

16
Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
View file

@ -149,8 +149,19 @@ namespace Flow.Launcher.Plugin.PluginsManager
Context.API.RestartApp(); Context.API.RestartApp();
} }
internal List<Result> RequestUpdate(string search) internal async ValueTask<List<Result>> RequestUpdate(string search, CancellationToken token)
{ {
if (!pluginsManifest.UserPlugins.Any() &&
_downloadManifestTask.Status != TaskStatus.Running)
{
_downloadManifestTask = pluginsManifest.DownloadManifest();
}
await _downloadManifestTask;
token.ThrowIfCancellationRequested();
var autocompletedResults = AutoCompleteReturnAllResults(search, var autocompletedResults = AutoCompleteReturnAllResults(search,
Settings.HotkeyUpdate, Settings.HotkeyUpdate,
"Update", "Update",
@ -286,8 +297,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
await _downloadManifestTask; await _downloadManifestTask;
if (token.IsCancellationRequested) token.ThrowIfCancellationRequested();
return null;
var searchNameWithoutKeyword = searchName.Replace(Settings.HotKeyInstall, string.Empty).Trim(); var searchNameWithoutKeyword = searchName.Replace(Settings.HotKeyInstall, string.Empty).Trim();