Merge remote-tracking branch 'origin/dev' into GlobalHotkeyRefactor

Author: jjw24

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.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/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 DarkMode { get; set; } = "System";
         public bool ShowOpenResultHotkey { get; set; } = true;
         public double WindowSize { get; set; } = 580;
 
@@ -82,6 +83,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
@@ -163,4 +166,11 @@ public enum LastQueryMode
         Empty,
         Preserved
     }
+
+    public enum DarkMode
+    {
+        System,
+        Light,
+        Dark
+    }
 }

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -29,6 +29,15 @@ public interface IPublicAPI
         /// </summary>
         void RestartApp();
 
+        /// <summary>
+        /// Run a shell command
+        /// </summary>
+        /// <param name="cmd">The command or program to run</param>
+        /// <param name="filename">the shell type to run, e.g. powershell.exe</param>
+        /// <exception cref="FileNotFoundException">Thrown when unable to find the file specified in the command </exception>
+        /// <exception cref="Win32Exception">Thrown when error occurs during the execution of the command </exception>
+        void ShellRun(string cmd, string filename = "cmd.exe");
+
         /// <summary>
         /// Save everything, all of Flow Launcher and plugins' data and settings
         /// </summary>

Flow.Launcher.Plugin/Result.cs

@@ -50,7 +50,7 @@ public string IcoPath
         /// <summary>
         /// Delegate to Get Image Source
         /// </summary>
-        public IconDelegate Icon { get; set; }
+        public IconDelegate Icon;
 
         /// <summary>
         /// Information for Glyph Icon

Flow.Launcher.Plugin/SharedCommands/ShellCommand.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -60,17 +60,39 @@ private static string GetWindowTitle(IntPtr hwnd)
             return sb.ToString();
         }
 
-        public static ProcessStartInfo SetProcessStartInfo(this string fileName, string workingDirectory = "", string arguments = "", string verb = "")
+        public static ProcessStartInfo SetProcessStartInfo(this string fileName, string workingDirectory = "", string arguments = "", string verb = "", bool createNoWindow = false)
         {
             var info = new ProcessStartInfo
             {
                 FileName = fileName,
                 WorkingDirectory = workingDirectory,
                 Arguments = arguments,
-                Verb = verb
+                Verb = verb,
+                CreateNoWindow = createNoWindow
             };
 
             return info;
         }
+
+        /// <summary>
+        /// Runs a windows command using the provided ProcessStartInfo
+        /// </summary>
+        /// <exception cref="FileNotFoundException">Thrown when unable to find the file specified in the command </exception>
+        /// <exception cref="Win32Exception">Thrown when error occurs during the execution of the command </exception>
+        public static void Execute(ProcessStartInfo info)
+        {
+            Execute(Process.Start, info);
+        }
+
+        /// <summary>
+        /// Runs a windows command using the provided ProcessStartInfo using a custom execute command function
+        /// </summary>
+        /// <param name="Func startProcess">allows you to pass in a custom command execution function</param>
+        /// <exception cref="FileNotFoundException">Thrown when unable to find the file specified in the command </exception>
+        /// <exception cref="Win32Exception">Thrown when error occurs during the execution of the command </exception>
+        public static void Execute(Func<ProcessStartInfo, Process> startProcess, ProcessStartInfo info)
+        {
+            startProcess(info);
+        }
     }
 }

Flow.Launcher.Test/PluginLoadTest.cs

@@ -0,0 +1,92 @@
+using NUnit.Framework;
+using Flow.Launcher.Core.Plugin;
+using Flow.Launcher.Plugin;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Flow.Launcher.Test
+{
+    [TestFixture]
+    class PluginLoadTest
+    {
+        [Test]
+        public void GivenDuplicatePluginMetadatasWhenLoadedThenShouldReturnOnlyUniqueList()
+        {
+            // Given
+            var duplicateList = new List<PluginMetadata>
+            {
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B4085823D60DC76F28855",
+                    Version = "1.0.0"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B4085823D60DC76F28855",
+                    Version = "1.0.1"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B4085823D60DC76F28855",
+                    Version = "1.0.2"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B4085823D60DC76F28855",
+                    Version = "1.0.0"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B4085823D60DC76F28855",
+                    Version = "1.0.0"
+                },
+                new PluginMetadata
+                {
+                    ID = "ABC0TYUC6D3B7855823D60DC76F28855",
+                    Version = "1.0.0"
+                },
+                new PluginMetadata
+                {
+                    ID = "ABC0TYUC6D3B7855823D60DC76F28855",
+                    Version = "1.0.0"
+                }
+            };
+
+            // When
+            (var unique, var duplicates) = PluginConfig.GetUniqueLatestPluginMetadata(duplicateList);
+            
+            // Then
+            Assert.True(unique.FirstOrDefault().ID == "CEA0TYUC6D3B4085823D60DC76F28855" && unique.FirstOrDefault().Version == "1.0.2");
+            Assert.True(unique.Count() == 1);
+
+            Assert.False(duplicates.Any(x => x.Version == "1.0.2" && x.ID == "CEA0TYUC6D3B4085823D60DC76F28855"));
+            Assert.True(duplicates.Count() == 6);
+        }
+
+        [Test]
+        public void GivenDuplicatePluginMetadatasWithNoUniquePluginWhenLoadedThenShouldReturnEmptyList()
+        {
+            // Given
+            var duplicateList = new List<PluginMetadata>
+            {
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B7855823D60DC76F28855",
+                    Version = "1.0.0"
+                },
+                new PluginMetadata
+                {
+                    ID = "CEA0TYUC6D3B7855823D60DC76F28855",
+                    Version = "1.0.0"
+                }
+            };
+
+            // When
+            (var unique, var duplicates) = PluginConfig.GetUniqueLatestPluginMetadata(duplicateList);
+
+            // Then
+            Assert.True(unique.Count() == 0);
+            Assert.True(duplicates.Count() == 2);
+        }
+    }
+}