Merge branch 'dev' into sys-plugin-add-copy-text

cibere · web-flow · commit 8b012491de91 · 2024-12-07T14:50:30.000-08:00
diff --git a/Flow.Launcher.Infrastructure/Constant.cs b/Flow.Launcher.Infrastructure/Constant.cs
@@ -31,6 +31,7 @@ public static class Constant
         public static readonly string ErrorIcon = Path.Combine(ImagesDirectory, "app_error.png");
         public static readonly string MissingImgIcon = Path.Combine(ImagesDirectory, "app_missing_img.png");
         public static readonly string LoadingImgIcon = Path.Combine(ImagesDirectory, "loading.png");
+        public static readonly string ImageIcon = Path.Combine(ImagesDirectory, "image.png");
 
         public static string PythonPath;
         public static string NodePath;
diff --git a/Flow.Launcher.Infrastructure/Image/ImageLoader.cs b/Flow.Launcher.Infrastructure/Image/ImageLoader.cs
@@ -22,6 +22,7 @@ public static class ImageLoader
         private static readonly ConcurrentDictionary<string, string> GuidToKey = new();
         private static IImageHashGenerator _hashGenerator;
         private static readonly bool EnableImageHash = true;
+        public static ImageSource Image { get; } = new BitmapImage(new Uri(Constant.ImageIcon));
         public static ImageSource MissingImage { get; } = new BitmapImage(new Uri(Constant.MissingImgIcon));
         public static ImageSource LoadingImage { get; } = new BitmapImage(new Uri(Constant.LoadingImgIcon));
         public const int SmallIconSize = 64;
@@ -139,7 +140,7 @@ private static async ValueTask<ImageResult> LoadInternalAsync(string path, bool
                     return new ImageResult(image, ImageType.ImageFile);
                 }
 
-                if (path.StartsWith("data:", StringComparison.OrdinalIgnoreCase))
+                if (path.StartsWith("data:image", StringComparison.OrdinalIgnoreCase))
                 {
                     var imageSource = new BitmapImage(new Uri(path));
                     imageSource.Freeze();
@@ -215,8 +216,16 @@ private static ImageResult GetThumbnailResult(ref string path, bool loadFullImag
                     type = ImageType.ImageFile;
                     if (loadFullImage)
                     {
-                        image = LoadFullImage(path);
-                        type = ImageType.FullImageFile;
+                        try
+                        {
+                            image = LoadFullImage(path);
+                            type = ImageType.FullImageFile;
+                        }
+                        catch (NotSupportedException)
+                        {
+                            image = Image;
+                            type = ImageType.Error;
+                        }
                     }
                     else
                     {
diff --git a/Flow.Launcher.Plugin/Result.cs b/Flow.Launcher.Plugin/Result.cs
@@ -70,7 +70,8 @@ public string IcoPath
                     && !string.IsNullOrEmpty(PluginDirectory)
                     && !Path.IsPathRooted(value)
                     && !value.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
-                    && !value.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
+                    && !value.StartsWith("https://", StringComparison.OrdinalIgnoreCase)
+                    && !value.StartsWith("data:image", StringComparison.OrdinalIgnoreCase))
                 {
                     _icoPath = Path.Combine(PluginDirectory, value);
                 }
diff --git a/Flow.Launcher/Images/image.png b/Flow.Launcher/Images/image.png
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
@@ -308,7 +308,7 @@
                             VerticalAlignment="Center"
                             Panel.ZIndex="2"
                             RenderOptions.BitmapScalingMode="HighQuality"
-                            Source="{Binding PluginIconPath}"
+                            Source="{Binding PluginIconSource}"
                             Stretch="Uniform"
                             Style="{DynamicResource PluginActivationIcon}" />
                         <Canvas Style="{DynamicResource SearchIconPosition}">
diff --git a/Flow.Launcher/Storage/TopMostRecord.cs b/Flow.Launcher/Storage/TopMostRecord.cs
@@ -1,29 +1,30 @@
-﻿using System.Collections.Generic;
+﻿using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.Storage
 {
-    // todo this class is not thread safe.... but used from multiple threads.
     public class TopMostRecord
     {
         [JsonInclude]
-        public Dictionary<string, Record> records { get; private set; } = new Dictionary<string, Record>();
+        public ConcurrentDictionary<string, Record> records { get; private set; } = new ConcurrentDictionary<string, Record>();
 
         internal bool IsTopMost(Result result)
         {
-            if (records.Count == 0 || !records.ContainsKey(result.OriginQuery.RawQuery))
+            if (records.IsEmpty || result.OriginQuery == null ||
+                !records.TryGetValue(result.OriginQuery.RawQuery, out var value))
             {
                 return false;
             }
 
             // since this dictionary should be very small (or empty) going over it should be pretty fast.
-            return records[result.OriginQuery.RawQuery].Equals(result);
+            return value.Equals(result);
         }
 
         internal void Remove(Result result)
         {
-            records.Remove(result.OriginQuery.RawQuery);
+            records.Remove(result.OriginQuery.RawQuery, out _);
         }
 
         internal void AddOrUpdate(Result result)
@@ -34,17 +35,15 @@ internal void AddOrUpdate(Result result)
                 Title = result.Title,
                 SubTitle = result.SubTitle
             };
-            records[result.OriginQuery.RawQuery] = record;
-
+            records.AddOrUpdate(result.OriginQuery.RawQuery, record, (key, oldValue) => record);
         }
 
         public void Load(Dictionary<string, Record> dictionary)
         {
-            records = dictionary;
+            records = new ConcurrentDictionary<string, Record>(dictionary);
         }
     }
 
-
     public class Record
     {
         public string Title { get; set; }
diff --git a/Flow.Launcher/Storage/UserSelectedRecord.cs b/Flow.Launcher/Storage/UserSelectedRecord.cs
@@ -51,6 +51,11 @@ private static int GenerateResultHashCode(Result result)
 
         private static int GenerateQueryAndResultHashCode(Query query, Result result)
         {
+            if (query == null)
+            {
+                return GenerateResultHashCode(result);
+            }
+
             int hashcode = GenerateStaticHashCode(query.ActionKeyword);
             hashcode = GenerateStaticHashCode(query.Search, hashcode);
             hashcode = GenerateStaticHashCode(result.Title, hashcode);
@@ -101,4 +106,4 @@ public int GetSelectedCount(Result result)
             return selectedCount;
         }
     }
-}
+}
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -23,6 +23,8 @@
 using System.Globalization;
 using System.Windows.Input;
 using System.ComponentModel;
+using Flow.Launcher.Infrastructure.Image;
+using System.Windows.Media;
 
 namespace Flow.Launcher.ViewModel
 {
@@ -722,6 +724,8 @@ public double ResultSubItemFontSize
             set => Settings.ResultSubItemFontSize = value;
         }
 
+        public ImageSource PluginIconSource { get; private set; } = null;
+
         public string PluginIconPath { get; set; } = null;
 
         public string OpenResultCommandModifiers => Settings.OpenResultModifiers;
@@ -1066,6 +1070,7 @@ private async void QueryResults(bool isReQuery = false, bool reSelect = true)
                 Results.Clear();
                 Results.Visibility = Visibility.Collapsed;
                 PluginIconPath = null;
+                PluginIconSource = null;
                 SearchIconVisibility = Visibility.Visible;
                 return;
             }
@@ -1099,11 +1104,13 @@ private async void QueryResults(bool isReQuery = false, bool reSelect = true)
             if (plugins.Count == 1)
             {
                 PluginIconPath = plugins.Single().Metadata.IcoPath;
+                PluginIconSource = await ImageLoader.LoadAsync(PluginIconPath);
                 SearchIconVisibility = Visibility.Hidden;
             }
             else
             {
                 PluginIconPath = null;
+                PluginIconSource = null;
                 SearchIconVisibility = Visibility.Visible;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,8 @@ public string IcoPath`
`70`	`70`	`&& !string.IsNullOrEmpty(PluginDirectory)`
`71`	`71`	`&& !Path.IsPathRooted(value)`
`72`	`72`	`&& !value.StartsWith("http://", StringComparison.OrdinalIgnoreCase)`
`73`		`- && !value.StartsWith("https://", StringComparison.OrdinalIgnoreCase))`
	`73`	`+ && !value.StartsWith("https://", StringComparison.OrdinalIgnoreCase)`
	`74`	`+ && !value.StartsWith("data:image", StringComparison.OrdinalIgnoreCase))`
`74`	`75`	`{`
`75`	`76`	`_icoPath = Path.Combine(PluginDirectory, value);`
`76`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,29 +1,30 @@`
`1`		`-using System.Collections.Generic;`
	`1`	`+using System.Collections.Concurrent;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`	`using System.Text.Json.Serialization;`
`3`	`4`	`using Flow.Launcher.Plugin;`
`4`	`5`
`5`	`6`	`namespace Flow.Launcher.Storage`
`6`	`7`	`{`
`7`		`- // todo this class is not thread safe.... but used from multiple threads.`
`8`	`8`	`public class TopMostRecord`
`9`	`9`	`{`
`10`	`10`	`[JsonInclude]`
`11`		`- public Dictionary<string, Record> records { get; private set; } = new Dictionary<string, Record>();`
	`11`	`+ public ConcurrentDictionary<string, Record> records { get; private set; } = new ConcurrentDictionary<string, Record>();`
`12`	`12`
`13`	`13`	`internal bool IsTopMost(Result result)`
`14`	`14`	`{`
`15`		`- if (records.Count == 0 \|\| !records.ContainsKey(result.OriginQuery.RawQuery))`
	`15`	`+ if (records.IsEmpty \|\| result.OriginQuery == null \|\|`
	`16`	`+ !records.TryGetValue(result.OriginQuery.RawQuery, out var value))`
`16`	`17`	`{`
`17`	`18`	`return false;`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`// since this dictionary should be very small (or empty) going over it should be pretty fast.`
`21`		`- return records[result.OriginQuery.RawQuery].Equals(result);`
	`22`	`+ return value.Equals(result);`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`internal void Remove(Result result)`
`25`	`26`	`{`
`26`		`- records.Remove(result.OriginQuery.RawQuery);`
	`27`	`+ records.Remove(result.OriginQuery.RawQuery, out _);`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`internal void AddOrUpdate(Result result)`
`@@ -34,17 +35,15 @@ internal void AddOrUpdate(Result result)`
`34`	`35`	`Title = result.Title,`
`35`	`36`	`SubTitle = result.SubTitle`
`36`	`37`	`};`
`37`		`- records[result.OriginQuery.RawQuery] = record;`
`38`		`-`
	`38`	`+ records.AddOrUpdate(result.OriginQuery.RawQuery, record, (key, oldValue) => record);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public void Load(Dictionary<string, Record> dictionary)`
`42`	`42`	`{`
`43`		`- records = dictionary;`
	`43`	`+ records = new ConcurrentDictionary<string, Record>(dictionary);`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`		`-`
`48`	`47`	`public class Record`
`49`	`48`	`{`
`50`	`49`	`public string Title { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,11 @@ private static int GenerateResultHashCode(Result result)`
`51`	`51`
`52`	`52`	`private static int GenerateQueryAndResultHashCode(Query query, Result result)`
`53`	`53`	`{`
	`54`	`+ if (query == null)`
	`55`	`+ {`
	`56`	`+ return GenerateResultHashCode(result);`
	`57`	`+ }`
	`58`	`+`
`54`	`59`	`int hashcode = GenerateStaticHashCode(query.ActionKeyword);`
`55`	`60`	`hashcode = GenerateStaticHashCode(query.Search, hashcode);`
`56`	`61`	`hashcode = GenerateStaticHashCode(result.Title, hashcode);`
`@@ -101,4 +106,4 @@ public int GetSelectedCount(Result result)`
`101`	`106`	`return selectedCount;`
`102`	`107`	`}`
`103`	`108`	`}`
`104`		`-}`
	`109`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Threading;`
`@@ -23,6 +23,8 @@`
`23`	`23`	`using System.Globalization;`
`24`	`24`	`using System.Windows.Input;`
`25`	`25`	`using System.ComponentModel;`
	`26`	`+using Flow.Launcher.Infrastructure.Image;`
	`27`	`+using System.Windows.Media;`
`26`	`28`
`27`	`29`	`namespace Flow.Launcher.ViewModel`
`28`	`30`	`{`
`@@ -722,6 +724,8 @@ public double ResultSubItemFontSize`
`722`	`724`	`set => Settings.ResultSubItemFontSize = value;`
`723`	`725`	`}`
`724`	`726`
	`727`	`+ public ImageSource PluginIconSource { get; private set; } = null;`
	`728`	`+`
`725`	`729`	`public string PluginIconPath { get; set; } = null;`
`726`	`730`
`727`	`731`	`public string OpenResultCommandModifiers => Settings.OpenResultModifiers;`
`@@ -1066,6 +1070,7 @@ private async void QueryResults(bool isReQuery = false, bool reSelect = true)`
`1066`	`1070`	`Results.Clear();`
`1067`	`1071`	`Results.Visibility = Visibility.Collapsed;`
`1068`	`1072`	`PluginIconPath = null;`
	`1073`	`+ PluginIconSource = null;`
`1069`	`1074`	`SearchIconVisibility = Visibility.Visible;`
`1070`	`1075`	`return;`
`1071`	`1076`	`}`
`@@ -1099,11 +1104,13 @@ private async void QueryResults(bool isReQuery = false, bool reSelect = true)`
`1099`	`1104`	`if (plugins.Count == 1)`
`1100`	`1105`	`{`
`1101`	`1106`	`PluginIconPath = plugins.Single().Metadata.IcoPath;`
	`1107`	`+ PluginIconSource = await ImageLoader.LoadAsync(PluginIconPath);`
`1102`	`1108`	`SearchIconVisibility = Visibility.Hidden;`
`1103`	`1109`	`}`
`1104`	`1110`	`else`
`1105`	`1111`	`{`
`1106`	`1112`	`PluginIconPath = null;`
	`1113`	`+ PluginIconSource = null;`
`1107`	`1114`	`SearchIconVisibility = Visibility.Visible;`
`1108`	`1115`	`}`
`1109`	`1116`