Merge branch 'dev' into sys_cmd

Author: flooxo

.github/actions/spelling/expect.txt

@@ -1,7 +1,6 @@
 crowdin
 DWM
 workflows
-Wpf
 wpf
 actionkeyword
 stackoverflow
@@ -20,9 +19,7 @@ Prioritise
 Segoe
 Google
 Customise
-UWP
 uwp
-Uwp
 Bokmal
 Bokm
 uninstallation
@@ -61,7 +58,6 @@ popup
 ptr
 pluginindicator
 TobiasSekan
-Img
 img
 resx
 bak
@@ -78,7 +74,6 @@ WCA_ACCENT_POLICY
 HGlobal
 dopusrt
 firefox
-Firefox
 msedge
 svgc
 ime
@@ -87,7 +82,6 @@ txb
 btn
 otf
 searchplugin
-Noresult
 wpftk
 mkv
 flac
@@ -108,4 +102,7 @@ Preinstalled
 errormetadatafile
 noresult
 pluginsmanager
-alreadyexists
+alreadyexists
+JsonRPC
+JsonRPCV2
+Softpedia

.github/actions/spelling/patterns.txt

@@ -118,3 +118,6 @@
 
 # UWP
 [Uu][Ww][Pp]
+
+# version suffix <word>v#
+(?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))

.github/workflows/default_plugins.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 7.0.x
 

.github/workflows/spelling.yml

@@ -73,7 +73,7 @@ jobs:
     steps:
     - name: check-spelling
       id: spelling
-      uses: check-spelling/check-spelling@v0.0.22
+      uses: check-spelling/check-spelling@prerelease
       with:
         suppress_push_for_open_pull_request: 1
         checkout: true
@@ -91,10 +91,9 @@ jobs:
         extra_dictionaries:
           cspell:software-terms/dict/softwareTerms.txt
           cspell:win32/src/win32.txt
-          cspell:php/src/php.txt
           cspell:filetypes/filetypes.txt
           cspell:csharp/csharp.txt
-          cspell:dotnet/src/dotnet.txt
+          cspell:dotnet/dict/dotnet.txt
           cspell:python/src/common/extra.txt
           cspell:python/src/python/python-lib.txt
           cspell:aws/aws.txt
@@ -130,7 +129,7 @@ jobs:
     if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
     steps:
     - name: comment
-      uses: check-spelling/check-spelling@v0.0.22
+      uses: check-spelling/check-spelling@prerelease
       with:
         checkout: true
         spell_check_this: check-spelling/spell-check-this@main

.github/workflows/stale.yml

@@ -13,7 +13,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           stale-issue-message: 'This issue is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
           days-before-stale: 45

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

@@ -57,7 +57,7 @@
     <PackageReference Include="FSharp.Core" Version="7.0.401" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" NoWarn="NU1701" />
-    <PackageReference Include="StreamJsonRpc" Version="2.16.36" />
+    <PackageReference Include="StreamJsonRpc" Version="2.17.8" />
   </ItemGroup>
 
   <ItemGroup>

Flow.Launcher.Core/Plugin/JsonRPCPluginBase.cs

@@ -126,14 +126,15 @@ protected void ExecuteFlowLauncherAPI(string method, object[] parameters)
 
         private async Task InitSettingAsync()
         {
-            if (!File.Exists(SettingConfigurationPath))
-                return;
+            JsonRpcConfigurationModel configuration = null;
+            if (File.Exists(SettingConfigurationPath))
+            {
+                var deserializer = new DeserializerBuilder().WithNamingConvention(CamelCaseNamingConvention.Instance).Build();
+                configuration =
+                    deserializer.Deserialize<JsonRpcConfigurationModel>(
+                        await File.ReadAllTextAsync(SettingConfigurationPath));
+            }
 
-            var deserializer = new DeserializerBuilder().WithNamingConvention(CamelCaseNamingConvention.Instance)
-                .Build();
-            var configuration =
-                deserializer.Deserialize<JsonRpcConfigurationModel>(
-                    await File.ReadAllTextAsync(SettingConfigurationPath));
 
             Settings ??= new JsonRPCPluginSettings
             {

Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs

@@ -11,15 +11,15 @@ namespace Flow.Launcher.Core.Plugin
 {
     public class JsonRPCPluginSettings
     {
-        public required JsonRpcConfigurationModel Configuration { get; init; }
+        public required JsonRpcConfigurationModel? Configuration { get; init; }
 
         public required string SettingPath { get; init; }
         public Dictionary<string, FrameworkElement> SettingControls { get; } = new();
-        
+
         public IReadOnlyDictionary<string, object> Inner => Settings;
         protected ConcurrentDictionary<string, object> Settings { get; set; }
         public required IPublicAPI API { get; init; }
-        
+
         private JsonStorage<ConcurrentDictionary<string, object>> _storage;
 
         // maybe move to resource?
@@ -37,32 +37,34 @@ public async Task InitializeAsync()
             _storage = new JsonStorage<ConcurrentDictionary<string, object>>(SettingPath);
             Settings = await _storage.LoadAsync();
 
-            foreach (var (type, attributes) in Configuration.Body) 
+            if (Settings != null || Configuration == null)
+            {
+                return;
+            }
+
+            foreach (var (type, attributes) in Configuration.Body)
             {
                 if (attributes.Name == null)
                 {
                     continue;
                 }
-                
+
                 if (!Settings.ContainsKey(attributes.Name))
                 {
                     Settings[attributes.Name] = attributes.DefaultValue;
                 }
             }
         }
 
-       
+
         public void UpdateSettings(IReadOnlyDictionary<string, object> settings)
         {
             if (settings == null || settings.Count == 0)
                 return;
 
             foreach (var (key, value) in settings)
             {
-                if (Settings.ContainsKey(key))
-                {
-                    Settings[key] = value;
-                }
+                Settings[key] = value;
 
                 if (SettingControls.TryGetValue(key, out var control))
                 {
@@ -78,33 +80,35 @@ public void UpdateSettings(IReadOnlyDictionary<string, object> settings)
                             comboBox.Dispatcher.Invoke(() => comboBox.SelectedItem = value);
                             break;
                         case CheckBox checkBox:
-                            checkBox.Dispatcher.Invoke(() => checkBox.IsChecked = value is bool isChecked ? isChecked : bool.Parse(value as string ?? string.Empty));
+                            checkBox.Dispatcher.Invoke(() =>
+                                checkBox.IsChecked = value is bool isChecked
+                                    ? isChecked
+                                    : bool.Parse(value as string ?? string.Empty));
                             break;
                     }
                 }
             }
+
+            Save();
         }
-        
+
         public async Task SaveAsync()
         {
             await _storage.SaveAsync();
         }
-        
+
         public void Save()
         {
             _storage.Save();
         }
-        
+
         public Control CreateSettingPanel()
         {
-            if (Settings == null)
+            if (Settings == null || Settings.Count == 0)
                 return new();
 
             var settingWindow = new UserControl();
-            var mainPanel = new Grid
-            {
-                Margin = settingPanelMargin, VerticalAlignment = VerticalAlignment.Center
-            };
+            var mainPanel = new Grid { Margin = settingPanelMargin, VerticalAlignment = VerticalAlignment.Center };
 
             ColumnDefinition gridCol1 = new ColumnDefinition();
             ColumnDefinition gridCol2 = new ColumnDefinition();
@@ -239,10 +243,7 @@ public Control CreateSettingPanel()
                             Margin = new Thickness(10, 0, 0, 0), Content = "Browse"
                         };
 
-                        var dockPanel = new DockPanel()
-                        {
-                            Margin = settingControlMargin
-                        };
+                        var dockPanel = new DockPanel() { Margin = settingControlMargin };
 
                         DockPanel.SetDock(Btn, Dock.Right);
                         dockPanel.Children.Add(Btn);
@@ -349,7 +350,10 @@ public Control CreateSettingPanel()
                     case "checkbox":
                         var checkBox = new CheckBox
                         {
-                            IsChecked = Settings[attribute.Name] is bool isChecked ? isChecked : bool.Parse(attribute.DefaultValue),
+                            IsChecked =
+                                Settings[attribute.Name] is bool isChecked
+                                    ? isChecked
+                                    : bool.Parse(attribute.DefaultValue),
                             Margin = settingCheckboxMargin,
                             HorizontalAlignment = System.Windows.HorizontalAlignment.Right,
                             ToolTip = attribute.Description
@@ -372,14 +376,12 @@ public Control CreateSettingPanel()
 
                         break;
                     case "hyperlink":
-                        var hyperlink = new Hyperlink
-                        {
-                            ToolTip = attribute.Description, NavigateUri = attribute.url
-                        };
+                        var hyperlink = new Hyperlink { ToolTip = attribute.Description, NavigateUri = attribute.url };
 
                         var linkbtn = new System.Windows.Controls.Button
                         {
-                            HorizontalAlignment = System.Windows.HorizontalAlignment.Right, Margin = settingControlMargin
+                            HorizontalAlignment = System.Windows.HorizontalAlignment.Right,
+                            Margin = settingControlMargin
                         };
 
                         linkbtn.Content = attribute.urlLabel;
@@ -405,12 +407,9 @@ public Control CreateSettingPanel()
                 mainPanel.Children.Add(panel);
                 mainPanel.Children.Add(contentControl);
                 rowCount++;
-
             }
 
             return settingWindow;
         }
-
-
     }
 }

Flow.Launcher.Core/Plugin/JsonRPCPluginV2.cs

@@ -91,7 +91,7 @@ async Task ReadErrorAsync()
 
         private void SetupJsonRPC()
         {
-            var formatter = new JsonMessageFormatter();
+            var formatter = new SystemTextJsonFormatter { JsonSerializerOptions = RequestSerializeOption };
             var handler = new NewLineDelimitedMessageHandler(ClientPipe,
                 formatter);
 
@@ -100,10 +100,8 @@ private void SetupJsonRPC()
             RPC.AddLocalRpcMethod("UpdateResults", new Action<string, JsonRPCQueryResponseModel>((rawQuery, response) =>
             {
                 var results = ParseResults(response);
-                ResultsUpdated?.Invoke(this, new ResultUpdatedEventArgs { Query = new Query()
-                {
-                    RawQuery = rawQuery
-                }, Results = results });
+                ResultsUpdated?.Invoke(this,
+                    new ResultUpdatedEventArgs { Query = new Query() { RawQuery = rawQuery }, Results = results });
             }));
             RPC.SynchronizationContext = null;
             RPC.StartListening();

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -212,7 +212,19 @@ public static async Task<List<Result>> QueryForPluginAsync(PluginPair pair, Quer
             }
             catch (Exception e)
             {
-                throw new FlowPluginException(metadata, e);
+                Result r = new()
+                {
+                    Title = $"{metadata.Name}: Failed to respond!",
+                    SubTitle = "Select this result for more info",
+                    IcoPath = Flow.Launcher.Infrastructure.Constant.ErrorIcon,
+                    PluginDirectory = metadata.PluginDirectory,
+                    ActionKeywordAssigned = query.ActionKeyword,
+                    PluginID = metadata.ID,
+                    OriginQuery = query,
+                    Action = _ => { throw new FlowPluginException(metadata, e);},
+                    Score = -100
+                };
+                results.Add(r);
             }
             return results;
         }