Skip to content

Free, open-source Windows optimization tool for performance, privacy, and simplicity.

feat(optimization): add CancellationToken to let user cancel the optimzation progress

itsfatduck1284315ff3e3
diff --git a/optimizerDuck/src/Core/Managers/OptimizationManager.cs b/optimizerDuck/src/Core/Managers/OptimizationManager.cs
index 3e8d812..83f4e04 100644
--- a/optimizerDuck/src/Core/Managers/OptimizationManager.cs
+++ b/optimizerDuck/src/Core/Managers/OptimizationManager.cs
@@ -165,7 +165,7 @@ public class OptimizationManager(SystemSnapshot systemSnapshot)
new PromptOption("Back", Theme.Warning, () => false)));
}
- public async Task Run()
+ public async Task Run(CancellationToken cancellationToken)
{
AnsiConsole.Clear();
AnsiConsole.Write(Defaults.Logo);
@@ -182,22 +182,32 @@ public class OptimizationManager(SystemSnapshot systemSnapshot)
Log.LogDebug("Selected {BloatwareAmount} bloatware apps: {BloatwareApps}", SelectedBloatware.Count,
string.Join(", ", SelectedBloatware.Select(app => $"{app.DisplayName.Trim()} ({app.Version.Trim()})")));
+
Log.LogDebug(new string('=', 60));
- while (_selectedOptimizations.TryDequeue(out var selectedOptimization))
- await AnsiConsole.Status()
- .Spinner(Spinner.Known.Dots2)
- .SpinnerStyle($"bold {Theme.Primary}")
- .StartAsyncGlobal($"Applying [{Theme.Primary}]{selectedOptimization.Name}[/]...", async ctx =>
+ cancellationToken.Register(() =>
+ {
+
+ });
+
+ await AnsiConsole.Status()
+ .Spinner(Spinner.Known.Dots2)
+ .SpinnerStyle($"bold {Theme.Primary}")
+ .StartAsyncGlobal("Initializing Optimization", async ctx =>
+ {
+ while (_selectedOptimizations.TryDequeue(out var selectedOptimization))
{
try
{
+ if (cancellationToken.IsCancellationRequested) break;
+
selectedOptimization = selectedOptimization with
{
Name = selectedOptimization.Name.Trim(),
Description = selectedOptimization.Description.Trim()
};
+
SystemHelper.Title(selectedOptimization.Name);
- ctx.Status($"Applying [{Theme.Primary}]{selectedOptimization.Name}[/]...");
+ ctx.Status($"Applying [{Theme.Primary}]{selectedOptimization.Name}[/]... [{Theme.Muted}][[Press [{Theme.Error}]CTRL + C[/] to cancel the optimization]][/]");
using var scope = Log.BeginScope("Optimization: {OptimizationName}", selectedOptimization.Name);
@@ -207,12 +217,16 @@ public class OptimizationManager(SystemSnapshot systemSnapshot)
var stopwatch = Stopwatch.StartNew();
- await selectedOptimization.Instance!.Apply(_systemSnapshot).ConfigureAwait(false);
-
+ //await selectedOptimization.Instance!.Apply(_systemSnapshot).ConfigureAwait(false);
+ await Task.Delay(5000, cancellationToken);
stopwatch.Stop();
Log.LogDebug("Applied in {Elapsed} ms", stopwatch.ElapsedMilliseconds);
}
+ catch (OperationCanceledException)
+ {
+ break;
+ }
catch (Exception e)
{
Log.LogError(e, "Failed to apply optimization {OptimizationName}. Skipped.", selectedOptimization.Name);
@@ -221,7 +235,23 @@ public class OptimizationManager(SystemSnapshot systemSnapshot)
{
Log.LogDebug(new string('=', 60));
}
- });
+ }
+
+ });
+
+ if (cancellationToken.IsCancellationRequested)
+ {
+ SystemHelper.Title("Optimization Canceled");
+
+ Rule("Optimization Canceled", Theme.Error);
+ Log.LogInformation("Optimization canceled by user.");
+ GlobalStatus.Current?.Status("Optimization canceled by user.");
+
+ PromptDialog.Warning("Optimization Canceled",
+ "You have canceled the optimization.",
+ new PromptOption("Back", Theme.Warning, () => true));
+ return;
+ }
Rule("Optimization completed!", Theme.Success);
SystemHelper.Title("Optimization completed!");
diff --git a/optimizerDuck/src/Core/Optimizers/BloatwareAndServices.cs b/optimizerDuck/src/Core/Optimizers/BloatwareAndServices.cs
index 42b2bb2..3447fb9 100644
--- a/optimizerDuck/src/Core/Optimizers/BloatwareAndServices.cs
+++ b/optimizerDuck/src/Core/Optimizers/BloatwareAndServices.cs
@@ -25,8 +25,9 @@ public class BloatwareAndServices : IOptimizationCategory
public OptimizationImpact Impact { get; } = OptimizationImpact.Aggressive;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
@@ -62,8 +63,9 @@ public class BloatwareAndServices : IOptimizationCategory
public OptimizationImpact Impact { get; } = OptimizationImpact.Significant;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
@@ -97,8 +99,9 @@ public class BloatwareAndServices : IOptimizationCategory
public OptimizationImpact Impact { get; } = OptimizationImpact.Minimal;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
@@ -136,8 +139,9 @@ public class BloatwareAndServices : IOptimizationCategory
public OptimizationImpact Impact { get; } = OptimizationImpact.Aggressive;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot s, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
ServiceProcessService.ChangeServiceStartupType(
diff --git a/optimizerDuck/src/Core/Optimizers/Performance.cs b/optimizerDuck/src/Core/Optimizers/Performance.cs
index 19e39ef..4ffc8ef 100644
--- a/optimizerDuck/src/Core/Optimizers/Performance.cs
+++ b/optimizerDuck/src/Core/Optimizers/Performance.cs
@@ -22,9 +22,11 @@ public class Performance : IOptimizationCategory
public OptimizationImpact Impact { get; } = OptimizationImpact.Minimal;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
+
RegistryService.Write(
new RegistryItem(@"HKCU\Software\Microsoft\Windows\CurrentVersion\BackgroundAccessApplications", "GlobalUserDisabled", 1),
new RegistryItem(@"HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search", "BackgroundAppGlobalToggle", 0)
@@ -42,8 +44,11 @@ public class Performance : IOptimizationCategory
public OptimizationImpact Impact { get; } = OptimizationImpact.Significant;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
+ using var tracker = ServiceTracker.Begin(Log);
+
/*
ref: https://forums.blurbusters.com/viewtopic.php?t=8535
42 Dec, 2A Hex = Short, Fixed , High foreground boost.
@@ -64,6 +69,8 @@ public class Performance : IOptimizationCategory
*/
const int win32Priority = 38; // Short, Variable, High foreground boost
+
+
RegistryService.Write(
new RegistryItem(@"HKLM\SYSTEM\CurrentControlSet\Control\PriorityControl", "Win32PrioritySeparation", win32Priority)
);
@@ -79,8 +86,11 @@ public class Performance : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Moderate;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
+ using var tracker = ServiceTracker.Begin(Log);
+
RegistryService.Write(
new RegistryItem(@"HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Multimedia\SystemProfile\Tasks\Games", "Priority", 2),
new RegistryItem(@"HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Multimedia\SystemProfile\Tasks\Games", "Scheduling Category", "High"),
@@ -102,8 +112,9 @@ public class Performance : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Significant;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot s, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
if (s.Ram.TotalKB <= 0)
@@ -132,8 +143,9 @@ public class Performance : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Minimal;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
@@ -154,8 +166,11 @@ public class Performance : IOptimizationCategory
public bool EnabledByDefault { get; } = SystemHelper.IsWindows11OrGreater();
public OptimizationImpact Impact { get; } = OptimizationImpact.Minimal;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
+ using var tracker = ServiceTracker.Begin(Log);
+
RegistryService.Write(
new RegistryItem(@"HKCU\Software\Microsoft\GameBar", "AllowAutoGameMode", 1),
new RegistryItem(@"HKCU\Software\Microsoft\GameBar", "AutoGameModeEnabled", 1)
@@ -176,8 +191,9 @@ public class Performance : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Minimal;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
@@ -201,8 +217,9 @@ public class Performance : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Significant;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot s, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
Log.LogInformation("Applying GPU optimizations for {GpuCount} GPUs...", s.Gpus.Count);
diff --git a/optimizerDuck/src/Core/Optimizers/Power.cs b/optimizerDuck/src/Core/Optimizers/Power.cs
index ccf3886..59003ca 100644
--- a/optimizerDuck/src/Core/Optimizers/Power.cs
+++ b/optimizerDuck/src/Core/Optimizers/Power.cs
@@ -25,8 +25,9 @@ public class Power : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Moderate;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
@@ -53,8 +54,9 @@ public class Power : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Moderate;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
//https://discord.com/channels/1298592513816530994/1359513721738629140/1359524213047824517
@@ -85,8 +87,9 @@ public class Power : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Significant;
- public async Task Apply(SystemSnapshot s)
+ public async Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
var (success, powerPlanPath) =
await StreamHelper.TryDownloadAsync(Defaults.PowerPlanUrl, "optimizerDuck.pow");
@@ -121,8 +124,11 @@ public class Power : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Moderate;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
+ using var tracker = ServiceTracker.Begin(Log);
+
RegistryService.Write(
new RegistryItem(@"HKLM\SYSTEM\CurrentControlSet\Control\USB\AutomaticSurpriseRemoval",
"AttemptRecoveryFromUsbPowerDrain", 0),
diff --git a/optimizerDuck/src/Core/Optimizers/SecurityAndPrivacy.cs b/optimizerDuck/src/Core/Optimizers/SecurityAndPrivacy.cs
index 3033025..e1361d7 100644
--- a/optimizerDuck/src/Core/Optimizers/SecurityAndPrivacy.cs
+++ b/optimizerDuck/src/Core/Optimizers/SecurityAndPrivacy.cs
@@ -22,8 +22,9 @@ public class SecurityAndPrivacy : IOptimizationCategory
public bool EnabledByDefault { get; } = false;
public OptimizationImpact Impact { get; } = OptimizationImpact.Aggressive;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(new RegistryItem(@"HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System",
@@ -46,9 +47,11 @@ public class SecurityAndPrivacy : IOptimizationCategory
/// <summary>
/// thank you https://github.com/ChrisTitusTech/winutil
/// </summary>
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
+
// @formatter:off
RegistryService.Write(
new RegistryItem(@"HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection", "AllowTelemetry", 0),
@@ -148,8 +151,9 @@ public class SecurityAndPrivacy : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Moderate;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
@@ -180,8 +184,9 @@ public class SecurityAndPrivacy : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Moderate;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
@@ -211,8 +216,9 @@ public class SecurityAndPrivacy : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Moderate;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
@@ -241,8 +247,9 @@ public class SecurityAndPrivacy : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Moderate;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
diff --git a/optimizerDuck/src/Core/Optimizers/UserExperience.cs b/optimizerDuck/src/Core/Optimizers/UserExperience.cs
index b31957f..655625e 100644
--- a/optimizerDuck/src/Core/Optimizers/UserExperience.cs
+++ b/optimizerDuck/src/Core/Optimizers/UserExperience.cs
@@ -21,8 +21,9 @@ public class UserExperience : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Minimal;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
@@ -55,8 +56,9 @@ public class UserExperience : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Minimal;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
@@ -75,8 +77,9 @@ public class UserExperience : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Minimal;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
@@ -106,8 +109,9 @@ public class UserExperience : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Minimal;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
@@ -132,8 +136,9 @@ public class UserExperience : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Minimal;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
@@ -159,8 +164,9 @@ public class UserExperience : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Minimal;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
@@ -184,8 +190,9 @@ public class UserExperience : IOptimizationCategory
public bool EnabledByDefault { get; } = true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Minimal;
- public Task Apply(SystemSnapshot s)
+ public Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
RegistryService.Write(
@@ -210,8 +217,9 @@ public class UserExperience : IOptimizationCategory
public bool EnabledByDefault => true;
public OptimizationImpact Impact { get; } = OptimizationImpact.Moderate;
- public async Task Apply(SystemSnapshot s)
+ public async Task Apply(SystemSnapshot _, CancellationToken t)
{
+ t.ThrowIfCancellationRequested();
using var tracker = ServiceTracker.Begin(Log);
var (success, zwtPath) = await StreamHelper.TryDownloadAsync(Defaults.ZwtDownloadUrl, "zwtimer.exe")
diff --git a/optimizerDuck/src/Interfaces/IOptimization.cs b/optimizerDuck/src/Interfaces/IOptimization.cs
index 1343313..f75ad53 100644
--- a/optimizerDuck/src/Interfaces/IOptimization.cs
+++ b/optimizerDuck/src/Interfaces/IOptimization.cs
@@ -9,5 +9,5 @@ public interface IOptimization
public string Description { get; }
public bool EnabledByDefault { get; }
public OptimizationImpact Impact { get; }
- public Task Apply(SystemSnapshot s);
+ public Task Apply(SystemSnapshot s, CancellationToken t);
}
\ No newline at end of file
diff --git a/optimizerDuck/src/UI/MenuHandler.cs b/optimizerDuck/src/UI/MenuHandler.cs
index 0e10e26..52615ff 100644
--- a/optimizerDuck/src/UI/MenuHandler.cs
+++ b/optimizerDuck/src/UI/MenuHandler.cs
@@ -44,7 +44,21 @@ internal class MenuHandler
_optimizer ??= new OptimizationManager(_systemSnapshot);
if (await _optimizer.Begin().ConfigureAwait(false))
if (await OptimizationManager.RestorePoint().ConfigureAwait(false))
- await _optimizer.Run().ConfigureAwait(false);
+ {
+ using var cancelCancellationTokenSource = new CancellationTokenSource();
+ ConsoleCancelEventHandler cancelHandler = null!;
+
+ cancelHandler = (sender, e) =>
+ {
+ cancelCancellationTokenSource.Cancel();
+ e.Cancel = true;
+
+ Console.CancelKeyPress -= cancelHandler;
+ };
+ Console.CancelKeyPress += cancelHandler;
+
+ await _optimizer.Run(cancelCancellationTokenSource.Token).ConfigureAwait(false);
+ }
}
private Task HandleDiscordLinkAsync()