Merge branch 'dev' into sys_plugin_improvement

Author: Jack251970

Flow.Launcher.Core/Configuration/Portable.cs

@@ -45,8 +45,7 @@ public void DisablePortableMode()
 #endif
                 IndicateDeletion(DataLocation.PortableDataPath);
 
-                API.ShowMsgBox("Flow Launcher needs to restart to finish disabling portable mode, " +
-                    "after the restart your portable data profile will be deleted and roaming data profile kept");
+                API.ShowMsgBox(API.GetTranslation("restartToDisablePortableMode"));
 
                 UpdateManager.RestartApp(Constant.ApplicationFileName);
             }
@@ -69,8 +68,7 @@ public void EnablePortableMode()
 #endif
                 IndicateDeletion(DataLocation.RoamingDataPath);
 
-                API.ShowMsgBox("Flow Launcher needs to restart to finish enabling portable mode, " +
-                    "after the restart your roaming data profile will be deleted and portable data profile kept");
+                API.ShowMsgBox(API.GetTranslation("restartToEnablePortableMode"));
 
                 UpdateManager.RestartApp(Constant.ApplicationFileName);
             }
@@ -154,9 +152,8 @@ public void PreStartCleanUpAfterPortabilityUpdate()
             {
                 FilesFolders.RemoveFolderIfExists(roamingDataDir, (s) => API.ShowMsgBox(s));
 
-                if (API.ShowMsgBox("Flow Launcher has detected you enabled portable mode, " +
-                                    "would you like to move it to a different location?", string.Empty,
-                                    MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+                if (API.ShowMsgBox(API.GetTranslation("moveToDifferentLocation"), 
+                    string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.Yes)
                 {
                     FilesFolders.OpenPath(Constant.RootDirectory, (s) => API.ShowMsgBox(s));
 
@@ -169,8 +166,7 @@ public void PreStartCleanUpAfterPortabilityUpdate()
             {
                 FilesFolders.RemoveFolderIfExists(portableDataDir, (s) => API.ShowMsgBox(s));
 
-                API.ShowMsgBox("Flow Launcher has detected you disabled portable mode, " +
-                                    "the relevant shortcuts and uninstaller entry have been created");
+                API.ShowMsgBox(API.GetTranslation("shortcutsUninstallerCreated"));
             }
         }
 
@@ -181,9 +177,8 @@ public bool CanUpdatePortability()
 
             if (roamingLocationExists && portableLocationExists)
             {
-                API.ShowMsgBox(string.Format("Flow Launcher detected your user data exists both in {0} and " +
-                                    "{1}. {2}{2}Please delete {1} in order to proceed. No changes have occurred.", 
-                                    DataLocation.PortableDataPath, DataLocation.RoamingDataPath, Environment.NewLine));
+                API.ShowMsgBox(string.Format(API.GetTranslation("userDataDuplicated"), 
+                    DataLocation.PortableDataPath, DataLocation.RoamingDataPath, Environment.NewLine));
 
                 return false;
             }

Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs

@@ -22,6 +22,10 @@ public static class PluginsManifest
         private static DateTime lastFetchedAt = DateTime.MinValue;
         private static readonly TimeSpan fetchTimeout = TimeSpan.FromMinutes(2);
 
+        // We should not initialize API in static constructor because it will create another API instance
+        private static IPublicAPI api = null;
+        private static IPublicAPI API => api ??= Ioc.Default.GetRequiredService<IPublicAPI>();
+
         public static List<UserPlugin> UserPlugins { get; private set; }
 
         public static async Task<bool> UpdateManifestAsync(bool usePrimaryUrlOnly = false, CancellationToken token = default)
@@ -46,7 +50,7 @@ public static async Task<bool> UpdateManifestAsync(bool usePrimaryUrlOnly = fals
             }
             catch (Exception e)
             {
-                Ioc.Default.GetRequiredService<IPublicAPI>().LogException(ClassName, "Http request failed", e);
+                API.LogException(ClassName, "Http request failed", e);
             }
             finally
             {

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
@@ -9,6 +9,7 @@
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.Core.ExternalPlugins;
 using Flow.Launcher.Infrastructure;
+using Flow.Launcher.Infrastructure.DialogJump;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedCommands;
@@ -40,6 +41,9 @@ public static class PluginManager
         private static IEnumerable<PluginPair> _resultUpdatePlugin;
         private static IEnumerable<PluginPair> _translationPlugins;
 
+        private static readonly List<DialogJumpExplorerPair> _dialogJumpExplorerPlugins = new();
+        private static readonly List<DialogJumpDialogPair> _dialogJumpDialogPlugins = new();
+
         /// <summary>
         /// Directories that will hold Flow Launcher plugin directory
         /// </summary>
@@ -186,6 +190,24 @@ public static void LoadPlugins(PluginsSettings settings)
             _homePlugins = GetPluginsForInterface<IAsyncHomeQuery>();
             _resultUpdatePlugin = GetPluginsForInterface<IResultUpdated>();
             _translationPlugins = GetPluginsForInterface<IPluginI18n>();
+
+            // Initialize Dialog Jump plugin pairs
+            foreach (var pair in GetPluginsForInterface<IDialogJumpExplorer>())
+            {
+                _dialogJumpExplorerPlugins.Add(new DialogJumpExplorerPair
+                {
+                    Plugin = (IDialogJumpExplorer)pair.Plugin,
+                    Metadata = pair.Metadata
+                });
+            }
+            foreach (var pair in GetPluginsForInterface<IDialogJumpDialog>())
+            {
+                _dialogJumpDialogPlugins.Add(new DialogJumpDialogPair
+                {
+                    Plugin = (IDialogJumpDialog)pair.Plugin,
+                    Metadata = pair.Metadata
+                });
+            }
         }
 
         private static void UpdatePluginDirectory(List<PluginMetadata> metadatas)
@@ -288,20 +310,24 @@ public static async Task InitializePluginsAsync()
             }
         }
 
-        public static ICollection<PluginPair> ValidPluginsForQuery(Query query)
+        public static ICollection<PluginPair> ValidPluginsForQuery(Query query, bool dialogJump)
         {
             if (query is null)
                 return Array.Empty<PluginPair>();
 
             if (!NonGlobalPlugins.TryGetValue(query.ActionKeyword, out var plugin))
             {
-                return GlobalPlugins.Where(p => !PluginModified(p.Metadata.ID)).ToList();
+                if (dialogJump)
+                    return GlobalPlugins.Where(p => p.Plugin is IAsyncDialogJump && !PluginModified(p.Metadata.ID)).ToList();
+                else
+                    return GlobalPlugins.Where(p => !PluginModified(p.Metadata.ID)).ToList();
             }
 
+            if (dialogJump && plugin.Plugin is not IAsyncDialogJump)
+                return Array.Empty<PluginPair>();
+
             if (API.PluginModified(plugin.Metadata.ID))
-            {
                 return Array.Empty<PluginPair>();
-            }
 
             return new List<PluginPair>
             {
@@ -388,6 +414,36 @@ public static async Task<List<Result>> QueryHomeForPluginAsync(PluginPair pair,
             return results;
         }
 
+        public static async Task<List<DialogJumpResult>> QueryDialogJumpForPluginAsync(PluginPair pair, Query query, CancellationToken token)
+        {
+            var results = new List<DialogJumpResult>();
+            var metadata = pair.Metadata;
+
+            try
+            {
+                var milliseconds = await API.StopwatchLogDebugAsync(ClassName, $"Cost for {metadata.Name}",
+                    async () => results = await ((IAsyncDialogJump)pair.Plugin).QueryDialogJumpAsync(query, token).ConfigureAwait(false));
+
+                token.ThrowIfCancellationRequested();
+                if (results == null)
+                    return null;
+                UpdatePluginMetadata(results, metadata, query);
+
+                token.ThrowIfCancellationRequested();
+            }
+            catch (OperationCanceledException)
+            {
+                // null will be fine since the results will only be added into queue if the token hasn't been cancelled
+                return null;
+            }
+            catch (Exception e)
+            {
+                API.LogException(ClassName, $"Failed to query Dialog Jump for plugin: {metadata.Name}", e);
+                return null;
+            }
+            return results;
+        }
+
         public static void UpdatePluginMetadata(IReadOnlyList<Result> results, PluginMetadata metadata, Query query)
         {
             foreach (var r in results)
@@ -463,6 +519,16 @@ public static bool IsHomePlugin(string id)
             return _homePlugins.Where(p => !PluginModified(p.Metadata.ID)).Any(p => p.Metadata.ID == id);
         }
 
+        public static IList<DialogJumpExplorerPair> GetDialogJumpExplorers()
+        {
+            return _dialogJumpExplorerPlugins.Where(p => !PluginModified(p.Metadata.ID)).ToList();
+        }
+
+        public static IList<DialogJumpDialogPair> GetDialogJumpDialogs()
+        {
+            return _dialogJumpDialogPlugins.Where(p => !PluginModified(p.Metadata.ID)).ToList();
+        }
+
         public static bool ActionKeywordRegistered(string actionKeyword)
         {
             // this method is only checking for action keywords (defined as not '*') registration
@@ -719,7 +785,7 @@ internal static async Task<bool> UninstallPluginAsync(PluginMetadata plugin, boo
                 catch (Exception e)
                 {
                     API.LogException(ClassName, $"Failed to delete plugin settings folder for {plugin.Name}", e);
-                    API.ShowMsg(API.GetTranslation("failedToRemovePluginSettingsTitle"),
+                    API.ShowMsgError(API.GetTranslation("failedToRemovePluginSettingsTitle"),
                         string.Format(API.GetTranslation("failedToRemovePluginSettingsMessage"), plugin.Name));
                 }
             }
@@ -735,7 +801,7 @@ internal static async Task<bool> UninstallPluginAsync(PluginMetadata plugin, boo
                 catch (Exception e)
                 {
                     API.LogException(ClassName, $"Failed to delete plugin cache folder for {plugin.Name}", e);
-                    API.ShowMsg(API.GetTranslation("failedToRemovePluginCacheTitle"),
+                    API.ShowMsgError(API.GetTranslation("failedToRemovePluginCacheTitle"),
                         string.Format(API.GetTranslation("failedToRemovePluginCacheMessage"), plugin.Name));
                 }
                 Settings.RemovePluginSettings(plugin.ID);

Flow.Launcher.Core/Plugin/PluginsLoader.cs

@@ -120,15 +120,15 @@ private static IEnumerable<PluginPair> DotNetPlugins(List<PluginMetadata> source
             {
                 var errorPluginString = string.Join(Environment.NewLine, erroredPlugins);
 
-                var errorMessage = "The following "
-                                   + (erroredPlugins.Count > 1 ? "plugins have " : "plugin has ")
-                                   + "errored and cannot be loaded:";
+                var errorMessage = erroredPlugins.Count > 1 ?
+                    API.GetTranslation("pluginsHaveErrored") :
+                    API.GetTranslation("pluginHasErrored");
 
                 _ = Task.Run(() =>
                 {
-                    Ioc.Default.GetRequiredService<IPublicAPI>().ShowMsgBox($"{errorMessage}{Environment.NewLine}{Environment.NewLine}" +
+                    API.ShowMsgBox($"{errorMessage}{Environment.NewLine}{Environment.NewLine}" +
                                     $"{errorPluginString}{Environment.NewLine}{Environment.NewLine}" +
-                                    $"Please refer to the logs for more information", "",
+                                    API.GetTranslation("referToLogs"), string.Empty,
                         MessageBoxButton.OK, MessageBoxImage.Warning);
                 });
             }

Flow.Launcher.Core/Resource/Internationalization.cs

@@ -214,7 +214,7 @@ public bool PromptShouldUsePinyin(string languageCodeToSet)
             // "Do you want to search with pinyin?"
             string text = languageToSet == AvailableLanguages.Chinese ? "是否启用拼音搜索？" : "是否啓用拼音搜索？" ;
 
-            if (Ioc.Default.GetRequiredService<IPublicAPI>().ShowMsgBox(text, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
+            if (API.ShowMsgBox(text, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.No)
                 return false;
 
             return true;

Flow.Launcher.Core/Updater.cs

@@ -111,7 +111,7 @@ public async Task UpdateAppAsync(bool silentUpdate = true)
                 }
 
                 if (!silentUpdate)
-                    _api.ShowMsg(_api.GetTranslation("update_flowlauncher_fail"),
+                    _api.ShowMsgError(_api.GetTranslation("update_flowlauncher_fail"),
                         _api.GetTranslation("update_flowlauncher_check_connection"));
             }
             finally