Merge remote-tracking branch 'origin/dev' into ExplorerPathActionkeyword

Flow.Launcher.Core/Plugin/JsonPRCModel.cs

@@ -51,8 +51,10 @@ namespace Flow.Launcher.Core.Plugin
 
     public class JsonRPCRequestModel : JsonRPCModelBase
     {
+        [JsonPropertyName("method")]
         public string Method { get; set; }
 
+        [JsonPropertyName("parameters")]
         public object[] Parameters { get; set; }
 
         public override string ToString()

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -21,8 +21,8 @@ namespace Flow.Launcher.Core.Plugin
         private static IEnumerable<PluginPair> _contextMenuPlugins;
 
         public static List<PluginPair> AllPlugins { get; private set; }
-        public static readonly List<PluginPair> GlobalPlugins = new List<PluginPair>();
-        public static readonly Dictionary<string, PluginPair> NonGlobalPlugins = new Dictionary<string, PluginPair>();
+        public static readonly HashSet<PluginPair> GlobalPlugins = new();
+        public static readonly Dictionary<string, PluginPair> NonGlobalPlugins = new ();
 
         public static IPublicAPI API { private set; get; }
 
@@ -118,7 +118,9 @@ namespace Flow.Launcher.Core.Plugin
             _contextMenuPlugins = GetPluginsForInterface<IContextMenu>();
             foreach (var plugin in AllPlugins)
             {
-                foreach (var actionKeyword in plugin.Metadata.ActionKeywords)
+                // set distinct on each plugin's action keywords helps only firing global(*) and action keywords once where a plugin
+                // has multiple global and action keywords because we will only add them here once.
+                foreach (var actionKeyword in plugin.Metadata.ActionKeywords.Distinct())
                 {
                     switch (actionKeyword)
                     {
@@ -141,7 +143,7 @@ namespace Flow.Launcher.Core.Plugin
             }
         }
 
-        public static List<PluginPair> ValidPluginsForQuery(Query query)
+        public static ICollection<PluginPair> ValidPluginsForQuery(Query query)
         {
             if (NonGlobalPlugins.ContainsKey(query.ActionKeyword))
             {
@@ -283,9 +285,7 @@ namespace Flow.Launcher.Core.Plugin
             if (oldActionkeyword == Query.GlobalPluginWildcardSign
                 && // Plugins may have multiple ActionKeywords that are global, eg. WebSearch
                 plugin.Metadata.ActionKeywords
-                    .Where(x => x == Query.GlobalPluginWildcardSign)
-                    .ToList()
-                    .Count == 1)
+                    .Count(x => x == Query.GlobalPluginWildcardSign) == 1)
             {
                 GlobalPlugins.Remove(plugin);
             }

Flow.Launcher.Infrastructure/UserSettings/PluginSettings.cs

@@ -30,6 +30,11 @@ namespace Flow.Launcher.Infrastructure.UserSettings
                         metadata.ActionKeywords = settings.ActionKeywords;
                         metadata.ActionKeyword = settings.ActionKeywords[0];
                     }
+                    else
+                    {
+                        metadata.ActionKeywords = new List<string>();
+                        metadata.ActionKeyword = string.Empty;
+                    }
                     metadata.Disabled = settings.Disabled;
                     metadata.Priority = settings.Priority;
                 }

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -494,21 +494,16 @@ namespace Flow.Launcher.ViewModel
                         }
                     }, currentCancellationToken);
 
-                    Task[] tasks = new Task[plugins.Count];
+                    // plugins is ICollection, meaning LINQ will get the Count and preallocate Array
+
+                    Task[] tasks = plugins.Select(plugin => plugin.Metadata.Disabled switch
+                    {
+                        false => QueryTask(plugin),
+                        true => Task.CompletedTask
+                    }).ToArray();
+
                     try
                     {
-                        for (var i = 0; i < plugins.Count; i++)
-                        {
-                            if (!plugins[i].Metadata.Disabled)
-                            {
-                                tasks[i] = QueryTask(plugins[i]);
-                            }
-                            else
-                            {
-                                tasks[i] = Task.CompletedTask; // Avoid Null
-                            }
-                        }
-
                         // Check the code, WhenAll will translate all type of IEnumerable or Collection to Array, so make an array at first
                         await Task.WhenAll(tasks);
                     }

Flow.Launcher/ViewModel/PluginViewModel.cs

@@ -1,7 +1,6 @@
 using System.Windows;
 using System.Windows.Media;
 using Flow.Launcher.Plugin;
-using Flow.Launcher.Core.Resource;
 using Flow.Launcher.Infrastructure.Image;
 using Flow.Launcher.Core.Plugin;
 
@@ -11,8 +10,6 @@ namespace Flow.Launcher.ViewModel
     {
         public PluginPair PluginPair { get; set; }
 
-        private readonly Internationalization _translator = InternationalizationManager.Instance;
-
         public ImageSource Image => ImageLoader.Load(PluginPair.Metadata.IcoPath);
         public bool PluginState
         {
@@ -22,7 +19,7 @@ namespace Flow.Launcher.ViewModel
                 PluginPair.Metadata.Disabled = !value; 
             }
         }
-        public Visibility ActionKeywordsVisibility => PluginPair.Metadata.ActionKeywords.Count > 1 ? Visibility.Collapsed : Visibility.Visible;
+        public Visibility ActionKeywordsVisibility => PluginPair.Metadata.ActionKeywords.Count == 1 ? Visibility.Visible : Visibility.Collapsed;
         public string InitilizaTime => PluginPair.Metadata.InitTime.ToString() + "ms";
         public string QueryTime => PluginPair.Metadata.AvgQueryTime + "ms";
         public string ActionKeywordsText => string.Join(Query.ActionKeywordSeperater, PluginPair.Metadata.ActionKeywords);

Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml

@@ -13,8 +13,11 @@
     <system:String x:Key="flowlauncher_plugin_program_reindex">Reindex</system:String>
     <system:String x:Key="flowlauncher_plugin_program_indexing">Indexing</system:String>
     <system:String x:Key="flowlauncher_plugin_program_index_start">Index Start Menu</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_index_start_tooltip">When enabled, Flow will load programs from the start menu</system:String>
     <system:String x:Key="flowlauncher_plugin_program_index_registry">Index Registry</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_index_registry_tooltip">When enabled, Flow will load programs from the registry</system:String>
     <system:String x:Key="flowlauncher_plugin_program_enable_description">Enable Program Description</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_enable_description_tooltip">Disabling this will also stop Flow from searching via the program desciption</system:String>
     <system:String x:Key="flowlauncher_plugin_program_suffixes_header">Suffixes</system:String>
     <system:String x:Key="flowlauncher_plugin_program_max_depth_header">Max Depth</system:String>
 

Plugins/Flow.Launcher.Plugin.Program/Languages/sk.xaml

@@ -12,8 +12,12 @@
     <system:String x:Key="flowlauncher_plugin_program_suffixes">Prípony súborov</system:String>
     <system:String x:Key="flowlauncher_plugin_program_reindex">Reindexovať</system:String>
     <system:String x:Key="flowlauncher_plugin_program_indexing">Indexovanie</system:String>
-    <system:String x:Key="flowlauncher_plugin_program_index_start">Indexovať Ponuku Štart</system:String>
-    <system:String x:Key="flowlauncher_plugin_program_index_registry">Indexovať Registry</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_index_start">Indexovať ponuku Štart</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_index_start_tooltip">Ak je povolené, Flow načíta programy z ponuky Štart</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_index_registry">Indexovať databázu Registry</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_index_registry_tooltip">Ak je povolené, Flow načíta programy z databázy Registry</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_enable_description">Povoliť popis programu</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_enable_description_tooltip">Zakázaním tejto funkcie sa tiež zastaví vyhľadávanie popisu programu cez Flow</system:String>
     <system:String x:Key="flowlauncher_plugin_program_suffixes_header">Prípony</system:String>
     <system:String x:Key="flowlauncher_plugin_program_max_depth_header">Max. hĺbka</system:String>
 

Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs

@@ -17,6 +17,7 @@ using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Plugin.Program.Logger;
 using Rect = System.Windows.Rect;
 using Flow.Launcher.Plugin.SharedModels;
+using Flow.Launcher.Infrastructure.Logger;
 
 namespace Flow.Launcher.Plugin.Program.Programs
 {
@@ -81,6 +82,11 @@ namespace Flow.Launcher.Plugin.Program.Programs
 
                 Apps = new List<Application>().ToArray();
             }
+
+            if (Marshal.ReleaseComObject(stream) > 0)
+            {
+                Log.Error("Flow.Launcher.Plugin.Program.Programs.UWP", "AppxManifest.xml was leaked");
+            }
         }
 
 

Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml

@@ -16,9 +16,9 @@
         </Grid.RowDefinitions>
         <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Stretch">
             <StackPanel Orientation="Vertical" Width="250">
-                <CheckBox Name="StartMenuEnabled" IsChecked="{Binding EnableStartMenuSource}" Margin="5" Content="{DynamicResource flowlauncher_plugin_program_index_start}" />
-                <CheckBox Name="RegistryEnabled" IsChecked="{Binding EnableRegistrySource}"  Margin="5" Content="{DynamicResource flowlauncher_plugin_program_index_registry}" />
-                <CheckBox Name="DescriptionEnabled" IsChecked="{Binding EnableDescription}" Margin="5" Content="{DynamicResource flowlauncher_plugin_program_enable_description}" />
+                <CheckBox Name="StartMenuEnabled" IsChecked="{Binding EnableStartMenuSource}" Margin="5" Content="{DynamicResource flowlauncher_plugin_program_index_start}" ToolTip="{DynamicResource flowlauncher_plugin_program_index_start_tooltip}" />
+                <CheckBox Name="RegistryEnabled" IsChecked="{Binding EnableRegistrySource}"  Margin="5" Content="{DynamicResource flowlauncher_plugin_program_index_registry}" ToolTip="{DynamicResource flowlauncher_plugin_program_index_registry_tooltip}" />
+                <CheckBox Name="DescriptionEnabled" IsChecked="{Binding EnableDescription}" Margin="5" Content="{DynamicResource flowlauncher_plugin_program_enable_description}" ToolTip="{DynamicResource flowlauncher_plugin_program_enable_description_tooltip}" />
             </StackPanel>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                 <Button Height="31" HorizontalAlignment="Right" Margin="10" Width="100" x:Name="btnLoadAllProgramSource" Click="btnLoadAllProgramSource_OnClick" Content="{DynamicResource flowlauncher_plugin_program_all_programs}" />

Plugins/Flow.Launcher.Plugin.Program/plugin.json

@@ -4,7 +4,7 @@
   "Name": "Program",
   "Description": "Search programs in Flow.Launcher",
   "Author": "qianlifeng",
-  "Version": "1.5.0",
+  "Version": "1.5.3",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Program.dll",

Plugins/Flow.Launcher.Plugin.Shell/Main.cs

@@ -271,8 +271,8 @@ namespace Flow.Launcher.Plugin.Shell
         public void Init(PluginInitContext context)
         {
             this.context = context;
-            context.API.GlobalKeyboardEvent += API_GlobalKeyboardEvent;
             _settings = context.API.LoadSettingJsonStorage<Settings>();
+            context.API.GlobalKeyboardEvent += API_GlobalKeyboardEvent;
         }
 
         bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state)

Plugins/Flow.Launcher.Plugin.Shell/plugin.json

@@ -4,7 +4,7 @@
   "Name": "Shell",
   "Description": "Provide executing commands from Flow Launcher",
   "Author": "qianlifeng",
-  "Version": "1.4.1",
+  "Version": "1.4.2",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Shell.dll",