Merge dev

Flow.Launcher.Infrastructure/Constant.cs

@@ -30,7 +30,7 @@ namespace Flow.Launcher.Infrastructure
 
         public static string PythonPath;
 
-        public static readonly string QueryTextBoxIconImagePath = $"{ProgramDirectory}\\Images\\mainsearch.png";
+        public static readonly string QueryTextBoxIconImagePath = $"{ProgramDirectory}\\Images\\mainsearch.svg";
 
         public const string DefaultTheme = "Darker";
 

Flow.Launcher.Infrastructure/Http/Http.cs

@@ -76,23 +76,31 @@ namespace Flow.Launcher.Infrastructure.Http
             };
         }
 
-        public static async Task Download([NotNull] string url, [NotNull] string filePath)
+        public static async Task DownloadAsync([NotNull] string url, [NotNull] string filePath)
         {
-            using var response = await client.GetAsync(url);
+            try
-            if (response.StatusCode == HttpStatusCode.OK)
             {
-                await using var fileStream = new FileStream(filePath, FileMode.CreateNew);
+                using var response = await client.GetAsync(url);
-                await response.Content.CopyToAsync(fileStream);
+                if (response.StatusCode == HttpStatusCode.OK)
+                {
+                    await using var fileStream = new FileStream(filePath, FileMode.CreateNew);
+                    await response.Content.CopyToAsync(fileStream);
+                }
+                else
+                {
+                    throw new HttpRequestException($"Error code <{response.StatusCode}> returned from <{url}>");
+                }
             }
-            else
+            catch (HttpRequestException e)
             {
-                throw new HttpRequestException($"Error code <{response.StatusCode}> returned from <{url}>");
+                Log.Exception("Infrastructure.Http", "Http Request Error", e, "DownloadAsync");
+                throw;
             }
         }
 
         /// <summary>
         /// Asynchrously get the result as string from url.
-        /// When supposing the result is long and large, try using GetStreamAsync to avoid reading as string
+        /// When supposing the result larger than 83kb, try using GetStreamAsync to avoid reading as string
         /// </summary>
         /// <param name="url"></param>
         /// <returns>The Http result as string. Null if cancellation requested</returns>

Flow.Launcher/Flow.Launcher.csproj

@@ -82,6 +82,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
+    <PackageReference Include="SharpVectors" Version="1.7.1" />
   </ItemGroup>
 
   <ItemGroup>

Flow.Launcher/Images/mainsearch.svg

@@ -0,0 +1,10 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="1200px" height="1200px" viewBox="0 0 12000 12000" preserveAspectRatio="xMidYMid meet">
+<g id="layer101" fill="#000000" stroke="none">
+</g>
+<g id="layer102" fill="#555555" stroke="none">
+<path d="M10354 10962 c-28 -11 -75 -35 -105 -55 -33 -21 -773 -754 -1879 -1861 -1004 -1004 -1829 -1826 -1834 -1826 -4 0 -38 22 -75 48 -248 179 -578 351 -869 453 -398 139 -790 198 -1232 185 -748 -20 -1407 -259 -2020 -732 -209 -161 -508 -475 -676 -709 -270 -377 -476 -847 -567 -1295 -53 -261 -67 -406 -67 -700 0 -340 26 -556 105 -861 128 -499 376 -976 715 -1374 86 -101 312 -324 410 -406 521 -434 1162 -709 1830 -784 181 -20 577 -20 758 0 657 75 1252 323 1782 744 144 114 451 426 556 566 176 233 281 404 393 635 223 465 332 947 332 1470 0 394 -50 705 -174 1082 -53 160 -62 182 -135 343 -85 186 -212 407 -332 575 -28 39 -50 73 -50 78 0 4 826 833 1835 1842 1386 1386 1843 1849 1869 1894 21 34 42 90 52 134 14 64 15 85 4 146 -28 163 -140 311 -290 383 -69 34 -83 37 -180 40 -85 3 -115 0 -156 -15z m-5669 -3912 c529 -49 1009 -241 1415 -566 109 -88 296 -275 384 -384 667 -833 762 -1990 237 -2910 -352 -619 -923 -1053 -1621 -1234 -394 -101 -878 -101 -1270 1 -382 99 -690 253 -992 496 -501 402 -828 974 -930 1627 -31 194 -31 576 0 770 40 255 120 520 225 740 326 682 944 1192 1677 1383 157 41 275 61 480 80 81 8 293 6 395 -3z"/>
+</g>
+
+
+</svg>

Flow.Launcher/Languages/en.xaml

@@ -72,7 +72,7 @@
     <system:String x:Key="deleteCustomHotkeyWarning">Are you sure you want to delete {0} plugin hotkey?</system:String>
     <system:String x:Key="queryWindowShadowEffect">Query window shadow effect</system:String>
     <system:String x:Key="shadowEffectCPUUsage">Shadow effect has a substantial usage of GPU.</system:String>
-    <system:String x:Key="shadowEffectPerformance">Not recommended if you computer performance is limited.</system:String>
+    <system:String x:Key="shadowEffectPerformance">Not recommended if your computer performance is limited.</system:String>
 
     <!--Setting Proxy-->
     <system:String x:Key="proxy">HTTP Proxy</system:String>

Flow.Launcher/MainWindow.xaml

@@ -6,6 +6,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:converters="clr-namespace:Flow.Launcher.Converters"
+        xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
         mc:Ignorable="d"
         Title="Flow Launcher"
         Topmost="True"
@@ -92,7 +93,8 @@
                             </ContextMenu>
                         </TextBox.ContextMenu>
                     </TextBox>
-                    <Image Source="{Binding Image, IsAsync=True}" Width="48"  HorizontalAlignment="Right" />
+                    <svgc:SvgControl Source="{Binding Image}" HorizontalAlignment="Right" Width="48" Height="48"
+                                     Background="Transparent"/>
                 </Grid>
                 <Line x:Name="ProgressBar" HorizontalAlignment="Right"
                   Style="{DynamicResource PendingLineStyle}" Visibility="{Binding ProgressBarVisibility, Mode=TwoWay}" 

Flow.Launcher/SettingWindow.xaml

@@ -8,6 +8,7 @@
         xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
         xmlns:sys="clr-namespace:System;assembly=mscorlib"
         xmlns:ui="http://schemas.modernwpf.com/2019"
+        xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
         x:Class="Flow.Launcher.SettingWindow"
         mc:Ignorable="d"
         Icon="Images\app.png"
@@ -252,7 +253,8 @@
                                              Text="{DynamicResource hiThere}" IsReadOnly="True"
                                              Style="{DynamicResource QueryBoxStyle}"
                                              Margin="18 0 56 0" />
-                                    <Image Source="{Binding ThemeImage}" HorizontalAlignment="Right" />
+                                    <svgc:SvgControl Source="{Binding ThemeImage}" Height="48" Width="48" HorizontalAlignment="Right" 
+                                                     Background="Transparent" />
                                     <ContentControl Grid.Row="1">
                                         <flowlauncher:ResultListBox DataContext="{Binding PreviewResults, Mode=OneTime}" Visibility="Visible" />
                                     </ContentControl>

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -285,7 +285,7 @@ namespace Flow.Launcher.ViewModel
 
         public string OpenResultCommandModifiers { get; private set; }
 
-        public ImageSource Image => ImageLoader.Load(Constant.QueryTextBoxIconImagePath);
+        public string Image => Constant.QueryTextBoxIconImagePath;
 
         #endregion
 

Flow.Launcher/ViewModel/ResultViewModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
@@ -12,9 +13,9 @@ namespace Flow.Launcher.ViewModel
 {
     public class ResultViewModel : BaseModel
     {
-        public class LazyAsync<T> : Lazy<Task<T>>
+        public class LazyAsync<T> : Lazy<ValueTask<T>>
         {
-            private T defaultValue;
+            private readonly T defaultValue;
 
             private readonly Action _updateCallback;
             public new T Value
@@ -23,21 +24,27 @@ namespace Flow.Launcher.ViewModel
                 {
                     if (!IsValueCreated)
                     {
-                        base.Value.ContinueWith(_ =>
+                        _ = Exercute(); // manually use callback strategy
-                        {
-                            _updateCallback();
-                        });
 
                         return defaultValue;
                     }
-                    
+
-                    if (!base.Value.IsCompleted || base.Value.IsFaulted)
+                    if (!base.Value.IsCompletedSuccessfully)
                         return defaultValue;
 
                     return base.Value.Result;
+
+                    // If none of the variables captured by the local function are captured by other lambdas,
+                    // the compiler can avoid heap allocations.
+                    async ValueTask Exercute()
+                    {
+                        await base.Value.ConfigureAwait(false);
+                        _updateCallback();
+                    }
+
                 }
             }
-            public LazyAsync(Func<Task<T>> factory, T defaultValue, Action updateCallback) : base(factory)
+            public LazyAsync(Func<ValueTask<T>> factory, T defaultValue, Action updateCallback) : base(factory)
             {
                 if (defaultValue != null)
                 {
@@ -55,13 +62,13 @@ namespace Flow.Launcher.ViewModel
                 Result = result;
 
                 Image = new LazyAsync<ImageSource>(
-                            SetImage, 
+                            SetImage,
                             ImageLoader.DefaultImage,
                             () =>
                                 {
                                     OnPropertyChanged(nameof(Image));
                                 });
-            }
+            } 
 
             Settings = settings;
         }
@@ -82,7 +89,7 @@ namespace Flow.Launcher.ViewModel
 
         public LazyAsync<ImageSource> Image { get; set; }
 
-        private async Task<ImageSource> SetImage()
+        private async ValueTask<ImageSource> SetImage()
         {
             var imagePath = Result.IcoPath;
             if (string.IsNullOrEmpty(imagePath) && Result.Icon != null)
@@ -94,7 +101,7 @@ namespace Flow.Launcher.ViewModel
                 catch (Exception e)
                 {
                     Log.Exception($"|ResultViewModel.Image|IcoPath is empty and exception when calling Icon() for result <{Result.Title}> of plugin <{Result.PluginDirectory}>", e);
-                    imagePath = Constant.MissingImgIcon;
+                    return ImageLoader.DefaultImage;
                 }
             }
 

Flow.Launcher/ViewModel/SettingWindowViewModel.cs

@@ -438,7 +438,7 @@ namespace Flow.Launcher.ViewModel
             }
         }
 
-        public ImageSource ThemeImage => ImageLoader.Load(Constant.QueryTextBoxIconImagePath);
+        public string ThemeImage => Constant.QueryTextBoxIconImagePath;
 
         #endregion
 

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

@@ -127,7 +127,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
                 Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"),
                     Context.API.GetTranslation("plugin_pluginsmanager_please_wait"));
 
-                await Http.Download(plugin.UrlDownload, filePath).ConfigureAwait(false);
+                await Http.DownloadAsync(plugin.UrlDownload, filePath).ConfigureAwait(false);
 
                 Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"),
                     Context.API.GetTranslation("plugin_pluginsmanager_download_success"));
@@ -214,11 +214,23 @@ namespace Flow.Launcher.Plugin.PluginsManager
 
                                 Task.Run(async delegate
                                 {
-                                    await Http.Download(x.PluginNewUserPlugin.UrlDownload, downloadToFilePath).ConfigureAwait(false);
+                                    Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"),
+                                                        Context.API.GetTranslation("plugin_pluginsmanager_please_wait"));
+
+                                    await Http.DownloadAsync(x.PluginNewUserPlugin.UrlDownload, downloadToFilePath).ConfigureAwait(false);
+
+                                    Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"),
+                                                        Context.API.GetTranslation("plugin_pluginsmanager_download_success"));
+
                                     Install(x.PluginNewUserPlugin, downloadToFilePath);
 
                                     Context.API.RestartApp();
-                                });
+                                }).ContinueWith(t =>
+                                {
+                                    Log.Exception("PluginsManager", $"Update failed for {x.Name}", t.Exception.InnerException, "RequestUpdate");
+                                    Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_install_error_title"),
+                                                        string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_error_subtitle"), x.Name));
+                                }, TaskContinuationOptions.OnlyOnFaulted);
 
                                 return true;
                             }

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

@@ -6,7 +6,7 @@
   "Name": "Plugins Manager",
   "Description": "Management of installing, uninstalling or updating Flow Launcher plugins",
   "Author": "Jeremy Wu",
-  "Version": "1.4.0",
+  "Version": "1.4.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.PluginsManager.dll",