Merge pull request #2066 from Flow-Launcher/dev

Release 1.15.0 | Plugin 4.0.1

Author: jjw24

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -14,7 +14,9 @@ body:
       options:
         - label: >
             I have checked that this issue has not already been reported.
-
+        - label: >
+            I am using the latest version of Flow Launcher.
+        
   - type: textarea
     attributes:
       label: Problem Description
@@ -54,7 +56,6 @@ body:
     validations:
       required: true
 
-
   - type: textarea
     id: logs
     attributes:

.github/actions/spelling/allow.txt

@@ -2,3 +2,4 @@ github
 https
 ssh
 ubuntu
+runcount

.github/actions/spelling/expect.txt

@@ -1,6 +1,7 @@
 crowdin
 DWM
 workflows
+Wpf
 wpf
 actionkeyword
 stackoverflow

.github/workflows/stale.yml

@@ -13,7 +13,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v8
         with:
           stale-issue-message: 'This issue is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
           days-before-stale: 45

Flow.Launcher.Core/Plugin/PluginManager.cs

@@ -48,6 +48,9 @@ private static void DeletePythonBinding()
             }
         }
 
+        /// <summary>
+        /// Save json and ISavable 
+        /// </summary>
         public static void Save()
         {
             foreach (var plugin in AllPlugins)

Flow.Launcher.Infrastructure/Constant.cs

@@ -19,7 +19,7 @@ public static class Constant
         public static readonly string RootDirectory = Directory.GetParent(ApplicationDirectory).ToString();
 
         public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins);
-        public const string Issue = "https://github.com/Flow-Launcher/Flow.Launcher/issues/new";
+        public const string IssuesUrl = "https://github.com/Flow-Launcher/Flow.Launcher/issues";
         public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion;
         public static readonly string Dev = "Dev";
         public const string Documentation = "https://flowlauncher.com/docs/#/usage-tips";

Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs

@@ -3,7 +3,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using System.Xml;
 using Microsoft.Win32;
 
 namespace Flow.Launcher.Infrastructure.Exception
@@ -63,7 +62,7 @@ private static string CreateExceptionReport(System.Exception ex)
             sb.AppendLine($"* Command Line: {Environment.CommandLine}");
             sb.AppendLine($"* Timestamp: {DateTime.Now.ToString(CultureInfo.InvariantCulture)}");
             sb.AppendLine($"* Flow Launcher version: {Constant.Version}");
-            sb.AppendLine($"* OS Version: {Environment.OSVersion.VersionString}");
+            sb.AppendLine($"* OS Version: {GetWindowsFullVersionFromRegistry()}");
             sb.AppendLine($"* IntPtr Length: {IntPtr.Size}");
             sb.AppendLine($"* x64: {Environment.Is64BitOperatingSystem}");
             sb.AppendLine($"* Python Path: {Constant.PythonPath}");
@@ -173,5 +172,35 @@ private static List<string> GetFrameworkVersionFromRegistry()
             }
 
         }
+
+        public static string GetWindowsFullVersionFromRegistry()
+        {
+            try
+            {
+                var buildRevision = GetWindowsRevisionFromRegistry();
+                var currentBuild = Environment.OSVersion.Version.Build;
+                return currentBuild.ToString() + "." + buildRevision;
+            }
+            catch
+            {
+                return Environment.OSVersion.VersionString;
+            }
+        }
+
+        public static string GetWindowsRevisionFromRegistry()
+        {
+            try
+            {
+                using (RegistryKey registryKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion\"))
+                {
+                    var buildRevision = registryKey.GetValue("UBR").ToString();
+                    return buildRevision;
+                }
+            }
+            catch
+            {
+                return "0";
+            }
+        }
     }
 }

Flow.Launcher.Infrastructure/Image/ImageCache.cs

@@ -28,7 +28,7 @@ public class ImageCache
         private const int permissibleFactor = 2;
         private SemaphoreSlim semaphore = new(1, 1);
 
-        public void Initialization(Dictionary<(string, bool), int> usage)
+        public void Initialize(Dictionary<(string, bool), int> usage)
         {
             foreach (var key in usage.Keys)
             {

Flow.Launcher.Infrastructure/Image/ImageLoader.cs

@@ -40,6 +40,8 @@ public static void Initialize()
 
             var usage = LoadStorageToConcurrentDictionary();
 
+            ImageCache.Initialize(usage.ToDictionary(x => x.Key, x => x.Value));
+
             foreach (var icon in new[]
                      {
                          Constant.DefaultIcon, Constant.MissingImgIcon
@@ -269,7 +271,7 @@ public static async ValueTask<ImageSource> LoadAsync(string path, bool loadFullI
 
                     if (GuidToKey.TryGetValue(hash, out string key))
                     { // image already exists
-                        img = ImageCache[key, false] ?? img;
+                        img = ImageCache[key, loadFullImage] ?? img;
                     }
                     else
                     { // new guid

Flow.Launcher.Infrastructure/Logger/Log.cs

@@ -5,11 +5,9 @@
 using NLog.Config;
 using NLog.Targets;
 using Flow.Launcher.Infrastructure.UserSettings;
-using JetBrains.Annotations;
 using NLog.Fluent;
 using NLog.Targets.Wrappers;
 using System.Runtime.ExceptionServices;
-using System.Text;
 
 namespace Flow.Launcher.Infrastructure.Logger
 {
@@ -76,7 +74,6 @@ private static bool FormatValid(string message)
             return valid;
         }
 
-
         public static void Exception(string className, string message, System.Exception exception, [CallerMemberName] string methodName = "")
         {
             exception = exception.Demystify();
@@ -115,8 +112,6 @@ private static void ExceptionInternal(string classAndMethod, string message, Sys
         {
             var logger = LogManager.GetLogger(classAndMethod);
 
-            var messageBuilder = new StringBuilder();
-
             logger.Error(e, message);
         }
 
@@ -136,7 +131,8 @@ private static void LogInternal(string message, LogLevel level)
             }
         }
 
-        /// <param name="message">example: "|prefix|unprefixed" </param>
+        /// Example: "|ClassName.MethodName|Message"
+        /// <param name="message">Example: "|ClassName.MethodName|Message" </param>
         /// <param name="e">Exception</param>
         public static void Exception(string message, System.Exception e)
         {
@@ -158,7 +154,7 @@ public static void Exception(string message, System.Exception e)
 #endif
         }
 
-        /// <param name="message">example: "|prefix|unprefixed" </param>
+        /// Example: "|ClassName.MethodName|Message"
         public static void Error(string message)
         {
             LogInternal(message, LogLevel.Error);
@@ -183,7 +179,7 @@ public static void Debug(string className, string message, [CallerMemberName] st
             LogInternal(LogLevel.Debug, className, message, methodName);
         }
 
-        /// <param name="message">example: "|prefix|unprefixed" </param>
+        /// Example: "|ClassName.MethodName|Message""
         public static void Debug(string message)
         {
             LogInternal(message, LogLevel.Debug);
@@ -194,7 +190,7 @@ public static void Info(string className, string message, [CallerMemberName] str
             LogInternal(LogLevel.Info, className, message, methodName);
         }
 
-        /// <param name="message">example: "|prefix|unprefixed" </param>
+        /// Example: "|ClassName.MethodName|Message"
         public static void Info(string message)
         {
             LogInternal(message, LogLevel.Info);
@@ -205,7 +201,7 @@ public static void Warn(string className, string message, [CallerMemberName] str
             LogInternal(LogLevel.Warn, className, message, methodName);
         }
 
-        /// <param name="message">example: "|prefix|unprefixed" </param>
+        /// Example: "|ClassName.MethodName|Message"
         public static void Warn(string message)
         {
             LogInternal(message, LogLevel.Warn);

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -195,6 +195,17 @@ public string QuerySearchPrecisionString
 
         public double WindowLeft { get; set; }
         public double WindowTop { get; set; }
+        
+        /// <summary>
+        /// Custom left position on selected monitor
+        /// </summary>
+        public double CustomWindowLeft { get; set; } = 0;
+        
+        /// <summary>
+        /// Custom top position on selected monitor
+        /// </summary>
+        public double CustomWindowTop { get; set; } = 0;
+        
         public int MaxResultsToShow { get; set; } = 5;
         public int ActivateTimes { get; set; }
 
@@ -227,7 +238,15 @@ public bool HideNotifyIcon
         }
         public bool LeaveCmdOpen { get; set; }
         public bool HideWhenDeactivated { get; set; } = true;
-        public SearchWindowPositions SearchWindowPosition { get; set; } = SearchWindowPositions.MouseScreenCenter;
+
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public SearchWindowScreens SearchWindowScreen { get; set; } = SearchWindowScreens.Cursor;
+        
+        [JsonConverter(typeof(JsonStringEnumConverter))]
+        public SearchWindowAligns SearchWindowAlign { get; set; } = SearchWindowAligns.Center;
+
+        public int CustomScreenNumber { get; set; } = 1;
+
         public bool IgnoreHotkeysOnFullscreen { get; set; }
 
         public HttpProxy Proxy { get; set; } = new HttpProxy();
@@ -253,12 +272,22 @@ public enum ColorSchemes
         Light,
         Dark
     }
-    public enum SearchWindowPositions
+    
+    public enum SearchWindowScreens
     {
         RememberLastLaunchLocation,
-        MouseScreenCenter,
-        MouseScreenCenterTop,
-        MouseScreenLeftTop,
-        MouseScreenRightTop
+        Cursor,
+        Focus,
+        Primary,
+        Custom
+    }
+    
+    public enum SearchWindowAligns
+    {
+        Center,
+        CenterTop,
+        LeftTop,
+        RightTop,
+        Custom
     }
 }

Flow.Launcher.Plugin/ActionContext.cs

@@ -1,4 +1,6 @@
-namespace Flow.Launcher.Plugin
+using System.Windows.Input;
+
+namespace Flow.Launcher.Plugin
 {
     public class ActionContext
     {
@@ -11,5 +13,13 @@ public class SpecialKeyState
         public bool ShiftPressed { get; set; }
         public bool AltPressed { get; set; }
         public bool WinPressed { get; set; }
+
+        public ModifierKeys ToModifierKeys()
+        {
+            return (CtrlPressed ? ModifierKeys.Control : ModifierKeys.None) |
+                   (ShiftPressed ? ModifierKeys.Shift : ModifierKeys.None) |
+                   (AltPressed ? ModifierKeys.Alt : ModifierKeys.None) |
+                   (WinPressed ? ModifierKeys.Windows : ModifierKeys.None);
+        }
     }
-}
+}

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

@@ -14,10 +14,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>4.0.0</Version>
-    <PackageVersion>4.0.0</PackageVersion>
-    <AssemblyVersion>4.0.0</AssemblyVersion>
-    <FileVersion>4.0.0</FileVersion>
+    <Version>4.0.1</Version>
+    <PackageVersion>4.0.1</PackageVersion>
+    <AssemblyVersion>4.0.1</AssemblyVersion>
+    <FileVersion>4.0.1</FileVersion>
     <PackageId>Flow.Launcher.Plugin</PackageId>
     <Authors>Flow-Launcher</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -20,8 +20,8 @@ public interface IPublicAPI
         /// </summary>
         /// <param name="query">query text</param>
         /// <param name="requery">
-        /// force requery By default, Flow Launcher will not fire query if your query is same with existing one. 
-        /// Set this to true to force Flow Launcher requerying
+        /// Force requery. By default, Flow Launcher will not fire query if your query is same with existing one. 
+        /// Set this to <see langword="true"/> to force Flow Launcher requerying
         /// </param>
         void ChangeQuery(string query, bool requery = false);
 
@@ -233,8 +233,8 @@ public interface IPublicAPI
         /// Open directory in an explorer configured by user via Flow's Settings. The default is Windows Explorer
         /// </summary>
         /// <param name="DirectoryPath">Directory Path to open</param>
-        /// <param name="FileName">Extra FileName Info</param>
-        public void OpenDirectory(string DirectoryPath, string FileName = null);
+        /// <param name="FileNameOrFilePath">Extra FileName Info</param>
+        public void OpenDirectory(string DirectoryPath, string FileNameOrFilePath = null);
 
         /// <summary>
         /// Opens the URL with the given Uri object. 

Flow.Launcher.Plugin/Result.cs

@@ -178,7 +178,7 @@ public override int GetHashCode()
         /// <inheritdoc />
         public override string ToString()
         {
-            return Title + SubTitle;
+            return Title + SubTitle + Score;
         }
 
         /// <summary>