Merge pull request #326 from Flow-Launcher/dev

Release 1.7.1

Author: jjw24

Flow.Launcher.Core/Plugin/JsonPRCModel.cs

@@ -15,6 +15,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json.Serialization;
 using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.Core.Plugin
@@ -42,6 +43,7 @@ public class JsonRPCResponseModel : JsonRPCModelBase
 
     public class JsonRPCQueryResponseModel : JsonRPCResponseModel
     {
+        [JsonPropertyName("result")]
         public new List<JsonRPCResult> Result { get; set; }
     }
 

Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs

@@ -147,47 +147,42 @@ protected string Execute(ProcessStartInfo startInfo)
         {
             try
             {
-                using (var process = Process.Start(startInfo))
+                using var process = Process.Start(startInfo);
+                if (process == null)
                 {
-                    if (process != null)
+                    Log.Error("|JsonRPCPlugin.Execute|Can't start new process");
+                    return string.Empty;
+                }
+
+                using var standardOutput = process.StandardOutput;
+                var result = standardOutput.ReadToEnd();
+                if (string.IsNullOrEmpty(result))
+                {
+                    using (var standardError = process.StandardError)
                     {
-                        using (var standardOutput = process.StandardOutput)
+                        var error = standardError.ReadToEnd();
+                        if (!string.IsNullOrEmpty(error))
                         {
-                            var result = standardOutput.ReadToEnd();
-                            if (string.IsNullOrEmpty(result))
-                            {
-                                using (var standardError = process.StandardError)
-                                {
-                                    var error = standardError.ReadToEnd();
-                                    if (!string.IsNullOrEmpty(error))
-                                    {
-                                        Log.Error($"|JsonRPCPlugin.Execute|{error}");
-                                        return string.Empty;
-                                    }
-                                    else
-                                    {
-                                        Log.Error("|JsonRPCPlugin.Execute|Empty standard output and standard error.");
-                                        return string.Empty;
-                                    }
-                                }
-                            }
-                            else if (result.StartsWith("DEBUG:"))
-                            {
-                                MessageBox.Show(new Form { TopMost = true }, result.Substring(6));
-                                return string.Empty;
-                            }
-                            else
-                            {
-                                return result;
-                            }
+                            Log.Error($"|JsonRPCPlugin.Execute|{error}");
+                            return string.Empty;
+                        }
+                        else
+                        {
+                            Log.Error("|JsonRPCPlugin.Execute|Empty standard output and standard error.");
+                            return string.Empty;
                         }
-                    }
-                    else
-                    {
-                        Log.Error("|JsonRPCPlugin.Execute|Can't start new process");
-                        return string.Empty;
                     }
                 }
+                else if (result.StartsWith("DEBUG:"))
+                {
+                    MessageBox.Show(new Form { TopMost = true }, result.Substring(6));
+                    return string.Empty;
+                }
+                else
+                {
+                    return result;
+                }
+
             }
             catch (Exception e)
             {

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -183,6 +183,8 @@ public static async Task<List<Result>> QueryForPlugin(PluginPair pair, Query que
                         throw new ArgumentOutOfRangeException();
                 }
                 token.ThrowIfCancellationRequested();
+                if (results == null)
+                    return results;
                 UpdatePluginMetadata(results, metadata, query);
 
                 metadata.QueryCount += 1;

Flow.Launcher/Flow.Launcher.csproj

@@ -66,6 +66,9 @@
     <Content Include="Images\*.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+	  <Content Include="Images\*.ico">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </Content>
   </ItemGroup>
 
   <ItemGroup>

Flow.Launcher/Images/app.ico

@@ -40,8 +40,8 @@
     <!--Setting Plugin-->
     <system:String x:Key="plugin">Plugin</system:String>
     <system:String x:Key="browserMorePlugins">Nájsť ďalšie pluginy</system:String>
-    <system:String x:Key="enable">Povoliť</system:String>
-    <system:String x:Key="disable">Zakázať</system:String>
+    <system:String x:Key="enable">Povolené</system:String>
+    <system:String x:Key="disable">Zakázané</system:String>
     <system:String x:Key="actionKeywords">Skratka akcie</system:String>
     <system:String x:Key="currentActionKeywords">Aktuálna akcia skratky:</system:String>
     <system:String x:Key="newActionKeyword">Nová akcia skratky:</system:String>

Flow.Launcher/Languages/sk.xaml

@@ -61,6 +61,9 @@ public void RestartApp()
             // which will cause ungraceful exit
             SaveAppAllSettings();
 
+            // Restart requires Squirrel's Update.exe to be present in the parent folder, 
+            // it is only published from the project's release pipeline. When debugging without it,
+            // the project may not restart or just terminates. This is expected.
             UpdateManager.RestartApp(Constant.ApplicationFileName);
         }
 

Flow.Launcher/PublicAPIInstance.cs

@@ -11,7 +11,7 @@
         xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
         x:Class="Flow.Launcher.SettingWindow"
         mc:Ignorable="d"
-        Icon="Images\app.png"
+        Icon="Images\app.ico"
         Title="{DynamicResource flowlauncher_settings}"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"

Flow.Launcher/SettingWindow.xaml

@@ -363,7 +363,7 @@ private void QueryContextMenu()
                             }
 
                             if (!match.IsSearchPrecisionScoreMet()) return false;
-                            
+
                             r.Score = match.Score;
                             return true;
 
@@ -512,7 +512,7 @@ async Task QueryTask(PluginPair plugin)
                         await Task.Yield();
 
                         var results = await PluginManager.QueryForPlugin(plugin, query, currentCancellationToken);
-                        if (!currentCancellationToken.IsCancellationRequested)
+                        if (!currentCancellationToken.IsCancellationRequested && results != null)
                             _resultsUpdateQueue.Post(new ResultsForUpdate(results, plugin.Metadata, query,
                                 currentCancellationToken));
                     }

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -6,7 +6,7 @@
     <system:String x:Key="flowlauncher_plugin_caculator_plugin_description">Spracúva matematické operácie.(Skúste 5*3-2 vo flowlauncheri)</system:String>
     <system:String x:Key="flowlauncher_plugin_calculator_not_a_number">Nie je číslo (NaN)</system:String>
     <system:String x:Key="flowlauncher_plugin_calculator_expression_not_complete">Nesprávny alebo neúplný výraz (Nezabudli ste na zátvorky?)</system:String>
-    <system:String x:Key="flowlauncher_plugin_calculator_copy_number_to_clipboard">Kopírovať toto číslo do schránky</system:String>
+    <system:String x:Key="flowlauncher_plugin_calculator_copy_number_to_clipboard">Kopírovať výsledok do schránky</system:String>
     <system:String x:Key="flowlauncher_plugin_calculator_output_decimal_seperator">Oddeľovač des. miest</system:String>
     <system:String x:Key="flowlauncher_plugin_calculator_output_decimal_seperator_help">Oddeľovač desatinných miest použitý vo výsledku.</system:String>
     <system:String x:Key="flowlauncher_plugin_calculator_decimal_seperator_use_system_locale">Použiť podľa systému</system:String>