Handle isHomeQuery in Query class

Author: Jack251970

Flow.Launcher.Core/Plugin/QueryBuilder.cs

@@ -16,7 +16,8 @@ public static Query Build(string text, Dictionary<string, PluginPair> nonGlobalP
                     Search = string.Empty,
                     RawQuery = string.Empty,
                     SearchTerms = Array.Empty<string>(),
-                    ActionKeyword = string.Empty
+                    ActionKeyword = string.Empty,
+                    IsHomeQuery = true
                 };
             }
 
@@ -53,7 +54,8 @@ public static Query Build(string text, Dictionary<string, PluginPair> nonGlobalP
                 Search = search,
                 RawQuery = rawQuery,
                 SearchTerms = searchTerms,
-                ActionKeyword = actionKeyword
+                ActionKeyword = actionKeyword,
+                IsHomeQuery = false
             };
         }
     }

Flow.Launcher.Plugin/Query.cs

@@ -21,6 +21,11 @@ public class Query
         /// </summary>
         public bool IsReQuery { get; internal set; } = false;
 
+        /// <summary>
+        /// Determines whether the query is a home query.
+        /// </summary>
+        public bool IsHomeQuery { get; internal init; } = 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/ViewModel/MainViewModel.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
@@ -217,7 +216,7 @@ async Task UpdateActionAsync()
                         {
                             // Indicate if to clear existing results so to show only ones from plugins with action keywords
                             var query = item.Query;
-                            var currentIsHomeQuery = item.IsHomeQuery;
+                            var currentIsHomeQuery = query.IsHomeQuery;
                             var shouldClearExistingResults = ShouldClearExistingResultsForQuery(query, currentIsHomeQuery);
                             _lastQuery = item.Query;
                             _previousIsHomeQuery = currentIsHomeQuery;
@@ -279,7 +278,7 @@ public void RegisterResultsUpdatedEvent()
                     App.API.LogDebug(ClassName, $"Update results for plugin <{pair.Metadata.Name}>");
 
                     if (!_resultsUpdateChannelWriter.TryWrite(new ResultsForUpdate(resultsCopy, pair.Metadata, e.Query,
-                        false, token)))
+                        token)))
                     {
                         App.API.LogError(ClassName, "Unable to add item to Result Update Queue");
                     }
@@ -1271,7 +1270,7 @@ private async Task QueryResultsAsync(bool searchDelay, bool isReQuery = false, b
 
             App.API.LogDebug(ClassName, $"Start query with ActionKeyword <{query.ActionKeyword}> and RawQuery <{query.RawQuery}>");
 
-            var currentIsHomeQuery = query.RawQuery == string.Empty;
+            var currentIsHomeQuery = query.IsHomeQuery;
 
             _updateSource?.Dispose();
 
@@ -1446,7 +1445,7 @@ await PluginManager.QueryHomeForPluginAsync(plugin, query, token) :
                 App.API.LogDebug(ClassName, $"Update results for plugin <{plugin.Metadata.Name}>");
 
                 if (!_resultsUpdateChannelWriter.TryWrite(new ResultsForUpdate(resultsCopy, plugin.Metadata, query,
-                    currentIsHomeQuery, token, reSelect)))
+                    token, reSelect)))
                 {
                     App.API.LogError(ClassName, "Unable to add item to Result Update Queue");
                 }
@@ -1464,7 +1463,7 @@ void QueryHistoryTask(CancellationToken token)
                 App.API.LogDebug(ClassName, $"Update results for history");
 
                 if (!_resultsUpdateChannelWriter.TryWrite(new ResultsForUpdate(results, _historyMetadata, query,
-                    currentIsHomeQuery, token, reSelect)))
+                    token, reSelect)))
                 {
                     App.API.LogError(ClassName, "Unable to add item to Result Update Queue");
                 }

Flow.Launcher/ViewModel/ResultsForUpdate.cs

@@ -8,7 +8,6 @@ public record struct ResultsForUpdate(
         IReadOnlyList<Result> Results,
         PluginMetadata Metadata,
         Query Query,
-        bool IsHomeQuery,
         CancellationToken Token,
         bool ReSelectFirstResult = true,
         bool ShouldClearExistingResults = false)