Add resetCache parameter and improve indexing logic

Introduced an optional `resetCache` parameter to `IndexWin32ProgramsAsync` and `IndexUwpProgramsAsync` to allow finer control over cache resets during indexing. Updated `IndexProgramsAsync` to explicitly pass `true` for cache resets.

Modified `DisableProgramAsync` to return a `bool` indicating success and adjusted its logic to prevent unnecessary cache resets when reindexing. Ensured it returns `false` if the program is already disabled.

Replaced nullable `PackageCatalog?` with non-nullable `PackageCatalog` in `UWPPackage.cs` to ensure proper initialization. Updated `WatchPackageChangeAsync` and `WatchDirectory` to call indexing methods with `resetCache` set to `true` when changes are detected.

Improved cache reset logic across methods by conditionally invoking `ResetCache` based on the `resetCache` parameter, enhancing performance and maintainability.

Author: Jack251970

Plugins/Flow.Launcher.Plugin.Program/Main.cs

@@ -334,7 +334,7 @@ static void WatchProgramUpdate()
             }
         }
 
-        public static async Task IndexWin32ProgramsAsync()
+        public static async Task IndexWin32ProgramsAsync(bool resetCache = true)
         {
             await _win32sLock.WaitAsync();
             try
@@ -345,7 +345,10 @@ public static async Task IndexWin32ProgramsAsync()
                 {
                     _win32s.Add(win32);
                 }
-                ResetCache();
+                if (resetCache)
+                {
+                    ResetCache();
+                }
                 await Context.API.SaveCacheBinaryStorageAsync<List<Win32>>(Win32CacheName, Context.CurrentPluginMetadata.PluginCacheDirectoryPath);
                 lock (_lastIndexTimeLock)
                 {
@@ -362,7 +365,7 @@ public static async Task IndexWin32ProgramsAsync()
             }
         }
 
-        public static async Task IndexUwpProgramsAsync()
+        public static async Task IndexUwpProgramsAsync(bool resetCache = true)
         {
             await _uwpsLock.WaitAsync();
             try
@@ -373,7 +376,10 @@ public static async Task IndexUwpProgramsAsync()
                 {
                     _uwps.Add(uwp);
                 }
-                ResetCache();
+                if (resetCache)
+                {
+                    ResetCache();
+                }
                 await Context.API.SaveCacheBinaryStorageAsync<List<UWPApp>>(UwpCacheName, Context.CurrentPluginMetadata.PluginCacheDirectoryPath);
                 lock (_lastIndexTimeLock)
                 {
@@ -394,12 +400,12 @@ public static async Task IndexProgramsAsync()
         {
             var win32Task = Task.Run(async () =>
             {
-                await Context.API.StopwatchLogInfoAsync(ClassName, "Win32Program index cost", IndexWin32ProgramsAsync);
+                await Context.API.StopwatchLogInfoAsync(ClassName, "Win32Program index cost", () => IndexWin32ProgramsAsync(true));
             });
 
             var uwpTask = Task.Run(async () =>
             {
-                await Context.API.StopwatchLogInfoAsync(ClassName, "UWPProgram index cost", IndexUwpProgramsAsync);
+                await Context.API.StopwatchLogInfoAsync(ClassName, "UWPProgram index cost", () => IndexUwpProgramsAsync(true));
             });
 
             await Task.WhenAll(win32Task, uwpTask).ConfigureAwait(false);
@@ -446,8 +452,10 @@ public List<Result> LoadContextMenus(Result selectedResult)
                         {
                             try
                             {
-                                await DisableProgramAsync(program);
-                                ResetCache();
+                                if (await DisableProgramAsync(program))
+                                {
+                                    ResetCache();
+                                }
                                 Context.API.ShowMsg(
                                     Context.API.GetTranslation("flowlauncher_plugin_program_disable_dlgtitle_success"),
                                     Context.API.GetTranslation(
@@ -469,10 +477,10 @@ public List<Result> LoadContextMenus(Result selectedResult)
             return menuOptions;
         }
 
-        private static async Task DisableProgramAsync(IProgram programToDelete)
+        private static async Task<bool> DisableProgramAsync(IProgram programToDelete)
         {
             if (_settings.DisabledProgramSources.Any(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier))
-                return;
+                return false;
 
             await _uwpsLock.WaitAsync();
             try
@@ -483,8 +491,8 @@ private static async Task DisableProgramAsync(IProgram programToDelete)
                     program.Enabled = false;
                     _settings.DisabledProgramSources.Add(new ProgramSource(program));
                     // Reindex UWP programs
-                    _ = Task.Run(IndexUwpProgramsAsync);
-                    return;
+                    _ = Task.Run(() => IndexUwpProgramsAsync(false));
+                    return true;
                 }
             }
             finally
@@ -501,14 +509,16 @@ private static async Task DisableProgramAsync(IProgram programToDelete)
                     program.Enabled = false;
                     _settings.DisabledProgramSources.Add(new ProgramSource(program));
                     // Reindex Win32 programs
-                    _ = Task.Run(IndexWin32ProgramsAsync);
-                    return;
+                    _ = Task.Run(() => IndexWin32ProgramsAsync(false));
+                    return true;
                 }
             }
             finally
             {
                 _win32sLock.Release();
             }
+
+            return false;
         }
 
         public static void StartProcess(Func<ProcessStartInfo, Process> runProcess, ProcessStartInfo info)

Plugins/Flow.Launcher.Plugin.Program/Programs/UWPPackage.cs

@@ -290,7 +290,7 @@ private static IEnumerable<Package> CurrentUserPackages()
         }
 
         private static readonly Channel<byte> PackageChangeChannel = Channel.CreateBounded<byte>(1);
-        private static PackageCatalog? catalog;
+        private static PackageCatalog catalog;
 
         public static async Task WatchPackageChangeAsync()
         {
@@ -317,7 +317,7 @@ public static async Task WatchPackageChangeAsync()
                 {
                     await Task.Delay(3000).ConfigureAwait(false);
                     PackageChangeChannel.Reader.TryRead(out _);
-                    await Task.Run(Main.IndexUwpProgramsAsync);
+                    await Task.Run(() => Main.IndexUwpProgramsAsync(true));
                 }
             }
         }

Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs

@@ -796,7 +796,7 @@ public static async Task MonitorDirectoryChangeAsync()
                 {
                 }
 
-                await Task.Run(Main.IndexWin32ProgramsAsync);
+                await Task.Run(() => Main.IndexWin32ProgramsAsync(true));
             }
         }