Merge pull request #940 from Flow-Launcher/dev

Release 1.9.1 | Plugin 2.1.1

Author: jjw24

Flow.Launcher.Core/ExternalPlugins/PluginsManifest.cs

@@ -31,7 +31,7 @@ public static Task UpdateManifestAsync()
             return UpdateTask = DownloadManifestAsync();
         }
 
-        private async static Task DownloadManifestAsync()
+        private static async Task DownloadManifestAsync()
         {
             try
             {

Flow.Launcher.Core/Plugin/ExecutablePlugin.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -22,18 +21,23 @@ public ExecutablePlugin(string filename)
                 RedirectStandardOutput = true,
                 RedirectStandardError = true
             };
+            
+            // required initialisation for below request calls 
+            _startInfo.ArgumentList.Add(string.Empty);
         }
 
         protected override Task<Stream> RequestAsync(JsonRPCRequestModel request, CancellationToken token = default)
         {
-            _startInfo.Arguments = $"\"{request}\"";
+            // since this is not static, request strings will build up in ArgumentList if index is not specified
+            _startInfo.ArgumentList[0] = request.ToString();
             return ExecuteAsync(_startInfo, token);
         }
 
         protected override string Request(JsonRPCRequestModel rpcRequest, CancellationToken token = default)
         {
-            _startInfo.Arguments = $"\"{rpcRequest}\"";
+            // since this is not static, request strings will build up in ArgumentList if index is not specified
+            _startInfo.ArgumentList[0] = rpcRequest.ToString();
             return Execute(_startInfo);
         }
     }
-}
+}

Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs

@@ -354,7 +354,9 @@ public virtual async Task InitAsync(PluginInitContext context)
             this.context = context;
             await InitSettingAsync();
         }
-        private static readonly Thickness settingControlMargin = new(10);
+        private static readonly Thickness settingControlMargin = new(10, 4, 10, 4);
+        private static readonly Thickness settingPanelMargin = new(15, 20, 15, 20);
+        private static readonly Thickness settingTextBlockMargin = new(10, 4, 10, 4);
         private JsonRpcConfigurationModel _settingsTemplate;
         public Control CreateSettingPanel()
         {
@@ -363,7 +365,7 @@ public Control CreateSettingPanel()
             var settingWindow = new UserControl();
             var mainPanel = new StackPanel
             {
-                Margin = settingControlMargin,
+                Margin = settingPanelMargin,
                 Orientation = Orientation.Vertical
             };
             settingWindow.Content = mainPanel;
@@ -375,10 +377,13 @@ public Control CreateSettingPanel()
                     Orientation = Orientation.Horizontal,
                     Margin = settingControlMargin
                 };
-                var name = new Label()
+                var name = new TextBlock()
                 {
-                    Content = attribute.Label,
-                    Margin = settingControlMargin
+                    Text = attribute.Label,
+                    Width = 120,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    Margin = settingControlMargin,
+                    TextWrapping = TextWrapping.WrapWithOverflow
                 };
 
                 FrameworkElement contentControl;
@@ -390,8 +395,8 @@ public Control CreateSettingPanel()
                             contentControl = new TextBlock
                             {
                                 Text = attribute.Description.Replace("\\r\\n", "\r\n"),
-                                Margin = settingControlMargin,
-                                MaxWidth = 400,
+                                Margin = settingTextBlockMargin,
+                                MaxWidth = 500,
                                 TextWrapping = TextWrapping.WrapWithOverflow
                             };
                             break;

Flow.Launcher.Core/Updater.cs

@@ -91,8 +91,9 @@ public async Task UpdateAppAsync(IPublicAPI api, bool silentUpdate = true)
             catch (Exception e) when (e is HttpRequestException or WebException or SocketException || e.InnerException is TimeoutException)
             {
                 Log.Exception($"|Updater.UpdateApp|Check your connection and proxy settings to github-cloud.s3.amazonaws.com.", e);
-                api.ShowMsg(api.GetTranslation("update_flowlauncher_fail"),
-                    api.GetTranslation("update_flowlauncher_check_connection"));
+                if (!silentUpdate)
+                    api.ShowMsg(api.GetTranslation("update_flowlauncher_fail"),
+                        api.GetTranslation("update_flowlauncher_check_connection"));
             }
             finally
             {
@@ -124,7 +125,7 @@ private async Task<UpdateManager> GitHubUpdateManager(string repository)
             var releases = await System.Text.Json.JsonSerializer.DeserializeAsync<List<GithubRelease>>(jsonStream).ConfigureAwait(false);
             var latest = releases.Where(r => !r.Prerelease).OrderByDescending(r => r.PublishedAt).First();
             var latestUrl = latest.HtmlUrl.Replace("/tag/", "/download/");
-            
+
             var client = new WebClient
             {
                 Proxy = Http.WebProxy

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net5.0-windows</TargetFramework>
@@ -14,10 +14,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>2.1.0</Version>
-    <PackageVersion>2.1.0</PackageVersion>
-    <AssemblyVersion>2.1.0</AssemblyVersion>
-    <FileVersion>2.1.0</FileVersion>
+    <Version>2.1.1</Version>
+    <PackageVersion>2.1.1</PackageVersion>
+    <AssemblyVersion>2.1.1</AssemblyVersion>
+    <FileVersion>2.1.1</FileVersion>
     <PackageId>Flow.Launcher.Plugin</PackageId>
     <Authors>Flow-Launcher</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -42,6 +42,7 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
+    <DocumentationFile>..\Output\Debug\Flow.Launcher.Plugin.xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

Flow.Launcher.Plugin/GlyphInfo.cs

@@ -7,5 +7,10 @@
 
 namespace Flow.Launcher.Plugin
 {
+    /// <summary>
+    /// Text with FontFamily specified
+    /// </summary>
+    /// <param name="FontFamily">Font Family of this Glyph</param>
+    /// <param name="Glyph">Text/Unicode of the Glyph</param>
     public record GlyphInfo(string FontFamily, string Glyph);
 }

Flow.Launcher.Plugin/Result.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Windows.Media;
@@ -10,11 +10,11 @@ public class Result
     {
 
         private string _pluginDirectory;
-        
+
         private string _icoPath;
 
         /// <summary>
-        /// Provides the title of the result. This is always required.
+        /// The title of the result. This is always required.
         /// </summary>
         public string Title { get; set; }
 
@@ -36,6 +36,11 @@ public class Result
         /// </summary>
         public string AutoCompleteText { get; set; }
 
+        /// <summary>
+        /// Image Displayed on the result
+        /// <value>Relative Path to the Image File</value>
+        /// <remarks>GlyphInfo is prioritized if not null</remarks>
+        /// </summary>
         public string IcoPath
         {
             get { return _icoPath; }
@@ -60,30 +65,35 @@ public string IcoPath
         public IconDelegate Icon;
 
         /// <summary>
-        /// Information for Glyph Icon
+        /// Information for Glyph Icon (Prioritized than IcoPath/Icon if user enable Glyph Icons)
         /// </summary>
-        public GlyphInfo Glyph { get; init; } 
+        public GlyphInfo Glyph { get; init; }
 
 
         /// <summary>
-        /// return true to hide flowlauncher after select result
+        /// Delegate. An action to take in the form of a function call when the result has been selected
+        /// <returns>
+        /// true to hide flowlauncher after select result
+        /// </returns>
         /// </summary>
         public Func<ActionContext, bool> Action { get; set; }
 
+        /// <summary>
+        /// Priority of the current result
+        /// <value>default: 0</value>
+        /// </summary>
         public int Score { get; set; }
 
         /// <summary>
         /// A list of indexes for the characters to be highlighted in Title
         /// </summary>
         public IList<int> TitleHighlightData { get; set; }
 
-        /// <summary>
-        /// A list of indexes for the characters to be highlighted in SubTitle
-        /// </summary>
+        [Obsolete("Deprecated as of Flow Launcher v1.9.1. Subtitle highlighting is no longer offered")]
         public IList<int> SubTitleHighlightData { get; set; }
 
         /// <summary>
-        /// Only results that originQuery match with current query will be displayed in the panel
+        /// Query information associated with the result
         /// </summary>
         internal Query OriginQuery { get; set; }
 
@@ -103,35 +113,38 @@ public string PluginDirectory
             }
         }
 
+        /// <inheritdoc />
         public override bool Equals(object obj)
         {
             var r = obj as Result;
 
             var equality = string.Equals(r?.Title, Title) &&
                            string.Equals(r?.SubTitle, SubTitle) &&
                            string.Equals(r?.IcoPath, IcoPath) &&
-                           TitleHighlightData == r.TitleHighlightData &&
-                           SubTitleHighlightData == r.SubTitleHighlightData;
+                           TitleHighlightData == r.TitleHighlightData;
 
             return equality;
         }
 
+        /// <inheritdoc />
         public override int GetHashCode()
         {
             var hashcode = (Title?.GetHashCode() ?? 0) ^
                            (SubTitle?.GetHashCode() ?? 0);
             return hashcode;
         }
 
+        /// <inheritdoc />
         public override string ToString()
         {
             return Title + SubTitle;
         }
 
-        public Result() { }
-
         /// <summary>
-        /// Additional data associate with this result
+        /// Additional data associated with this result
+        /// <example>
+        /// As external information for ContextMenu
+        /// </example>
         /// </summary>
         public object ContextData { get; set; }
 

Flow.Launcher/App.xaml.cs

@@ -69,8 +69,6 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
                 PluginManager.LoadPlugins(_settings.PluginSettings);
                 _mainVM = new MainViewModel(_settings);
 
-                HotKeyMapper.Initialize(_mainVM);
-
                 API = new PublicAPIInstance(_settingsVM, _mainVM, _alphabet);
 
                 Http.API = API;
@@ -83,6 +81,8 @@ await Stopwatch.NormalAsync("|App.OnStartup|Startup cost", async () =>
 
                 Current.MainWindow = window;
                 Current.MainWindow.Title = Constant.FlowLauncher;
+                
+                HotKeyMapper.Initialize(_mainVM);
 
                 // happlebao todo temp fix for instance code logic
                 // load plugin before change language, because plugin language also needs be changed

Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs

@@ -53,7 +53,10 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
                 // Check if Text will be larger then our QueryTextBox
                 System.Windows.Media.Typeface typeface = new Typeface(QueryTextBox.FontFamily, QueryTextBox.FontStyle, QueryTextBox.FontWeight, QueryTextBox.FontStretch);
                 System.Windows.Media.FormattedText ft = new FormattedText(QueryTextBox.Text, System.Globalization.CultureInfo.CurrentCulture, System.Windows.FlowDirection.LeftToRight, typeface, QueryTextBox.FontSize, Brushes.Black);
-                if (ft.Width > QueryTextBox.ActualWidth || QueryTextBox.HorizontalOffset != 0)
+
+                var offset = QueryTextBox.Padding.Right;
+
+                if ((ft.Width + offset) > QueryTextBox.ActualWidth || QueryTextBox.HorizontalOffset != 0)
                 {
                     return string.Empty;
                 };