prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improve program indexing with logging and thread safety

Browse source 
Added detailed debug logging to `IndexWin32ProgramsAsync` and
`IndexUwpProgramsAsync` to track the indexing process, including
preparation, start, retrieval, caching, and completion.

Replaced direct updates to `_settings.LastIndexTime` with a
thread-safe lock to prevent race conditions.

Enhanced `IndexProgramsAsync` with a debug log to indicate the
start of indexing for better traceability.

Updated program retrieval logic to process Win32 and UWP programs
in parallel with cancellation support and applied the
`HideUninstallersFilter` for cleaner results.
This commit is contained in:
Jack251970 2025-10-26 20:56:08 +08:00
parent 6a65f8090f
commit e2fa122362
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Plugins/Flow.Launcher.Plugin.Program/Main.cs
View file

@ -90,7 +90,7 @@ namespace Flow.Launcher.Plugin.Program
.Select(uwp => uwp.Location.TrimEnd('\\')) // Remove trailing slash
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToArray() : null;
return _win32s.Cast<IProgram>()
.Concat(_uwps)
.AsParallel()
@ -293,20 +293,24 @@ namespace Flow.Launcher.Plugin.Program
public static async Task IndexWin32ProgramsAsync()
{
Context.API.LogDebug(ClassName, "Prepare indexing Win32 programs");
await _win32sLock.WaitAsync();
Context.API.LogDebug(ClassName, "Start indexing Win32 programs");
try
{
var win32S = Win32.All(_settings);
Context.API.LogDebug(ClassName, "Get all Win32 programs");
_win32s.Clear();
foreach (var win32 in win32S)
{
_win32s.Add(win32);
}
Context.API.LogDebug(ClassName, "Cache all Win32 programs");
await Context.API.SaveCacheBinaryStorageAsync<List<Win32>>(Win32CacheName, Context.CurrentPluginMetadata.PluginCacheDirectoryPath);
lock (_lastIndexTimeLock)
{
_settings.LastIndexTime = DateTime.Now;
}
_settings.LastIndexTime = DateTime.Now;
}
}
catch (Exception e)
{
@ -316,24 +320,29 @@ namespace Flow.Launcher.Plugin.Program
{
_win32sLock.Release();
}
Context.API.LogDebug(ClassName, "End indexing Win32 programs");
}
public static async Task IndexUwpProgramsAsync()
{
Context.API.LogDebug(ClassName, "Prepare indexing Uwp programs");
await _uwpsLock.WaitAsync();
Context.API.LogDebug(ClassName, "Start indexing Uwp programs");
try
{
var uwps = UWPPackage.All(_settings);
Context.API.LogDebug(ClassName, "Get all Uwp programs");
_uwps.Clear();
foreach (var uwp in uwps)
{
_uwps.Add(uwp);
}
Context.API.LogDebug(ClassName, "Cache all Uwp programs");
await Context.API.SaveCacheBinaryStorageAsync<List<UWPApp>>(UwpCacheName, Context.CurrentPluginMetadata.PluginCacheDirectoryPath);
lock (_lastIndexTimeLock)
{
_settings.LastIndexTime = DateTime.Now;
}
_settings.LastIndexTime = DateTime.Now;
}
}
catch (Exception e)
{
@ -343,6 +352,7 @@ namespace Flow.Launcher.Plugin.Program
{
_uwpsLock.Release();
}
Context.API.LogDebug(ClassName, "End indexing Uwp programs");
}
public static async Task IndexProgramsAsync()
@ -357,6 +367,8 @@ namespace Flow.Launcher.Plugin.Program
await Context.API.StopwatchLogInfoAsync(ClassName, "UWPProgram index cost", IndexUwpProgramsAsync);
});
Context.API.LogDebug(ClassName, "Start indexing");
await Task.WhenAll(win32Task, uwpTask).ConfigureAwait(false);
}