Merge pull request #2088 from VictoriousRaptor/RequeryAfterKilling

Requery after killing a process

Author: VictoriousRaptor

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);
 

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

@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Diagnostics;
-using System.Dynamic;
-using System.Runtime.InteropServices;
 using Flow.Launcher.Infrastructure;
-using Flow.Launcher.Infrastructure.Logger;
+using System.Threading.Tasks;
 
 namespace Flow.Launcher.Plugin.ProcessKiller
 {
@@ -23,13 +18,7 @@ public void Init(PluginInitContext context)
 
         public List<Result> Query(Query query)
         {
-            var termToSearch = query.Search;
-
-            var processlist = processHelper.GetMatchingProcesses(termToSearch);
-
-            return !processlist.Any()
-                ? null
-                : CreateResultsFromProcesses(processlist, termToSearch);
+            return CreateResultsFromQuery(query);
         }
 
         public string GetTranslatedPluginTitle()
@@ -50,7 +39,7 @@ public List<Result> LoadContextMenus(Result result)
             // get all non-system processes whose file path matches that of the given result (processPath)
             var similarProcesses = processHelper.GetSimilarProcesses(processPath);
 
-            if (similarProcesses.Count() > 0)
+            if (similarProcesses.Any())
             {
                 menuOptions.Add(new Result
                 {
@@ -72,8 +61,16 @@ public List<Result> LoadContextMenus(Result result)
             return menuOptions;
         }
 
-        private List<Result> CreateResultsFromProcesses(List<ProcessResult> processlist, string termToSearch)
+        private List<Result> CreateResultsFromQuery(Query query)
         {
+            string termToSearch = query.Search;
+            var processlist = processHelper.GetMatchingProcesses(termToSearch);
+            
+            if (!processlist.Any())
+            {
+                return null;
+            }
+
             var results = new List<Result>();
 
             foreach (var pr in processlist)
@@ -92,6 +89,7 @@ private List<Result> CreateResultsFromProcesses(List<ProcessResult> processlist,
                     Action = (c) =>
                     {
                         processHelper.TryKill(p);
+                        _ = DelayAndReQueryAsync(query.RawQuery); // Re-query after killing process to refresh process list
                         return true;
                     }
                 });
@@ -116,13 +114,19 @@ private List<Result> CreateResultsFromProcesses(List<ProcessResult> processlist,
                         {
                             processHelper.TryKill(p.Process);
                         }
-
+                        _ = DelayAndReQueryAsync(query.RawQuery); // Re-query after killing process to refresh process list
                         return true;
                     }
                 });
             }
 
             return sortedResults;
         }
+
+        private static async Task DelayAndReQueryAsync(string query)
+        {
+            await Task.Delay(500);
+            _context.API.ChangeQuery(query, true);
+        }
     }
 }

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

@@ -79,7 +79,7 @@ public void TryKill(Process p)
             }
             catch (Exception e)
             {
-                Log.Exception($"|ProcessKiller.CreateResultsFromProcesses|Failed to kill process {p.ProcessName}", e);
+                Log.Exception($"{nameof(ProcessHelper)}", $"Failed to kill process {p.ProcessName}", e);
             }
         }