Use score bump & Search window title

Author: Jack251970

Plugins/Flow.Launcher.Plugin.ProcessKiller/Main.cs

@@ -64,28 +64,38 @@ private record RunningProcessInfo(string ProcessName, string MainWindowTitle);
 
         private List<Result> CreateResultsFromQuery(Query query)
         {
-            string termToSearch = query.Search;
-            var processList = processHelper.GetMatchingProcesses(termToSearch);
-            var processWithNonEmptyMainWindowTitleList = ProcessHelper.GetProcessesWithNonEmptyWindowTitle();
+            var searchTerm = query.Search;
+            var processWindowTitle = ProcessHelper.GetProcessesWithNonEmptyWindowTitle();
+            var processList = processHelper.GetMatchingProcesses(searchTerm, processWindowTitle);
 
             if (!processList.Any())
             {
                 return null;
             }
 
             var results = new List<Result>();
-
             foreach (var pr in processList)
             {
                 var p = pr.Process;
                 var path = processHelper.TryGetProcessFilename(p);
+                var title = p.ProcessName + " - " + p.Id;
+                var score = pr.Score;
+                if (processWindowTitle.TryGetValue(p.Id, out var mainWindowTitle))
+                {
+                    title = mainWindowTitle;
+                    if (string.IsNullOrWhiteSpace(searchTerm))
+                    {
+                        // Add score to prioritize processes with visible windows
+                        score += 200;
+                    }
+                }
                 results.Add(new Result()
                 {
                     IcoPath = path,
-                    Title = processWithNonEmptyMainWindowTitleList.TryGetValue(p.Id, out var mainWindowTitle) ? mainWindowTitle : p.ProcessName + " - " + p.Id,
+                    Title = title,
                     SubTitle = path,
-                    TitleHighlightData = StringMatcher.FuzzySearch(termToSearch, p.ProcessName).MatchData,
-                    Score = pr.Score,
+                    TitleHighlightData = StringMatcher.FuzzySearch(searchTerm, p.ProcessName).MatchData,
+                    Score = score,
                     ContextData = new RunningProcessInfo(p.ProcessName, mainWindowTitle),
                     AutoCompleteText = $"{_context.CurrentPluginMetadata.ActionKeyword}{Plugin.Query.TermSeparator}{p.ProcessName}",
                     Action = (c) =>
@@ -98,14 +108,13 @@ private List<Result> CreateResultsFromQuery(Query query)
             }
 
             var sortedResults = results
-                .OrderBy(x => string.IsNullOrEmpty(((RunningProcessInfo)x.ContextData).MainWindowTitle))
-                .ThenBy(x => x.Title)
+                .OrderBy(x => x.Title)
                 .ToList();
 
             // When there are multiple results AND all of them are instances of the same executable
             // add a quick option to kill them all at the top of the results.
             var firstResult = sortedResults.FirstOrDefault(x => !string.IsNullOrEmpty(x.SubTitle));
-            if (processList.Count > 1 && !string.IsNullOrEmpty(termToSearch) && sortedResults.All(r => r.SubTitle == firstResult?.SubTitle))
+            if (processList.Count > 1 && !string.IsNullOrEmpty(searchTerm) && sortedResults.All(r => r.SubTitle == firstResult?.SubTitle))
             {
                 sortedResults.Insert(1, new Result()
                 {

Plugins/Flow.Launcher.Plugin.ProcessKiller/ProcessHelper.cs

@@ -39,7 +39,7 @@ private bool IsSystemProcess(Process p) => _systemProcessList.Contains(p.Process
         /// <summary>
         /// Returns a ProcessResult for evey running non-system process whose name matches the given searchTerm
         /// </summary>
-        public List<ProcessResult> GetMatchingProcesses(string searchTerm)
+        public List<ProcessResult> GetMatchingProcesses(string searchTerm, Dictionary<int, string> processWindowTitle)
         {
             var processlist = new List<ProcessResult>();
 
@@ -49,15 +49,27 @@ public List<ProcessResult> GetMatchingProcesses(string searchTerm)
 
                 if (string.IsNullOrWhiteSpace(searchTerm))
                 {
-                    // show all non-system processes
+                    // Show all non-system processes
                     processlist.Add(new ProcessResult(p, 0));
                 }
                 else
                 {
-                    var score = StringMatcher.FuzzySearch(searchTerm, p.ProcessName + p.Id).Score;
-                    if (score > 0)
+                    // Search window title first
+                    if (processWindowTitle.TryGetValue(p.Id, out var windowTitle))
                     {
-                        processlist.Add(new ProcessResult(p, score));
+                        var score = StringMatcher.FuzzySearch(searchTerm, windowTitle).Score;
+                        if (score > 0)
+                        {
+                            processlist.Add(new ProcessResult(p, score));
+                        }
+                    }
+
+                    // Search process name and process id
+                    var score1 = StringMatcher.FuzzySearch(searchTerm, p.ProcessName + " - " + p.Id).Score;
+                    if (score1 > 0)
+                    {
+                        processlist.Add(new ProcessResult(p, score1));
+                        continue;
                     }
                 }
             }