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

Store and await indexing task to prevent incomplete program indexing

Browse source 
Co-authored-by: Jack251970 <53996452+Jack251970@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2025-10-29 05:04:13 +00:00
parent 118afd20ef
commit 04b9790467
1 changed files with 62 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,9 @@ namespace Flow.Launcher.Plugin.Program
internal static PluginInitContext Context { get; private set; }
private static Task _indexingTask;
private static readonly object _indexingTaskLock = new();
private static readonly List<Result> emptyResults = [];
private static readonly MemoryCacheOptions cacheOptions = new() { SizeLimit = 1560 };
@ -78,6 +81,31 @@ namespace Flow.Launcher.Plugin.Program
public async Task<List<Result>> QueryAsync(Query query, CancellationToken token)
{
// Wait for initial indexing to complete if it's still running
Task indexingTask;
lock (_indexingTaskLock)
{
indexingTask = _indexingTask;
}
if (indexingTask != null && !indexingTask.IsCompleted)
{
try
{
// Wait for indexing with a reasonable timeout to avoid blocking queries indefinitely
await Task.WhenAny(indexingTask, Task.Delay(TimeSpan.FromSeconds(30), token)).ConfigureAwait(false);
}
catch (OperationCanceledException)
{
// Query was cancelled, return empty results
return emptyResults.ToList();
}
catch (Exception e)
{
Context.API.LogException(ClassName, "Error waiting for indexing to complete", e);
}
}
var result = await cache.GetOrCreateAsync(query.Search, async entry =>
{
var resultList = await Task.Run(async () =>
@ -277,11 +305,21 @@ namespace Flow.Launcher.Plugin.Program
if (cacheEmpty || _settings.LastIndexTime.AddHours(30) < DateTime.Now)
{
_ = Task.Run(async () =>
lock (_indexingTaskLock)
{
await IndexProgramsAsync().ConfigureAwait(false);
WatchProgramUpdate();
});
_indexingTask = Task.Run(async () =>
{
try
{
await IndexProgramsAsync().ConfigureAwait(false);
WatchProgramUpdate();
}
catch (Exception e)
{
Context.API.LogException(ClassName, "Failed to complete program indexing", e);
}
});
}
}
else
{
@ -483,6 +521,26 @@ namespace Flow.Launcher.Plugin.Program
public void Dispose()
{
// Wait for indexing to complete before disposing
Task indexingTask;
lock (_indexingTaskLock)
{
indexingTask = _indexingTask;
}
if (indexingTask != null && !indexingTask.IsCompleted)
{
try
{
// Wait for indexing to complete with a reasonable timeout
indexingTask.Wait(TimeSpan.FromSeconds(10));
}
catch (Exception e)
{
Context?.API?.LogException(ClassName, "Error waiting for indexing during dispose", e);
}
}
Win32.Dispose();
}
}