Merge remote-tracking branch 'upstream/dev' into FixProgramSource

Author: VictoriousRaptor

Flow.Launcher.Core/Plugin/JsonRPCConfigurationModel.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace Flow.Launcher.Core.Plugin
 {
@@ -26,6 +27,8 @@ public class FieldAttributes
         public string Name { get; set; }
         public string Label { get; set; }
         public string Description { get; set; }
+        public string urlLabel { get; set; }
+        public Uri url { get; set; }
         public bool Validation { get; set; }
         public List<string> Options { get; set; }
         public string DefaultValue { get; set; }
@@ -40,4 +43,4 @@ public void Deconstruct(out string Name, out string Label, out string Descriptio
             DefaultValue = this.DefaultValue;
         }
     }
-}
+}

Flow.Launcher.Core/Plugin/JsonRPCPlugin.cs

@@ -29,6 +29,7 @@ public static class Constant
         public static readonly string DefaultIcon = Path.Combine(ImagesDirectory, "app.png");
         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 string PythonPath;
 

Flow.Launcher.Infrastructure/Constant.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -21,8 +22,10 @@ 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 DefaultImage { get; } = new BitmapImage(new Uri(Constant.MissingImgIcon));
-        public const int SmallIconSize = 32;
+        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;
+        public const int FullIconSize = 256;
 
 
         private static readonly string[] ImageExtensions =
@@ -99,6 +102,7 @@ private enum ImageType
             Folder,
             Data,
             ImageFile,
+            FullImageFile,
             Error,
             Cache
         }
@@ -111,7 +115,7 @@ private static async ValueTask<ImageResult> LoadInternalAsync(string path, bool
             {
                 if (string.IsNullOrEmpty(path))
                 {
-                    return new ImageResult(DefaultImage, ImageType.Error);
+                    return new ImageResult(MissingImage, ImageType.Error);
                 }
 
                 if (ImageCache.ContainsKey(path, loadFullImage))
@@ -201,6 +205,7 @@ private static ImageResult GetThumbnailResult(ref string path, bool loadFullImag
                     if (loadFullImage)
                     {
                         image = LoadFullImage(path);
+                        type = ImageType.FullImageFile;
                     }
                     else
                     {
@@ -215,7 +220,7 @@ private static ImageResult GetThumbnailResult(ref string path, bool loadFullImag
                 else
                 {
                     type = ImageType.File;
-                    image = GetThumbnail(path, ThumbnailOptions.None);
+                    image = GetThumbnail(path, ThumbnailOptions.None, loadFullImage ? FullIconSize : SmallIconSize);
                 }
             }
             else
@@ -232,12 +237,12 @@ private static ImageResult GetThumbnailResult(ref string path, bool loadFullImag
             return new ImageResult(image, type);
         }
 
-        private static BitmapSource GetThumbnail(string path, ThumbnailOptions option = ThumbnailOptions.ThumbnailOnly)
+        private static BitmapSource GetThumbnail(string path, ThumbnailOptions option = ThumbnailOptions.ThumbnailOnly, int size = SmallIconSize)
         {
             return WindowsThumbnailProvider.GetThumbnail(
                 path,
-                Constant.ThumbnailSize,
-                Constant.ThumbnailSize,
+                size,
+                size,
                 option);
         }
 
@@ -254,6 +259,10 @@ public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullI
             if (imageResult.ImageType != ImageType.Error && imageResult.ImageType != ImageType.Cache)
             { // we need to get image hash
                 string hash = EnableImageHash ? _hashGenerator.GetHashFromImage(img) : null;
+                if (imageResult.ImageType == ImageType.FullImageFile)
+                {
+                    path = $"{path}_{ImageType.FullImageFile}";
+                }
                 if (hash != null)
                 {
 
@@ -263,6 +272,7 @@ public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullI
                     }
                     else
                     { // new guid
+
                         GuidToKey[hash] = path;
                     }
                 }
@@ -279,9 +289,33 @@ private static BitmapImage LoadFullImage(string path)
             BitmapImage image = new BitmapImage();
             image.BeginInit();
             image.CacheOption = BitmapCacheOption.OnLoad;
-            image.UriSource = new Uri(path);
+            image.UriSource = new Uri(path);            
             image.CreateOptions = BitmapCreateOptions.IgnoreColorProfile;
             image.EndInit();
+
+            if (image.PixelWidth > 320)
+            {
+                BitmapImage resizedWidth = new BitmapImage();
+                resizedWidth.BeginInit();
+                resizedWidth.CacheOption = BitmapCacheOption.OnLoad;
+                resizedWidth.UriSource = new Uri(path);
+                resizedWidth.CreateOptions = BitmapCreateOptions.IgnoreColorProfile;
+                resizedWidth.DecodePixelWidth = 320;
+                resizedWidth.EndInit();
+
+                if (resizedWidth.PixelHeight > 320)
+                {
+                    BitmapImage resizedHeight = new BitmapImage();
+                    resizedHeight.BeginInit();
+                    resizedHeight.CacheOption = BitmapCacheOption.OnLoad;
+                    resizedHeight.UriSource = new Uri(path);
+                    resizedHeight.CreateOptions = BitmapCreateOptions.IgnoreColorProfile;
+                    resizedHeight.DecodePixelHeight = 320;
+                    resizedHeight.EndInit();
+                    return resizedHeight;
+                }
+                return resizedWidth;
+            }
             return image;
         }
     }

Flow.Launcher.Infrastructure/Image/ImageLoader.cs

@@ -146,6 +146,7 @@ public CustomBrowserViewModel CustomBrowser
         /// when false Alphabet static service will always return empty results
         /// </summary>
         public bool ShouldUsePinyin { get; set; } = false;
+        public bool AlwaysPreview { get; set; } = false;
 
         [JsonInclude, JsonConverter(typeof(JsonStringEnumConverter))]
         public SearchPrecisionScore QuerySearchPrecision { get; private set; } = SearchPrecisionScore.Regular;

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
+using System.Windows.Controls;
 using System.Windows.Media;
 
 namespace Flow.Launcher.Plugin
@@ -203,6 +204,11 @@ public override string ToString()
         /// </summary>
         public string SubTitleToolTip { get; set; }
 
+        /// <summary>
+        /// Customized Preview Panel
+        /// </summary>
+        public Lazy<UserControl> PreviewPanel { get; set; }
+
         /// <summary>
         /// Run this result, asynchronously
         /// </summary>
@@ -223,5 +229,30 @@ public ValueTask<bool> ExecuteAsync(ActionContext context)
         /// </summary>
         /// <default>#26a0da (blue)</default>
         public string ProgressBarColor { get; set; } = "#26a0da";
+
+        public PreviewInfo Preview { get; set; } = PreviewInfo.Default;
+
+        /// <summary>
+        /// Info of the preview image.
+        /// </summary>
+        public record PreviewInfo
+        {
+            /// <summary>
+            /// Full image used for preview panel
+            /// </summary>
+            public string PreviewImagePath { get; set; }
+            /// <summary>
+            /// Determines if the preview image should occupy the full width of the preveiw panel.
+            /// </summary>
+            public bool IsMedia { get; set; }
+            public string Description { get; set; }
+
+            public static PreviewInfo Default { get; } = new()
+            {
+                PreviewImagePath = null,
+                Description = null,
+                IsMedia = false,
+            };
+        }
     }
 }

Flow.Launcher.Plugin/Result.cs

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -92,7 +92,7 @@
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
     <PackageReference Include="ModernWpfUI" Version="0.9.4" />
     <PackageReference Include="NHotkey.Wpf" Version="2.1.0" />
-    <PackageReference Include="NuGet.CommandLine" Version="5.7.2">
+    <PackageReference Include="NuGet.CommandLine" Version="6.3.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>