Merge branch 'dev' into administrator_mode

Author: Jack251970

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
-    <!-- Work around https://github.com/dotnet/runtime/issues/109682 -->
+    <!-- Workaround https://github.com/dotnet/runtime/issues/109682 -->
     <CETCompat>false</CETCompat>
   </PropertyGroup>
 </Project>

Flow.Launcher.Core/Plugin/IResultUpdateRegister.cs

@@ -0,0 +1,12 @@
+using Flow.Launcher.Plugin;
+
+namespace Flow.Launcher.Core.Plugin;
+
+public interface IResultUpdateRegister
+{
+    /// <summary>
+    /// Register a plugin to receive results updated event.
+    /// </summary>
+    /// <param name="pair"></param>
+    void RegisterResultsUpdatedEvent(PluginPair pair);
+}

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -48,7 +48,7 @@ public static List<PluginPair> Plugins(List<PluginMetadata> metadatas, PluginsSe
             return plugins;
         }
 
-        private static IEnumerable<PluginPair> DotNetPlugins(List<PluginMetadata> source)
+        private static List<PluginPair> DotNetPlugins(List<PluginMetadata> source)
         {
             var erroredPlugins = new List<string>();
 
@@ -58,55 +58,57 @@ private static IEnumerable<PluginPair> DotNetPlugins(List<PluginMetadata> source
             foreach (var metadata in metadatas)
             {
                 var milliseconds = PublicApi.Instance.StopwatchLogDebug(ClassName, $"Constructor init cost for {metadata.Name}", () =>
-                    {
-                        Assembly assembly = null;
-                        IAsyncPlugin plugin = null;
+                {
+                    Assembly assembly = null;
+                    IAsyncPlugin plugin = null;
 
-                        try
-                        {
-                            var assemblyLoader = new PluginAssemblyLoader(metadata.ExecuteFilePath);
-                            assembly = assemblyLoader.LoadAssemblyAndDependencies();
+                    try
+                    {
+                        var assemblyLoader = new PluginAssemblyLoader(metadata.ExecuteFilePath);
+                        assembly = assemblyLoader.LoadAssemblyAndDependencies();
 
-                            var type = assemblyLoader.FromAssemblyGetTypeOfInterface(assembly,
-                                typeof(IAsyncPlugin));
+                        var type = assemblyLoader.FromAssemblyGetTypeOfInterface(assembly,
+                            typeof(IAsyncPlugin));
 
-                            plugin = Activator.CreateInstance(type) as IAsyncPlugin;
+                        plugin = Activator.CreateInstance(type) as IAsyncPlugin;
 
-                            metadata.AssemblyName = assembly.GetName().Name;
-                        }
+                        metadata.AssemblyName = assembly.GetName().Name;
+                    }
 #if DEBUG
-                        catch (Exception)
-                        {
-                            throw;
-                        }
+                    catch (Exception)
+                    {
+                        throw;
+                    }
 #else
-                        catch (Exception e) when (assembly == null)
-                        {
-                            PublicApi.Instance.LogException(ClassName, $"Couldn't load assembly for the plugin: {metadata.Name}", e);
-                        }
-                        catch (InvalidOperationException e)
-                        {
-                            PublicApi.Instance.LogException(ClassName, $"Can't find the required IPlugin interface for the plugin: <{metadata.Name}>", e);
-                        }
-                        catch (ReflectionTypeLoadException e)
-                        {
-                            PublicApi.Instance.LogException(ClassName, $"The GetTypes method was unable to load assembly types for the plugin: <{metadata.Name}>", e);
-                        }
-                        catch (Exception e)
-                        {
-                            PublicApi.Instance.LogException(ClassName, $"The following plugin has errored and can not be loaded: <{metadata.Name}>", e);
-                        }
+                    catch (Exception e) when (assembly == null)
+                    {
+                        PublicApi.Instance.LogException(ClassName, $"Couldn't load assembly for the plugin: {metadata.Name}", e);
+                    }
+                    catch (InvalidOperationException e)
+                    {
+                        PublicApi.Instance.LogException(ClassName, $"Can't find the required IPlugin interface for the plugin: <{metadata.Name}>", e);
+                    }
+                    catch (ReflectionTypeLoadException e)
+                    {
+                        PublicApi.Instance.LogException(ClassName, $"The GetTypes method was unable to load assembly types for the plugin: <{metadata.Name}>", e);
+                    }
+                    catch (Exception e)
+                    {
+                        PublicApi.Instance.LogException(ClassName, $"The following plugin has errored and can not be loaded: <{metadata.Name}>", e);
+                    }
 #endif
 
-                        if (plugin == null)
-                        {
-                            erroredPlugins.Add(metadata.Name);
-                            return;
-                        }
+                    if (plugin == null)
+                    {
+                        erroredPlugins.Add(metadata.Name);
+                        return;
+                    }
+
+                    plugins.Add(new PluginPair { Plugin = plugin, Metadata = metadata });
+                });
 
-                        plugins.Add(new PluginPair { Plugin = plugin, Metadata = metadata });
-                    });
                 metadata.InitTime += milliseconds;
+                PublicApi.Instance.LogDebug(ClassName, $"Constructor cost for <{metadata.Name}> is <{metadata.InitTime}ms>");
             }
 
             if (erroredPlugins.Count > 0)

Flow.Launcher.Core/Plugin/PluginsLoader.cs

@@ -377,6 +377,22 @@ public static void UpdatePluginMetadataTranslations()
             }
         }
 
+        public static void UpdatePluginMetadataTranslation(PluginPair p)
+        {
+            // Update plugin metadata name & description
+            if (p.Plugin is not IPluginI18n pluginI18N) return;
+            try
+            {
+                p.Metadata.Name = pluginI18N.GetTranslatedPluginTitle();
+                p.Metadata.Description = pluginI18N.GetTranslatedPluginDescription();
+                pluginI18N.OnCultureInfoChanged(CultureInfo.CurrentCulture);
+            }
+            catch (Exception e)
+            {
+                PublicApi.Instance.LogException(ClassName, $"Failed for <{p.Metadata.Name}>", e);
+            }
+        }
+
         #endregion
 
         #region IDisposable

Flow.Launcher.Core/Resource/Internationalization.cs

@@ -13,6 +13,7 @@
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.UI.Accessibility;
+using System.Collections.Concurrent;
 
 namespace Flow.Launcher.Infrastructure.DialogJump
 {
@@ -60,12 +61,12 @@ public static class DialogJump
 
         private static HWND _mainWindowHandle = HWND.Null;
 
-        private static readonly Dictionary<DialogJumpExplorerPair, IDialogJumpExplorerWindow> _dialogJumpExplorers = new();
+        private static readonly ConcurrentDictionary<DialogJumpExplorerPair, IDialogJumpExplorerWindow> _dialogJumpExplorers = new();
 
         private static DialogJumpExplorerPair _lastExplorer = null;
         private static readonly Lock _lastExplorerLock = new();
 
-        private static readonly Dictionary<DialogJumpDialogPair, IDialogJumpDialogWindow> _dialogJumpDialogs = new();
+        private static readonly ConcurrentDictionary<DialogJumpDialogPair, IDialogJumpDialogWindow> _dialogJumpDialogs = new();
 
         private static IDialogJumpDialogWindow _dialogWindow = null;
         private static readonly Lock _dialogWindowLock = new();
@@ -101,22 +102,13 @@ public static class DialogJump
 
         #region Initialize & Setup
 
-        public static void InitializeDialogJump(IList<DialogJumpExplorerPair> dialogJumpExplorers,
-            IList<DialogJumpDialogPair> dialogJumpDialogs)
+        public static void InitializeDialogJump()
         {
             if (_initialized) return;
 
-            // Initialize Dialog Jump explorers & dialogs
-            _dialogJumpExplorers.Add(WindowsDialogJumpExplorer, null);
-            foreach (var explorer in dialogJumpExplorers)
-            {
-                _dialogJumpExplorers.Add(explorer, null);
-            }
-            _dialogJumpDialogs.Add(WindowsDialogJumpDialog, null);
-            foreach (var dialog in dialogJumpDialogs)
-            {
-                _dialogJumpDialogs.Add(dialog, null);
-            }
+            // Initialize preinstalled Dialog Jump explorers & dialogs
+            _dialogJumpExplorers.TryAdd(WindowsDialogJumpExplorer, null);
+            _dialogJumpDialogs.TryAdd(WindowsDialogJumpDialog, null);
 
             // Initialize main window handle
             _mainWindowHandle = Win32Helper.GetMainWindowHandle();
@@ -131,6 +123,29 @@ public static void InitializeDialogJump(IList<DialogJumpExplorerPair> dialogJump
             _initialized = true;
         }
 
+        public static void InitializeDialogJumpPlugin(PluginPair pair)
+        {
+            // Add Dialog Jump explorers & dialogs
+            if (pair.Plugin is IDialogJumpExplorer explorer)
+            {
+                var dialogJumpExplorer = new DialogJumpExplorerPair
+                {
+                    Plugin = explorer,
+                    Metadata = pair.Metadata
+                };
+                _dialogJumpExplorers.TryAdd(dialogJumpExplorer, null);
+            }
+            if (pair.Plugin is IDialogJumpDialog dialog)
+            {
+                var dialogJumpDialog = new DialogJumpDialogPair
+                {
+                    Plugin = dialog,
+                    Metadata = pair.Metadata
+                };
+                _dialogJumpDialogs.TryAdd(dialogJumpDialog, null);
+            }
+        }
+
         public static void SetupDialogJump(bool enabled)
         {
             if (enabled == _enabled) return;
@@ -828,9 +843,25 @@ private static bool CheckPath(string path, out bool file)
                     return true;
                 }
                 // file: URI paths
-                var localPath = path.StartsWith("file:", StringComparison.OrdinalIgnoreCase)
-                    ? new Uri(path).LocalPath
-                    : path;
+                string localPath;
+                if (path.StartsWith("file:", StringComparison.OrdinalIgnoreCase))
+                {
+                    // Try to create a URI from the path
+                    if (Uri.TryCreate(path, UriKind.Absolute, out var uri))
+                    {
+                        localPath = uri.LocalPath;
+                    }
+                    else
+                    {
+                        // If URI creation fails, treat it as a regular path
+                        // by removing the "file:" prefix
+                        localPath = path.Substring(5);
+                    }
+                }
+                else
+                {
+                    localPath = path;
+                }
                 // Is folder?
                 var isFolder = Directory.Exists(localPath);
                 // Is file?

Flow.Launcher.Infrastructure/DialogJump/DialogJump.cs

@@ -7,6 +7,7 @@
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Infrastructure.Storage;
+using Flow.Launcher.Localization.Attributes;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Plugin.SharedModels;
 
@@ -515,6 +516,21 @@ public bool ShowAtTopmost
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public LastQueryMode LastQueryMode { get; set; } = LastQueryMode.Selected;
 
+        private HistoryStyle _historyStyle = HistoryStyle.Query;
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public HistoryStyle HistoryStyle
+        {
+            get => _historyStyle;
+            set
+            {
+                if (_historyStyle != value)
+                {
+                    _historyStyle = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         [JsonConverter(typeof(JsonStringEnumConverter))]
         public AnimationSpeeds AnimationSpeed { get; set; } = AnimationSpeeds.Medium;
         public int CustomAnimationLength { get; set; } = 360;
@@ -697,4 +713,14 @@ public enum DialogJumpFileResultBehaviours
         FullPathOpen,
         Directory
     }
+
+    [EnumLocalize]
+    public enum HistoryStyle
+    {
+        [EnumLocalizeKey(nameof(Localize.queryHistory))]
+        Query,
+
+        [EnumLocalizeKey(nameof(Localize.executedHistory))]
+        LastOpened
+    }
 }

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -182,9 +182,21 @@ public interface IPublicAPI
         /// <summary>
         /// Get all loaded plugins
         /// </summary>
+        /// <remarks>
+        /// Will also return any plugins not fully initialized yet
+        /// </remarks>
         /// <returns></returns>
         List<PluginPair> GetAllPlugins();
 
+        /// <summary>
+        /// Get all initialized plugins
+        /// </summary>
+        /// <param name="includeFailed">
+        /// Whether to include plugins that failed to initialize
+        /// </param>
+        /// <returns></returns>
+        List<PluginPair> GetAllInitializedPlugins(bool includeFailed);
+
         /// <summary>
         /// Registers a callback function for global keyboard events.
         /// </summary>