Check should clear existing results after token checked

Author: Jack251970

Flow.Launcher/ViewModel/MainViewModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
@@ -37,9 +38,6 @@ public partial class MainViewModel : BaseModel, ISavable, IDisposable
         private string _queryTextBeforeLeaveResults;
         private string _ignoredQueryText; // Used to ignore query text change when switching between context menu and query results
 
-        private readonly object _shouldClearExistingResultsLock = new();
-        private bool _shouldClearExistingResults;
-
         private readonly FlowLauncherJsonStorage<History> _historyItemsStorage;
         private readonly FlowLauncherJsonStorage<UserSelectedRecord> _userSelectedRecordStorage;
         private readonly FlowLauncherJsonStorageTopMostRecord _topMostRecord;
@@ -216,7 +214,17 @@ async Task UpdateActionAsync()
                     while (channelReader.TryRead(out var item))
                     {
                         if (!item.Token.IsCancellationRequested)
+                        {
+                            // 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 shouldClearExistingResults = ShouldClearExistingResultsForQuery(query, currentIsHomeQuery);
+                            _lastQuery = item.Query;
+                            _previousIsHomeQuery = currentIsHomeQuery;
+                            item.ShouldClearExistingResults = shouldClearExistingResults;
+
                             queue[item.ID] = item;
+                        } 
                     }
 
                     UpdateResultView(queue.Values);
@@ -270,24 +278,8 @@ public void RegisterResultsUpdatedEvent()
 
                     App.API.LogDebug(ClassName, $"Update results for plugin <{pair.Metadata.Name}>");
 
-                    // Home query does not support IResultUpdated, so this flag is false
-                    var currentIsHomeQuery = false;
-
-                    // Indicate if to clear existing results so to show only ones from plugins with action keywords
-                    var shouldClearExistingResults = ShouldClearExistingResultsForQuery(e.Query, currentIsHomeQuery);
-                    if (shouldClearExistingResults)
-                    {
-                        // Setup the flag to clear existing results so that ResultsViewModel.NewResults will handle in the next update
-                        lock (_shouldClearExistingResultsLock)
-                        {
-                            _shouldClearExistingResults = true;
-                        }
-                    }
-                    _lastQuery = e.Query;
-                    _previousIsHomeQuery = currentIsHomeQuery;
-
                     if (!_resultsUpdateChannelWriter.TryWrite(new ResultsForUpdate(resultsCopy, pair.Metadata, e.Query,
-                        token)))
+                        false, token)))
                     {
                         App.API.LogError(ClassName, "Unable to add item to Result Update Queue");
                     }
@@ -1453,21 +1445,8 @@ await PluginManager.QueryHomeForPluginAsync(plugin, query, token) :
 
                 App.API.LogDebug(ClassName, $"Update results for plugin <{plugin.Metadata.Name}>");
 
-                // Indicate if to clear existing results so to show only ones from plugins with action keywords
-                var shouldClearExistingResults = ShouldClearExistingResultsForQuery(query, currentIsHomeQuery);
-                if (shouldClearExistingResults)
-                {
-                    // Setup the flag to clear existing results so that ResultsViewModel.NewResults will handle in the next update
-                    lock (_shouldClearExistingResultsLock)
-                    {
-                        _shouldClearExistingResults = true;
-                    }
-                }
-                _lastQuery = query;
-                _previousIsHomeQuery = currentIsHomeQuery;
-
                 if (!_resultsUpdateChannelWriter.TryWrite(new ResultsForUpdate(resultsCopy, plugin.Metadata, query,
-                    token, reSelect)))
+                    currentIsHomeQuery, token, reSelect)))
                 {
                     App.API.LogError(ClassName, "Unable to add item to Result Update Queue");
                 }
@@ -1484,21 +1463,8 @@ void QueryHistoryTask(CancellationToken token)
 
                 App.API.LogDebug(ClassName, $"Update results for history");
 
-                // Indicate if to clear existing results so to show only ones from plugins with action keywords
-                var shouldClearExistingResults = ShouldClearExistingResultsForQuery(query, currentIsHomeQuery);
-                if (shouldClearExistingResults)
-                {
-                    // Setup the flag to clear existing results so that ResultsViewModel.NewResults will handle in the next update
-                    lock (_shouldClearExistingResultsLock)
-                    {
-                        _shouldClearExistingResults = true;
-                    }
-                }
-                _lastQuery = query;
-                _previousIsHomeQuery = currentIsHomeQuery;
-
                 if (!_resultsUpdateChannelWriter.TryWrite(new ResultsForUpdate(results, _historyMetadata, query,
-                    token, reSelect)))
+                    currentIsHomeQuery, token, reSelect)))
                 {
                     App.API.LogError(ClassName, "Unable to add item to Result Update Queue");
                 }
@@ -1733,20 +1699,6 @@ internal bool ResultsSelected(ResultsViewModel results)
             return selected;
         }
 
-        internal bool CheckShouldClearExistingResultsAndReset()
-        {
-            lock (_shouldClearExistingResultsLock)
-            {
-                if (_shouldClearExistingResults)
-                {
-                    _shouldClearExistingResults = false;
-                    return true;
-                }
-
-                return false;
-            }
-        }
-
         #endregion
 
         #region Hotkey
@@ -1912,6 +1864,7 @@ public void UpdateResultView(ICollection<ResultsForUpdate> resultsForUpdates)
         {
             if (!resultsForUpdates.Any())
                 return;
+
             CancellationToken token;
 
             try

Flow.Launcher/ViewModel/ResultsForUpdate.cs

@@ -8,8 +8,10 @@ public record struct ResultsForUpdate(
         IReadOnlyList<Result> Results,
         PluginMetadata Metadata,
         Query Query,
+        bool IsHomeQuery,
         CancellationToken Token,
-        bool ReSelectFirstResult = true)
+        bool ReSelectFirstResult = true,
+        bool ShouldClearExistingResults = false)
     {
         public string ID { get; } = Metadata.ID;
     }

Flow.Launcher/ViewModel/ResultsViewModel.cs

@@ -187,9 +187,6 @@ public void AddResults(List<Result> newRawResults, string resultId)
         /// </summary>
         public void AddResults(ICollection<ResultsForUpdate> resultsForUpdates, CancellationToken token, bool reselect = true)
         {
-            if (token.IsCancellationRequested)
-                return;
-
             // Since NewResults may need to clear existing results, do not check token cancellation after this point
             var newResults = NewResults(resultsForUpdates);
 
@@ -245,8 +242,7 @@ private List<ResultViewModel> NewResults(ICollection<ResultsForUpdate> resultsFo
 
             var newResults = resultsForUpdates.SelectMany(u => u.Results, (u, r) => new ResultViewModel(r, _settings));
 
-            // If mainVM has flag to clear existing results, handle it here
-            if (_mainVM != null && _mainVM.CheckShouldClearExistingResultsAndReset())
+            if (resultsForUpdates.Any(x => x.ShouldClearExistingResults))
             {
                 App.API.LogDebug("NewResults", $"Existing results are cleared for query");
                 return newResults.OrderByDescending(rv => rv.Result.Score).ToList();