From 86edae2bc6d711a86f92b2e6c4946e2731e18a79 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: Wed, 14 Oct 2020 23:43:16 +0800
Subject: [PATCH] Use Generic to remove duplicate query

---
 Plugins/Flow.Launcher.Plugin.Program/Main.cs | 36 ++++++++------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
index 9f3160746..8f124f3a4 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -71,21 +71,17 @@ namespace Flow.Launcher.Plugin.Program
             Win32[] win32;
             UWP.Application[] uwps;
 
-            lock (IndexLock)
-            { // just take the reference inside the lock to eliminate query time issues.
-                win32 = _win32s;
-                uwps = _uwps;
-            }
+            win32 = _win32s;
+            uwps = _uwps;
 
-            var results1 = win32.AsParallel()
-                .Where(p => p.Enabled)
-                .Select(p => p.Result(query.Search, _context.API));
+            var result = win32.Cast<IProgram>()
+                 .Concat(uwps)
+                 .AsParallel()
+                 .Where(p => p.Enabled)
+                 .Select(p => p.Result(query.Search, _context.API))
+                 .Where(r => r?.Score > 0)
+                 .ToList();
 
-            var results2 = uwps.AsParallel()
-                .Where(p => p.Enabled)
-                .Select(p => p.Result(query.Search, _context.API));
-
-            var result = results1.Concat(results2).Where(r => r != null && r.Score > 0).ToList();
             return result;
         }
 
@@ -97,10 +93,9 @@ namespace Flow.Launcher.Plugin.Program
         public static void IndexWin32Programs()
         {
             var win32S = Win32.All(_settings);
-            lock (IndexLock)
-            {
-                _win32s = win32S;
-            }
+
+            _win32s = win32S;
+
         }
 
         public static void IndexUWPPrograms()
@@ -109,10 +104,9 @@ namespace Flow.Launcher.Plugin.Program
             var support = Environment.OSVersion.Version.Major >= windows10.Major;
 
             var applications = support ? UWP.All() : new UWP.Application[] { };
-            lock (IndexLock)
-            {
-                _uwps = applications;
-            }
+
+            _uwps = applications;
+
         }
 
         public static void IndexPrograms()