From 350499a4801a9a60ba00a811b79bc7785b4da33f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=98=E9=9F=AC=20=E5=BC=A0?= <hongtao_zhang@outlook.com>
Date: Tue, 16 Feb 2021 02:12:28 +0800
Subject: [PATCH] Optimize Logic and code

---
 Flow.Launcher/ViewModel/MainViewModel.cs    | 17 +++++++++--------
 Flow.Launcher/ViewModel/ResultsForUpdate.cs |  9 +--------
 Flow.Launcher/ViewModel/ResultsViewModel.cs | 11 ++++-------
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 90bdc38c8..c1382e51e 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -47,7 +47,7 @@ namespace Flow.Launcher.ViewModel
 
         private readonly Internationalization _translator = InternationalizationManager.Instance;
 
-        private Channel<ResultsForUpdate> _resultsUpdateQueue;
+        private ChannelWriter<ResultsForUpdate> _resultsUpdateChannelWriter;
         private Task _resultsViewUpdateTask;
 
         #endregion
@@ -86,20 +86,21 @@ namespace Flow.Launcher.ViewModel
 
         private void RegisterViewUpdate()
         {
-            _resultsUpdateQueue = Channel.CreateUnbounded<ResultsForUpdate>();
+            var resultUpdateChannel = Channel.CreateUnbounded<ResultsForUpdate>();
+            _resultsUpdateChannelWriter = resultUpdateChannel.Writer;
             _resultsViewUpdateTask =
                 Task.Run(updateAction).ContinueWith(continueAction, TaskContinuationOptions.OnlyOnFaulted);
 
             async Task updateAction()
             {
                 var queue = new Dictionary<string, ResultsForUpdate>();
-                var queueReader = _resultsUpdateQueue.Reader;
+                var channelReader = resultUpdateChannel.Reader;
 
                 // it is not supposed to be false because it won't be complete
-                while (await queueReader.WaitToReadAsync())
+                while (await channelReader.WaitToReadAsync())
                 {
                     await Task.Delay(20);
-                    while (queueReader.TryRead(out var item))
+                    while (channelReader.TryRead(out var item))
                     {
                         if (!item.Token.IsCancellationRequested)
                             queue[item.ID] = item;
@@ -134,7 +135,7 @@ namespace Flow.Launcher.ViewModel
                     if (e.Query.RawQuery == QueryText) // TODO: allow cancellation
                     {
                         PluginManager.UpdatePluginMetadata(e.Results, pair.Metadata, e.Query);
-                        if (!_resultsUpdateQueue.Writer.TryWrite(new ResultsForUpdate(e.Results, pair.Metadata, e.Query, _updateToken)))
+                        if (!_resultsUpdateChannelWriter.TryWrite(new ResultsForUpdate(e.Results, pair.Metadata, e.Query, _updateToken)))
                         {
                             Log.Error("MainViewModel", "Unable to add item to Result Update Queue");
                         };
@@ -539,8 +540,8 @@ namespace Flow.Launcher.ViewModel
 
                         var results = await PluginManager.QueryForPlugin(plugin, query, currentCancellationToken);
                         if (currentCancellationToken.IsCancellationRequested || results == null) return;
-
-                        if (!_resultsUpdateQueue.Writer.TryWrite(new ResultsForUpdate(results, plugin.Metadata, query, currentCancellationToken)))
+                        
+                        if (!_resultsUpdateChannelWriter.TryWrite(new ResultsForUpdate(results, plugin.Metadata, query, currentCancellationToken)))
                         {
                             Log.Error("MainViewModel", "Unable to add item to Result Update Queue");
                         };
diff --git a/Flow.Launcher/ViewModel/ResultsForUpdate.cs b/Flow.Launcher/ViewModel/ResultsForUpdate.cs
index be48f53c1..87d526fd6 100644
--- a/Flow.Launcher/ViewModel/ResultsForUpdate.cs
+++ b/Flow.Launcher/ViewModel/ResultsForUpdate.cs
@@ -6,7 +6,7 @@ using System.Threading;
 
 namespace Flow.Launcher.ViewModel
 {
-    public class ResultsForUpdate
+    public struct ResultsForUpdate
     {
         public List<Result> Results { get; }
 
@@ -16,13 +16,6 @@ namespace Flow.Launcher.ViewModel
         public Query Query { get; }
         public CancellationToken Token { get; }
 
-        public ResultsForUpdate(List<Result> results, string resultID, CancellationToken token)
-        {
-            Results = results;
-            ID = resultID;
-            Token = token;
-        }
-
         public ResultsForUpdate(List<Result> results, PluginMetadata metadata, Query query, CancellationToken token)
         {
             Results = results;
diff --git a/Flow.Launcher/ViewModel/ResultsViewModel.cs b/Flow.Launcher/ViewModel/ResultsViewModel.cs
index feab3a751..41f16f4f2 100644
--- a/Flow.Launcher/ViewModel/ResultsViewModel.cs
+++ b/Flow.Launcher/ViewModel/ResultsViewModel.cs
@@ -183,13 +183,12 @@ namespace Flow.Launcher.ViewModel
         private List<ResultViewModel> NewResults(List<Result> newRawResults, string resultId)
         {
             if (newRawResults.Count == 0)
-                return Results.ToList();
+                return Results;
 
-            var results = Results as IEnumerable<ResultViewModel>;
 
             var newResults = newRawResults.Select(r => new ResultViewModel(r, _settings));
 
-            return results.Where(r => r.Result.PluginID != resultId)
+            return Results.Where(r => r.Result.PluginID != resultId)
                 .Concat(newResults)
                 .OrderByDescending(r => r.Result.Score)
                 .ToList();
@@ -198,11 +197,9 @@ namespace Flow.Launcher.ViewModel
         private List<ResultViewModel> NewResults(IEnumerable<ResultsForUpdate> resultsForUpdates)
         {
             if (!resultsForUpdates.Any())
-                return Results.ToList();
+                return Results;
 
-            var results = Results as IEnumerable<ResultViewModel>;
-
-            return results.Where(r => r != null && !resultsForUpdates.Any(u => u.Metadata.ID == r.Result.PluginID))
+            return Results.Where(r => r != null && !resultsForUpdates.Any(u => u.ID == r.Result.PluginID))
                           .Concat(resultsForUpdates.SelectMany(u => u.Results, (u, r) => new ResultViewModel(r, _settings)))
                           .OrderByDescending(rv => rv.Result.Score)
                           .ToList();