Skip to content

Reduce CPU and disk usage during Program plugin init #2123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 11, 2023
Merged

Reduce CPU and disk usage during Program plugin init #2123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
099021b
Save programs cache after indexing
VictoriousRaptor Apr 24, 2023
b123c09
Remove unused settings
VictoriousRaptor Apr 24, 2023
4debacd
Refactor program indexing and cache logic
VictoriousRaptor Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions Plugins/Flow.Launcher.Plugin.Program/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,35 +88,42 @@ public async Task InitAsync(PluginInitContext context)

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);
});

if (cacheEmpty)
await Task.WhenAll(a, b);
WatchProgramUpdate();
}

Win32.WatchProgramUpdate(_settings);
_ = UWP.WatchPackageChange();
static void WatchProgramUpdate()
{
Win32.WatchProgramUpdate(_settings);
_ = UWP.WatchPackageChange();
}
}

public static void IndexWin32Programs()
{
var win32S = Win32.All(_settings);
_win32s = win32S;
ResetCache();
_win32Storage.Save(_win32s);
_settings.LastIndexTime = DateTime.Now;
}

public static void IndexUwpPrograms()
{
var applications = UWP.All(_settings);
_uwps = applications;
ResetCache();
_uwpStorage.Save(_uwps);
_settings.LastIndexTime = DateTime.Now;
}

public static async Task IndexProgramsAsync()
Expand All @@ -131,7 +138,6 @@ public static async Task IndexProgramsAsync()
Stopwatch.Normal("|Flow.Launcher.Plugin.Program.Main|UWPProgram index cost", IndexUwpPrograms);
});
await Task.WhenAll(a, b).ConfigureAwait(false);
_settings.LastIndexTime = DateTime.Today;
}

internal static void ResetCache()
Expand Down Expand Up @@ -199,7 +205,6 @@ private static void DisableProgram(IProgram programToDelete)
_ = Task.Run(() =>
{
IndexUwpPrograms();
_settings.LastIndexTime = DateTime.Today;
});
}
else if (_win32s.Any(x => x.UniqueIdentifier == programToDelete.UniqueIdentifier))
Expand All @@ -210,7 +215,6 @@ private static void DisableProgram(IProgram programToDelete)
_ = Task.Run(() =>
{
IndexWin32Programs();
_settings.LastIndexTime = DateTime.Today;
});
}
}
Expand Down
7 changes: 0 additions & 7 deletions Plugins/Flow.Launcher.Plugin.Program/Settings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,6 @@ private void RemoveRedundantSuffixes()
public bool EnablePathSource { get; set; } = false;
public bool EnableUWP { get; set; } = true;

public string CustomizedExplorer { get; set; } = Explorer;
public string CustomizedArgs { get; set; } = ExplorerArgs;

internal const char SuffixSeparator = ';';

internal const string Explorer = "explorer";

internal const string ExplorerArgs = "%s";
}
}
12 changes: 0 additions & 12 deletions Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,6 @@ public bool EnableUWP
}
}

public string CustomizedExplorerPath
{
get => _settings.CustomizedExplorer;
set => _settings.CustomizedExplorer = value;
}

public string CustomizedExplorerArg
{
get => _settings.CustomizedArgs;
set => _settings.CustomizedArgs = value;
}

public bool ShowUWPCheckbox => UWP.SupportUWP();

public ProgramSetting(PluginInitContext context, Settings settings, Win32[] win32s, UWP.Application[] uwps)
Expand Down