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

Author: taooceros

Flow.Launcher.Core/Plugin/PluginConfig.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.IO;
@@ -45,8 +45,56 @@ public static List<PluginMetadata> Parse(string[] pluginDirectories)
                     }
                 }
             }
- 
-            return allPluginMetadata;
+
+            (List<PluginMetadata> uniqueList, List<PluginMetadata> duplicateList) = GetUniqueLatestPluginMetadata(allPluginMetadata);
+
+            duplicateList
+                .ForEach(
+                    x => Log.Warn("PluginConfig",
+                                    string.Format("Duplicate plugin name: {0}, id: {1}, version: {2} " +
+                                                    "not loaded due to version not the highest of the duplicates",
+                                                    x.Name, x.ID, x.Version),
+                                                    "GetUniqueLatestPluginMetadata"));
+
+            return uniqueList;
+        }
+
+        internal static (List<PluginMetadata>, List<PluginMetadata>) GetUniqueLatestPluginMetadata(List<PluginMetadata> allPluginMetadata)
+        {
+            var duplicate_list = new List<PluginMetadata>();
+            var unique_list = new List<PluginMetadata>();
+
+            var duplicateGroups = allPluginMetadata.GroupBy(x => x.ID).Where(g => g.Count() > 1).Select(y => y).ToList();
+
+            foreach (var metadata in allPluginMetadata)
+            {
+                var duplicatesExist = false;
+                foreach (var group in duplicateGroups)
+                {
+                    if (metadata.ID == group.Key)
+                    {
+                        duplicatesExist = true;
+
+                        // If metadata's version greater than each duplicate's version, CompareTo > 0
+                        var count = group.Where(x => metadata.Version.CompareTo(x.Version) > 0).Count();
+                        
+                        // Only add if the meatadata's version is the highest of all duplicates in the group
+                        if (count == group.Count() - 1)
+                        {
+                            unique_list.Add(metadata);
+                        }
+                        else
+                        {
+                            duplicate_list.Add(metadata);
+                        }
+                    }
+                }
+                
+                if (!duplicatesExist)
+                    unique_list.Add(metadata);
+            }
+
+            return (unique_list, duplicate_list);
         }
 
         private static PluginMetadata GetPluginMetadata(string pluginDirectory)

Flow.Launcher.Core/Plugin/PythonPlugin.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
@@ -28,6 +28,11 @@ public PythonPlugin(string filename)
             var path = Path.Combine(Constant.ProgramDirectory, JsonRPC);
             _startInfo.EnvironmentVariables["PYTHONPATH"] = path;
 
+            _startInfo.EnvironmentVariables["FLOW_VERSION"] = Constant.Version;
+            _startInfo.EnvironmentVariables["FLOW_PROGRAM_DIRECTORY"] = Constant.ProgramDirectory;
+            _startInfo.EnvironmentVariables["FLOW_APPLICATION_DIRECTORY"] = Constant.ApplicationDirectory;
+
+
             //Add -B flag to tell python don't write .py[co] files. Because .pyc contains location infos which will prevent python portable
             _startInfo.ArgumentList.Add("-B");
         }
@@ -54,4 +59,4 @@ public override async Task InitAsync(PluginInitContext context)
             _startInfo.WorkingDirectory = context.CurrentPluginMetadata.PluginDirectory;
         }
     }
-}
+}

Flow.Launcher.Core/Resource/AvailableLanguages.cs

@@ -17,7 +17,8 @@ internal static class AvailableLanguages
         public static Language German = new Language("de", "Deutsch");
         public static Language Korean = new Language("ko", "한국어");
         public static Language Serbian = new Language("sr", "Srpski");
-        public static Language Portuguese_BR = new Language("pt-br", "Português (Brasil)");
+        public static Language Portuguese_Portugal = new Language("pt-pt", "Português");
+        public static Language Portuguese_Brazil = new Language("pt-br", "Português (Brasil)");
         public static Language Italian = new Language("it", "Italiano");
         public static Language Norwegian_Bokmal = new Language("nb-NO", "Norsk Bokmål");
         public static Language Slovak = new Language("sk", "Slovenský");
@@ -40,7 +41,8 @@ public static List<Language> GetAvailableLanguages()
                 German,
                 Korean,
                 Serbian,
-                Portuguese_BR,
+                Portuguese_Portugal,
+                Portuguese_Brazil,
                 Italian,
                 Norwegian_Bokmal,
                 Slovak,

Flow.Launcher.Core/Resource/Internationalization.cs

@@ -10,6 +10,7 @@
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using System.Globalization;
+using System.Threading.Tasks;
 
 namespace Flow.Launcher.Core.Resource
 {
@@ -95,10 +96,13 @@ public void ChangeLanguage(Language language)
             {
                 LoadLanguage(language);
             }
-            UpdatePluginMetadataTranslations();
             Settings.Language = language.LanguageCode;
             CultureInfo.CurrentCulture = new CultureInfo(language.LanguageCode);
             CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture;
+            Task.Run(() =>
+            {
+                UpdatePluginMetadataTranslations();
+            });
         }
 
         public bool PromptShouldUsePinyin(string languageCodeToSet)

Flow.Launcher.Infrastructure/Constant.cs

@@ -35,8 +35,16 @@ public static class Constant
 
         public const string DefaultTheme = "Win11Light";
 
+        public const string Light = "Light";
+        public const string Dark = "Dark";
+        public const string System = "System";
+
         public const string Themes = "Themes";
+        public const string Settings = "Settings";
+        public const string Logs = "Logs";
 
         public const string Website = "https://flow-launcher.github.io";
+        public const string GitHub = "https://github.com/Flow-Launcher/Flow.Launcher";
+        public const string Docs = "https://flow-launcher.github.io/docs";
     }
 }

Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj

@@ -11,6 +11,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -21,7 +22,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
 
@@ -32,7 +32,6 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
 

Flow.Launcher.Infrastructure/Hotkey/GlobalHotkey.cs

@@ -9,41 +9,28 @@ namespace Flow.Launcher.Infrastructure.Hotkey
     /// Listens keyboard globally.
     /// <remarks>Uses WH_KEYBOARD_LL.</remarks>
     /// </summary>
-    public class GlobalHotkey : IDisposable
+    public unsafe class GlobalHotkey : IDisposable
     {
-        private static GlobalHotkey instance;
-        private InterceptKeys.LowLevelKeyboardProc hookedLowLevelKeyboardProc;
-        private IntPtr hookId = IntPtr.Zero;
+        private static readonly IntPtr hookId;
+        
+        
+        
         public delegate bool KeyboardCallback(KeyEvent keyEvent, int vkCode, SpecialKeyState state);
-        public event KeyboardCallback hookedKeyboardCallback;
+        internal static Func<KeyEvent, int, SpecialKeyState, bool> hookedKeyboardCallback;
 
         //Modifier key constants
         private const int VK_SHIFT = 0x10;
         private const int VK_CONTROL = 0x11;
         private const int VK_ALT = 0x12;
         private const int VK_WIN = 91;
 
-        public static GlobalHotkey Instance
+        static GlobalHotkey()
         {
-            get
-            {
-                if (instance == null)
-                {
-                    instance = new GlobalHotkey();
-                }
-                return instance;
-            }
-        }
-
-        private GlobalHotkey()
-        {
-            // We have to store the LowLevelKeyboardProc, so that it is not garbage collected runtime
-            hookedLowLevelKeyboardProc = LowLevelKeyboardProc;
             // Set the hook
-            hookId = InterceptKeys.SetHook(hookedLowLevelKeyboardProc);
+            hookId = InterceptKeys.SetHook(& LowLevelKeyboardProc);
         }
 
-        public SpecialKeyState CheckModifiers()
+        public static SpecialKeyState CheckModifiers()
         {
             SpecialKeyState state = new SpecialKeyState();
             if ((InterceptKeys.GetKeyState(VK_SHIFT) & 0x8000) != 0)
@@ -70,8 +57,8 @@ public SpecialKeyState CheckModifiers()
             return state;
         }
 
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private IntPtr LowLevelKeyboardProc(int nCode, UIntPtr wParam, IntPtr lParam)
+        [UnmanagedCallersOnly]
+        private static IntPtr LowLevelKeyboardProc(int nCode, UIntPtr wParam, IntPtr lParam)
         {
             bool continues = true;
 
@@ -91,17 +78,17 @@ private IntPtr LowLevelKeyboardProc(int nCode, UIntPtr wParam, IntPtr lParam)
             {
                 return InterceptKeys.CallNextHookEx(hookId, nCode, wParam, lParam);
             }
-            return (IntPtr)1;
+            return (IntPtr)(-1);
         }
 
-        ~GlobalHotkey()
+        public void Dispose()
         {
-            Dispose();
+            InterceptKeys.UnhookWindowsHookEx(hookId);
         }
 
-        public void Dispose()
+        ~GlobalHotkey()
         {
-            InterceptKeys.UnhookWindowsHookEx(hookId);
+            Dispose();
         }
     }
 }

Flow.Launcher.Infrastructure/Hotkey/InterceptKeys.cs

@@ -4,13 +4,13 @@
 
 namespace Flow.Launcher.Infrastructure.Hotkey
 {
-    internal static class InterceptKeys
+    internal static unsafe class InterceptKeys
     {
         public delegate IntPtr LowLevelKeyboardProc(int nCode, UIntPtr wParam, IntPtr lParam);
 
         private const int WH_KEYBOARD_LL = 13;
 
-        public static IntPtr SetHook(LowLevelKeyboardProc proc)
+        public static IntPtr SetHook(delegate* unmanaged<int, UIntPtr, IntPtr, IntPtr> proc)
         {
             using (Process curProcess = Process.GetCurrentProcess())
             using (ProcessModule curModule = curProcess.MainModule)
@@ -20,7 +20,7 @@ public static IntPtr SetHook(LowLevelKeyboardProc proc)
         }
 
         [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr SetWindowsHookEx(int idHook, LowLevelKeyboardProc lpfn, IntPtr hMod, uint dwThreadId);
+        public static extern IntPtr SetWindowsHookEx(int idHook, delegate* unmanaged<int, UIntPtr, IntPtr, IntPtr> lpfn, IntPtr hMod, uint dwThreadId);
 
         [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

@@ -15,6 +15,7 @@ public class Settings : BaseModel
         private string language = "en";
         public string Hotkey { get; set; } = $"{KeyConstant.Alt} + {KeyConstant.Space}";
         public string OpenResultModifiers { get; set; } = KeyConstant.Alt;
+        public string ColorScheme { get; set; } = "System";
         public bool ShowOpenResultHotkey { get; set; } = true;
         public double WindowSize { get; set; } = 580;
 
@@ -38,6 +39,7 @@ public string Language
         public string ResultFontWeight { get; set; }
         public string ResultFontStretch { get; set; }
         public bool UseGlyphIcons { get; set; } = true;
+        public bool FirstLaunch { get; set; } = true;
 
         public int CustomExplorerIndex { get; set; } = 0;
 
@@ -82,6 +84,8 @@ public CustomExplorerViewModel CustomExplorer
             }
         };
 
+        public bool UseAnimation { get; set; } = true;
+        public bool UseSound { get; set; } = true;
 
         /// <summary>
         /// when false Alphabet static service will always return empty results
@@ -130,8 +134,8 @@ public string QuerySearchPrecisionString
         public bool DontPromptUpdateMsg { get; set; }
         public bool EnableUpdateLog { get; set; }
 
-        public bool StartFlowLauncherOnSystemStartup { get; set; } = true;
-        public bool HideOnStartup { get; set; }
+        public bool StartFlowLauncherOnSystemStartup { get; set; } = false;
+        public bool HideOnStartup { get; set; } = true;
         bool _hideNotifyIcon { get; set; }
         public bool HideNotifyIcon
         {
@@ -163,4 +167,11 @@ public enum LastQueryMode
         Empty,
         Preserved
     }
+
+    public enum ColorSchemes
+    {
+        System,
+        Light,
+        Dark
+    }
 }

Flow.Launcher.Plugin/Interfaces/IPluginI18n.cs

@@ -1,4 +1,6 @@
-namespace Flow.Launcher.Plugin
+using System.Globalization;
+
+namespace Flow.Launcher.Plugin
 {
     /// <summary>
     /// Represent plugins that support internationalization
@@ -8,5 +10,13 @@ public interface IPluginI18n : IFeatures
         string GetTranslatedPluginTitle();
 
         string GetTranslatedPluginDescription();
+
+        /// <summary>
+        /// The method will be invoked when language of flow changed
+        /// </summary>
+        void OnCultureInfoChanged(CultureInfo newCulture)
+        {
+
+        }
     }
 }