Merge pull request #2174 from JohnTheGr8/requery_enhancements

Improvements for re-queries

Author: jjw24

Flow.Launcher.Plugin/Query.cs

@@ -26,6 +26,13 @@ public Query(string rawQuery, string search, string[] terms, string[] searchTerm
         /// </summary>
         public string RawQuery { get; internal init; }
 
+        /// <summary>
+        /// Determines whether the query was forced to execute again.
+        /// For example, the value will be true when the user presses Ctrl + R.
+        /// When this property is true, plugins handling this query should avoid serving cached results.
+        /// </summary>
+        public bool IsReQuery { get; internal set; } = false;
+
         /// <summary>
         /// Search part of a query.
         /// This will not include action keyword if exclusive plugin gets it, otherwise it should be same as RawQuery.

Flow.Launcher/MainWindow.xaml

@@ -86,6 +86,10 @@
             Key="O"
             Command="{Binding LoadContextMenuCommand}"
             Modifiers="Ctrl" />
+        <KeyBinding
+            Key="R"
+            Command="{Binding ReQueryCommand}"
+            Modifiers="Ctrl" />
         <KeyBinding
             Key="H"
             Command="{Binding LoadHistoryCommand}"

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -205,6 +205,15 @@ private void LoadHistory()
             }
         }
 
+        [RelayCommand]
+        private void ReQuery()
+        {
+            if (SelectedIsFromQueryResults())
+            {
+                QueryResults(isReQuery: true);
+            }
+        }
+
         [RelayCommand]
         private void LoadContextMenu()
         {
@@ -495,8 +504,8 @@ private void UpdatePreview()
         /// but we don't want to move cursor to end when query is updated from TextBox
         /// </summary>
         /// <param name="queryText"></param>
-        /// <param name="reQuery">Force query even when Query Text doesn't change</param>
-        public void ChangeQueryText(string queryText, bool reQuery = false)
+        /// <param name="isReQuery">Force query even when Query Text doesn't change</param>
+        public void ChangeQueryText(string queryText, bool isReQuery = false)
         {
             Application.Current.Dispatcher.Invoke(() =>
             {
@@ -510,9 +519,9 @@ public void ChangeQueryText(string queryText, bool reQuery = false)
                     QueryTextCursorMovedToEnd = false;
 
                 }
-                else if (reQuery)
+                else if (isReQuery)
                 {
-                    Query();
+                    Query(isReQuery: true);
                 }
                 QueryTextCursorMovedToEnd = true;
             });
@@ -612,11 +621,11 @@ public string PreviewHotkey
 
         #region Query
 
-        public void Query()
+        public void Query(bool isReQuery = false)
         {
             if (SelectedIsFromQueryResults())
             {
-                QueryResults();
+                QueryResults(isReQuery);
             }
             else if (ContextMenuSelected())
             {
@@ -716,7 +725,7 @@ private void QueryHistory()
 
         private readonly IReadOnlyList<Result> _emptyResult = new List<Result>();
 
-        private async void QueryResults()
+        private async void QueryResults(bool isReQuery = false)
         {
             _updateSource?.Cancel();
 
@@ -747,6 +756,8 @@ private async void QueryResults()
             if (currentCancellationToken.IsCancellationRequested)
                 return;
 
+            // Update the query's IsReQuery property to true if this is a re-query
+            query.IsReQuery = isReQuery;
 
             // handle the exclusiveness of plugin using action keyword
             RemoveOldQueryResults(query);