Merge branch 'PrimaryMonitor' of https://github.com/onesounds/Flow.Launcher into pr/1978

Author: VictoriousRaptor

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -10,11 +10,18 @@ body:
 
   - type: checkboxes
     attributes:
-      label: Checks
+      label: Check New Issue
       options:
         - label: >
             I have checked that this issue has not already been reported.
 
+  - type: checkboxes
+    attributes:
+      label: Check Latest Version
+      options:
+        - label: >
+            I am using the latest version of Flow Launcher.
+
   - type: textarea
     attributes:
       label: Problem Description
@@ -54,7 +61,6 @@ body:
     validations:
       required: true
 
-
   - type: textarea
     id: logs
     attributes:

.github/actions/spelling/allow.txt

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

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

@@ -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>

Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs

@@ -14,8 +14,6 @@ public static class FilesFolders
     {
         private const string FileExplorerProgramName = "explorer";
 
-        private const string FileExplorerProgramEXE = "explorer.exe";
-
         /// <summary>
         /// Copies the folder and all of its files and folders 
         /// including subfolders to the target location
@@ -151,7 +149,12 @@ public static bool FileExists(this string filePath)
         /// <param name="fileOrFolderPath"></param>
         public static void OpenPath(string fileOrFolderPath)
         {
-            var psi = new ProcessStartInfo { FileName = FileExplorerProgramName, UseShellExecute = true, Arguments = '"' + fileOrFolderPath + '"' };
+            var psi = new ProcessStartInfo
+            {
+                FileName = FileExplorerProgramName,
+                UseShellExecute = true,
+                Arguments = '"' + fileOrFolderPath + '"'
+            };
             try
             {
                 if (LocationExists(fileOrFolderPath) || FileExists(fileOrFolderPath))
@@ -167,15 +170,6 @@ public static void OpenPath(string fileOrFolderPath)
             }
         }
 
-        /// <summary>
-        /// Open the folder that contains <paramref name="path"/>
-        /// </summary>
-        /// <param name="path"></param>
-        public static void OpenContainingFolder(string path)
-        {
-            Process.Start(FileExplorerProgramEXE, $" /select,\"{path}\"");
-        }
-
         ///<summary>
         /// This checks whether a given string is a directory path or network location string. 
         /// It does not check if location actually exists.

Flow.Launcher/MainWindow.xaml

@@ -335,11 +335,9 @@
                 </Grid>
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition
-                            Width="0.85*"
-                            MinWidth="244"
-                            MaxWidth="340" />
+                        <ColumnDefinition Width="*" MinWidth="100" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="0.85*" MinWidth="244" />
                     </Grid.ColumnDefinitions>
                     <StackPanel
                         x:Name="ResultArea"
@@ -394,9 +392,16 @@
                             </ContentControl>
                         </Border>
                     </StackPanel>
+                    <GridSplitter
+                        Grid.Column="1"
+                        Width="5"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Stretch"
+                        Background="Transparent"
+                        ShowsPreview="True" />
                     <Grid
                         x:Name="Preview"
-                        Grid.Column="1"
+                        Grid.Column="2"
                         VerticalAlignment="Stretch"
                         Style="{DynamicResource PreviewArea}"
                         Visibility="{Binding PreviewVisible, Converter={StaticResource BoolToVisibilityConverter}}">

Flow.Launcher/PublicAPIInstance.cs

@@ -1,4 +1,4 @@
- using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -195,17 +195,20 @@ public void SavePluginSettings()
             ((PluginJsonStorage<T>)_pluginJsonStorages[type]).Save();
         }
 
-        public void OpenDirectory(string DirectoryPath, string FileName = null)
+        public void OpenDirectory(string DirectoryPath, string FileNameOrFilePath = null)
         {
             using var explorer = new Process();
             var explorerInfo = _settingsVM.Settings.CustomExplorer;
             explorer.StartInfo = new ProcessStartInfo
             {
                 FileName = explorerInfo.Path,
-                Arguments = FileName is null ?
-                    explorerInfo.DirectoryArgument.Replace("%d", DirectoryPath) :
-                    explorerInfo.FileArgument.Replace("%d", DirectoryPath).Replace("%f",
-                        Path.IsPathRooted(FileName) ? FileName : Path.Combine(DirectoryPath, FileName))
+                Arguments = FileNameOrFilePath is null
+                    ? explorerInfo.DirectoryArgument.Replace("%d", DirectoryPath)
+                    : explorerInfo.FileArgument
+                        .Replace("%d", DirectoryPath)
+                        .Replace("%f",
+                            Path.IsPathRooted(FileNameOrFilePath) ? FileNameOrFilePath : Path.Combine(DirectoryPath, FileNameOrFilePath)
+                        )
             };
             explorer.Start();
         }

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -469,7 +469,7 @@ private void ShowPreview()
 
         private void HidePreview()
         {
-            ResultAreaColumn = 2;
+            ResultAreaColumn = 3;
             PreviewVisible = false;
         }
 

Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs

@@ -26,13 +26,19 @@ public PluginStoreItemViewModel(UserPlugin plugin)
         public string IcoPath => _plugin.IcoPath;
 
         public bool LabelInstalled => PluginManager.GetPluginForId(_plugin.ID) != null;
-        public bool LabelUpdate => LabelInstalled && _plugin.Version != PluginManager.GetPluginForId(_plugin.ID).Metadata.Version;
+        public bool LabelUpdate => LabelInstalled && VersionConvertor(_plugin.Version) > VersionConvertor(PluginManager.GetPluginForId(_plugin.ID).Metadata.Version);
 
         internal const string None = "None";
         internal const string RecentlyUpdated = "RecentlyUpdated";
         internal const string NewRelease = "NewRelease";
         internal const string Installed = "Installed";
 
+        public Version VersionConvertor(string version)
+        {
+            Version ResultVersion = new Version(version);
+            return ResultVersion;
+        }
+
         public string Category
         {
             get

Plugins/Flow.Launcher.Plugin.Explorer/Search/Everything/EverythingAPI.cs

@@ -17,7 +17,7 @@ public static class EverythingApi
     {
         private const int BufferSize = 4096;
 
-        private static SemaphoreSlim _semaphore = new(1, 1);
+        private static readonly SemaphoreSlim _semaphore = new(1, 1);
 
         // cached buffer to remove redundant allocations.
         private static readonly StringBuilder buffer = new(BufferSize);
@@ -34,6 +34,9 @@ public enum StateCode
             InvalidCallError
         }
 
+        const uint EVERYTHING_REQUEST_FULL_PATH_AND_FILE_NAME = 0x00000004u;
+        const uint EVERYTHING_REQUEST_RUN_COUNT = 0x00000400u;
+
         /// <summary>
         /// Checks whether the sort option is Fast Sort.
         /// </summary>
@@ -78,7 +81,7 @@ public static async IAsyncEnumerable<SearchResult> SearchAsync(EverythingSearchO
 
             if (option.MaxCount < 0)
                 throw new ArgumentOutOfRangeException(nameof(option.MaxCount), option.MaxCount, "MaxCount must be greater than or equal to 0");
-            
+
             await _semaphore.WaitAsync(token);
 
 
@@ -112,6 +115,17 @@ public static async IAsyncEnumerable<SearchResult> SearchAsync(EverythingSearchO
 
                 EverythingApiDllImport.Everything_SetSort(option.SortOption);
                 EverythingApiDllImport.Everything_SetMatchPath(option.IsFullPathSearch);
+                
+                if (option.SortOption == SortOption.RUN_COUNT_DESCENDING)
+                {
+                    EverythingApiDllImport.Everything_SetRequestFlags(EVERYTHING_REQUEST_FULL_PATH_AND_FILE_NAME | EVERYTHING_REQUEST_RUN_COUNT);
+                }
+                else
+                {
+                    EverythingApiDllImport.Everything_SetRequestFlags(EVERYTHING_REQUEST_FULL_PATH_AND_FILE_NAME);
+                }
+
+
 
                 if (token.IsCancellationRequested) yield break;
 
@@ -132,10 +146,12 @@ public static async IAsyncEnumerable<SearchResult> SearchAsync(EverythingSearchO
 
                     var result = new SearchResult
                     {
+                        // todo the types are wrong. Everything expects uint everywhere, but we send int just above/below. how to fix? Is EverythingApiDllImport autogenerated or handmade?
                         FullPath = buffer.ToString(),
                         Type = EverythingApiDllImport.Everything_IsFolderResult(idx) ? ResultType.Folder :
                             EverythingApiDllImport.Everything_IsFileResult(idx) ? ResultType.File :
-                            ResultType.Volume
+                            ResultType.Volume,
+                        Score = (int)EverythingApiDllImport.Everything_GetResultRunCount( (uint)idx) 
                     };
 
                     yield return result;
@@ -172,5 +188,19 @@ private static void CheckAndThrowExceptionOnError()
                     throw new ArgumentOutOfRangeException();
             }
         }
+
+        public static async Task IncrementRunCounterAsync(string fileOrFolder)
+        {
+            await _semaphore.WaitAsync(TimeSpan.FromSeconds(1));
+            try
+            {
+                _ = EverythingApiDllImport.Everything_IncRunCountFromFileName(fileOrFolder);
+            }
+            catch (Exception)
+            {
+                /*ignored*/
+            }
+            finally { _semaphore.Release(); }
+        }
     }
 }