From 4debacde4fc633b45d614a922d14ba5850a7603a Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Mon, 24 Apr 2023 21:22:18 +0800
Subject: [PATCH] Refactor program indexing and cache logic

No longer await on first run (no cache detected) to speed up boost
30 hours cache life
---
 Plugins/Flow.Launcher.Plugin.Program/Main.cs | 27 +++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Program/Main.cs b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
index c847982a2..ac23534b1 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Program/Main.cs
@@ -88,21 +88,24 @@ namespace Flow.Launcher.Plugin.Program
 
             bool cacheEmpty = !_win32s.Any() && !_uwps.Any();
 
-            var a = Task.Run(() =>
+            if (cacheEmpty || _settings.LastIndexTime.AddHours(30) < DateTime.Now)
             {
-                Stopwatch.Normal("|Flow.Launcher.Plugin.Program.Main|Win32Program index cost", IndexWin32Programs);
-            });
-
-            var b = Task.Run(() =>
+                _ = Task.Run(async () =>
+                {
+                    await IndexProgramsAsync().ConfigureAwait(false);
+                    WatchProgramUpdate();
+                });
+            }
+            else
             {
-                Stopwatch.Normal("|Flow.Launcher.Plugin.Program.Main|UWPPRogram index cost", IndexUwpPrograms);
-            });
+                WatchProgramUpdate();
+            }
 
-            if (cacheEmpty)
-                await Task.WhenAll(a, b);
-
-            Win32.WatchProgramUpdate(_settings);
-            _ = UWP.WatchPackageChange();
+            static void WatchProgramUpdate()
+            {
+                Win32.WatchProgramUpdate(_settings);
+                _ = UWP.WatchPackageChange();
+            }
         }
 
         public static void IndexWin32Programs()