Merge branch 'dev' into l10n_dev

Author: jjw24

Flow.Launcher.Core/Flow.Launcher.Core.csproj

@@ -54,7 +54,7 @@
 
   <ItemGroup>
     <PackageReference Include="Droplex" Version="1.7.0" />
-    <PackageReference Include="FSharp.Core" Version="8.0.301" />
+    <PackageReference Include="FSharp.Core" Version="8.0.401" />
     <PackageReference Include="Meziantou.Framework.Win32.Jobs" Version="3.4.0" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />

Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

@@ -4,8 +4,15 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
+using System.Windows.Forms;
 using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Plugin;
+using CheckBox = System.Windows.Controls.CheckBox;
+using ComboBox = System.Windows.Controls.ComboBox;
+using Control = System.Windows.Controls.Control;
+using Orientation = System.Windows.Controls.Orientation;
+using TextBox = System.Windows.Controls.TextBox;
+using UserControl = System.Windows.Controls.UserControl;
 
 namespace Flow.Launcher.Core.Plugin
 {
@@ -224,6 +231,7 @@ public Control CreateSettingPanel()
                         break;
                     }
                     case "inputWithFileBtn":
+                    case "inputWithFolderBtn":
                     {
                         var textBox = new TextBox()
                         {
@@ -243,6 +251,24 @@ public Control CreateSettingPanel()
                             Margin = new Thickness(10, 0, 0, 0), Content = "Browse"
                         };
 
+                        Btn.Click += (_, _) =>
+                        {
+                            using CommonDialog dialog = type switch
+                            {
+                                "inputWithFolderBtn" => new FolderBrowserDialog(),
+                                _ => new OpenFileDialog(),
+                            };
+                            if (dialog.ShowDialog() != DialogResult.OK) return;
+
+                            var path = dialog switch
+                            {
+                                FolderBrowserDialog folderDialog => folderDialog.SelectedPath,
+                                OpenFileDialog fileDialog => fileDialog.FileName,
+                            };
+                            textBox.Text = path;
+                            Settings[attribute.Name] = path;
+                        };
+
                         var dockPanel = new DockPanel() { Margin = settingControlMargin };
 
                         DockPanel.SetDock(Btn, Dock.Right);

Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj

@@ -67,7 +67,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
   </ItemGroup>
 

Flow.Launcher/Flow.Launcher.csproj

@@ -96,7 +96,7 @@
     <PackageReference Include="NHotkey.Wpf" Version="3.0.0" />
     <PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
     <PackageReference Include="SemanticVersioning" Version="3.0.0-beta2" />
-    <PackageReference Include="VirtualizingWrapPanel" Version="2.0.11" />
+    <PackageReference Include="VirtualizingWrapPanel" Version="2.0.12" />
   </ItemGroup>
 
   <ItemGroup>

Plugins/Flow.Launcher.Plugin.Explorer/Flow.Launcher.Plugin.Explorer.csproj

@@ -45,7 +45,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
+    <PackageReference Include="System.Data.OleDb" Version="8.0.1" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
     <PackageReference Include="tlbimp-Microsoft.Search.Interop" Version="1.0.0" />
   </ItemGroup>

Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs

@@ -203,11 +203,11 @@ internal async ValueTask<List<Result>> RequestUpdateAsync(string search, Cancell
                 pluginFromLocalPath = Utilities.GetPluginInfoFromZip(search);
                 pluginFromLocalPath.LocalInstallPath = search;
                 updateFromLocalPath = true;
-            }                
+            }
 
             var updateSource = !updateFromLocalPath
-                                ? PluginsManifest.UserPlugins 
-                                : new List<UserPlugin> { pluginFromLocalPath };
+                ? PluginsManifest.UserPlugins
+                : new List<UserPlugin> { pluginFromLocalPath };
 
             var resultsForUpdate = (
                 from existingPlugin in Context.API.GetAllPlugins()
@@ -291,7 +291,7 @@ await Http.DownloadAsync(x.PluginNewUserPlugin.UrlDownload, downloadToFilePath)
                                 {
                                     downloadToFilePath = x.PluginNewUserPlugin.LocalInstallPath;
                                 }
-                                
+
 
                                 PluginManager.UpdatePlugin(x.PluginExistingMetadata, x.PluginNewUserPlugin,
                                     downloadToFilePath);
@@ -327,7 +327,6 @@ await Http.DownloadAsync(x.PluginNewUserPlugin.UrlDownload, downloadToFilePath)
                             }, TaskContinuationOptions.OnlyOnFaulted);
 
                             return true;
-
                         },
                         ContextData =
                             new UserPlugin
@@ -513,7 +512,8 @@ internal List<Result> InstallFromLocalPath(string localPath)
                         {
                             if (!InstallSourceKnown(plugin.Website)
                                 && MessageBox.Show(string.Format(
-                                        Context.API.GetTranslation("plugin_pluginsmanager_install_unknown_source_warning"),
+                                        Context.API.GetTranslation(
+                                            "plugin_pluginsmanager_install_unknown_source_warning"),
                                         Environment.NewLine),
                                     Context.API.GetTranslation(
                                         "plugin_pluginsmanager_install_unknown_source_warning_title"),
@@ -532,7 +532,12 @@ internal List<Result> InstallFromLocalPath(string localPath)
 
         private bool InstallSourceKnown(string url)
         {
-            var author = url.Split('/')[3];
+            var pieces = url.Split('/');
+
+            if (pieces.Length < 4)
+                return false;
+
+            var author = pieces[3];
             var acceptedSource = "https://github.com";
             var constructedUrlPart = string.Format("{0}/{1}/", acceptedSource, author);
 
@@ -589,7 +594,7 @@ private void Install(UserPlugin plugin, string downloadedFilePath)
             try
             {
                 PluginManager.InstallPlugin(plugin, downloadedFilePath);
-                
+
                 if (!plugin.IsFromLocalInstallPath)
                     File.Delete(downloadedFilePath);
             }