Free, open-source Windows optimization tool for performance, privacy, and simplicity.
C# csharpdebloatdotnetgamingopen-sourceoptimizationoptimizeroptimizerduckperformanceprivacytweakertweakswindowswinui
refactor: improve optimization/revert infra, smooth scroll, UI polish
fatDuck6bdff8316aba
diff --git a/.github/workflows/github-releases-to-discord.yml b/.github/workflows/github-releases-to-discord.ymldeleted file mode 100644index 18eedb2..0000000--- a/.github/workflows/github-releases-to-discord.yml+++ /dev/null@@ -1,19 +0,0 @@-on:- release:- types: [published]--jobs:- github-releases-to-discord:- runs-on: ubuntu-latest- steps:- - name: Checkout- uses: actions/checkout@v3- - name: GitHub Releases to Discord- uses: SethCohen/github-releases-to-discord@v1- with:- webhook_url: ${{ secrets.WEBHOOK_URL }}- color: "16697348"- username: "optimizerDuck | Release Changelog"- avatar_url: "https://media.discordapp.net/attachments/1124562179635556362/1433390991041105940/file_00000000a55c61faa5eacf81d0493ce0_3_2.png?ex=6916f9e3&is=6915a863&hm=6ddc21d9dbb0a0d7b7df0083d869fca579ab619d86e1a34943493c1721e3cb43&=&format=webp&quality=lossless&width=810&height=810"- content: "<@&1438487735903191181>, new release is out!"- reduce_headings: truediff --git a/optimizerDuck.Test/Domain/Optimizations/PowerManagementTests.cs b/optimizerDuck.Test/Domain/Optimizations/PowerManagementTests.csnew file mode 100644index 0000000..9560660--- /dev/null+++ b/optimizerDuck.Test/Domain/Optimizations/PowerManagementTests.cs@@ -0,0 +1,26 @@+using Microsoft.Extensions.Logging.Abstractions;+using optimizerDuck.Domain.Execution;+using optimizerDuck.Domain.Optimizations.Models.Services;+using optimizerDuck.Services.OptimizationServices;++namespace optimizerDuck.Test.Domain.Optimizations;++public class PowerManagementTests+{+ [Fact]+ public void RegistryPath_WithHklmPrefix_IsReadable()+ {+ using var scope = ExecutionScope.BeginForLogging(NullLogger.Instance);+ var key = $@"HKCU\SOFTWARE\OptimizerDuckTest\{Guid.NewGuid():N}";++ try+ {+ Assert.True(RegistryService.Write(new RegistryItem(key, "Probe", 1)));+ Assert.Equal(1, RegistryService.Read<int>(new RegistryItem(key, "Probe")));+ }+ finally+ {+ RegistryService.DeleteSubKeyTree(new RegistryItem(key));+ }+ }+}diff --git a/optimizerDuck.Test/Domain/Revert/Steps/ScheduledTaskRevertStepTests.cs b/optimizerDuck.Test/Domain/Revert/Steps/ScheduledTaskRevertStepTests.csnew file mode 100644index 0000000..00d991f--- /dev/null+++ b/optimizerDuck.Test/Domain/Revert/Steps/ScheduledTaskRevertStepTests.cs@@ -0,0 +1,20 @@+using optimizerDuck.Domain.Revert.Steps;++namespace optimizerDuck.Test.Domain.Revert.Steps;++public class ScheduledTaskRevertStepTests+{+ [Fact]+ public async Task ExecuteAsync_WithMissingTask_ReturnsFalse()+ {+ var step = new ScheduledTaskRevertStep+ {+ FullPath = @"\NonExistent\OptimizerDuckTestTask",+ OriginalEnabled = true,+ };++ var success = await step.ExecuteAsync();++ Assert.False(success);+ }+}diff --git a/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs b/optimizerDuck.Test/Services/Managers/RevertManagerTests.csindex e5d84b2..ffee561 100644--- a/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs+++ b/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs@@ -58,6 +58,29 @@ public class RevertManagerTests}}+ [Fact]+ public async Task IsAppliedAsync_WithInvalidJson_ReturnsFalse()+ {+ var id = Guid.NewGuid();+ var path = Path.Combine(Shared.RevertDirectory, id + ".json");+ var cancellationToken = TestContext.Current.CancellationToken;+ Directory.CreateDirectory(Shared.RevertDirectory);++ try+ {+ await File.WriteAllTextAsync(path, "{ invalid json }", cancellationToken);++ var isApplied = await RevertManager.IsAppliedAsync(id);++ Assert.False(isApplied);+ }+ finally+ {+ if (File.Exists(path))+ File.Delete(path);+ }+ }+[Fact]public async Task RevertAsync_WithInvalidJson_ReturnsFailure(){diff --git a/optimizerDuck.Test/Services/OptimizationServiceTests.cs b/optimizerDuck.Test/Services/OptimizationServiceTests.csindex 3b073a4..c593294 100644--- a/optimizerDuck.Test/Services/OptimizationServiceTests.cs+++ b/optimizerDuck.Test/Services/OptimizationServiceTests.cs@@ -63,7 +63,7 @@ public class OptimizationServiceTests}[Fact]- public async Task ApplyAsync_FailureMessage_DoesNotPersistRevertDataFile()+ public async Task ApplyAsync_FailureMessage_StillPersistsSuccessfulSteps(){await RunInStaThreadAsync(async () =>{@@ -95,7 +95,7 @@ public class OptimizationServiceTestsvar result = await service.ApplyAsync(optimization, progress);Assert.Equal(OptimizationSuccessResult.Failed, result.Status);- Assert.False(File.Exists(revertPath));+ Assert.True(File.Exists(revertPath));}finally{diff --git a/optimizerDuck/App.xaml.cs b/optimizerDuck/App.xaml.csindex 1f9f26d..586f968 100644--- a/optimizerDuck/App.xaml.cs+++ b/optimizerDuck/App.xaml.cs@@ -284,8 +284,6 @@ public partial class App : Application_logger.LogInformation("Loaded language: {Language}", appSettings.App.Language);var optimizationRegistry = _host.Services.GetRequiredService<OptimizationRegistry>();- _logger.LogInformation("Preloading optimizations...");- await optimizationRegistry.PreloadOptimizationsAsync();await Dispatcher.InvokeAsync(() =>{@@ -310,6 +308,9 @@ public partial class App : ApplicationmainWindow.Closing += MainWindow_Closing;mainWindow.Show();});++ _logger.LogInformation("Preloading optimizations in background...");+ optimizationRegistry.StartPreload();}protected override void OnExit(ExitEventArgs e)diff --git a/optimizerDuck/Domain/Execution/ExecutionScope.cs b/optimizerDuck/Domain/Execution/ExecutionScope.csindex 6c13ce8..bfeea12 100644--- a/optimizerDuck/Domain/Execution/ExecutionScope.cs+++ b/optimizerDuck/Domain/Execution/ExecutionScope.cs@@ -233,6 +233,17 @@ public sealed class ExecutionScope : IDisposablereturn _executedSteps.Select(ToOperationStepResult).ToList();}+ /// <summary>+ /// Maps tracked execution steps to an <see cref="ApplyResult" /> for optimization handlers.+ /// </summary>+ public ApplyResult ToApplyResult()+ {+ var result = ToResult();+ return result.Status == OptimizationSuccessResult.Success+ ? ApplyResult.True()+ : ApplyResult.False(result.Message);+ }+public OptimizationResult ToResult(){var status = ResolveStatus();diff --git a/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs b/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.csindex efca90c..25bbaec 100644--- a/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs+++ b/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs@@ -54,7 +54,7 @@ public class BloatwareAndServices : IOptimizationCategory));context.Logger.LogInformation("Blocked preinstalled apps");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}@@ -336,7 +336,7 @@ public class BloatwareAndServices : IOptimizationCategory"Optimized service startup for {Count} services",servicesToChange.Count);- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}}diff --git a/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs b/optimizerDuck/Domain/Optimizations/Categories/Gpu.csindex 630286e..974023f 100644--- a/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs+++ b/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs@@ -50,7 +50,7 @@ public abstract class GpuRegistryOptimization : BaseOptimization);}- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}diff --git a/optimizerDuck/Domain/Optimizations/Categories/Performance.cs b/optimizerDuck/Domain/Optimizations/Categories/Performance.csindex a7e7f45..e32b4f9 100644--- a/optimizerDuck/Domain/Optimizations/Categories/Performance.cs+++ b/optimizerDuck/Domain/Optimizations/Categories/Performance.cs@@ -44,7 +44,7 @@ public class Performance : IOptimizationCategory));context.Logger.LogInformation("Disabled background apps");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}@@ -88,7 +88,7 @@ public class Performance : IOptimizationCategory"Enabled service host splitting with threshold: {ThresholdKB} KB",context.Snapshot.Ram.TotalKB);- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}@@ -136,7 +136,7 @@ public class Performance : IOptimizationCategory"Enabled foreground boost with priority: {Priority}",win32Priority);- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}@@ -184,7 +184,7 @@ public class Performance : IOptimizationCategorycontext.Logger.LogInformation("Optimized Multimedia Class Scheduler Service (MMCSS) for gaming and low latency");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}@@ -206,7 +206,7 @@ public class Performance : IOptimizationCategory);context.Logger.LogInformation("Optimized keyboard repeat settings");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}@@ -241,7 +241,7 @@ public class Performance : IOptimizationCategory);context.Logger.LogInformation("Disabled accessibility keyboard hotkeys");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}}diff --git a/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs b/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.csindex 6ba448f..cbfcd9d 100644--- a/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs+++ b/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs@@ -1,12 +1,17 @@using System.Collections.ObjectModel;using System.Text.RegularExpressions;using Microsoft.Extensions.Logging;+using Newtonsoft.Json;+using Newtonsoft.Json.Linq;using optimizerDuck.Common.Helpers;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;+using optimizerDuck.Domain.Execution;using optimizerDuck.Domain.Optimizations.Models;using optimizerDuck.Domain.Optimizations.Models.Services;+using optimizerDuck.Domain.Revert.Steps;using optimizerDuck.Domain.UI;+using optimizerDuck.Resources.Languages;using optimizerDuck.Services.Managers;using optimizerDuck.Services.OptimizationServices;using optimizerDuck.UI.Pages.Optimizations;@@ -35,7 +40,7 @@ public class PowerManagement : IOptimizationCategoryvar wasEnabled =RegistryService.Read<int>(new RegistryItem(- @"SYSTEM\CurrentControlSet\Control\Session Manager\Power",+ @"HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\Power","HibernateEnabled")) != 0;@@ -47,7 +52,7 @@ public class PowerManagement : IOptimizationCategory"Disabled hibernation and Fast Startup. Previous state: {State}",wasEnabled ? "Enabled" : "Disabled");- return ApplyResult.True();+ return CompleteFromScope();}}@@ -77,11 +82,18 @@ public class PowerManagement : IOptimizationCategoryif (string.IsNullOrWhiteSpace(usbStates.Stdout)){context.Logger.LogInformation("No USB devices found, skipping");- return ApplyResult.True();+ return CompleteFromScope();+ }++ var capturedStates = ParseUsbPowerStates(usbStates.Stdout);+ if (capturedStates.Count == 0)+ {+ context.Logger.LogInformation("No USB device states parsed, skipping");+ return CompleteFromScope();}context.Logger.LogInformation("Disabling USB power saving");- await ShellService.PowerShellAsync(+ var disableResult = await ShellService.PowerShellAsync("""$devices = Get-CimInstance -Namespace root\wmi -ClassName MSPower_DeviceEnable -ErrorAction SilentlyContinue |Where-Object { $_.InstanceName -match 'USB\\ROOT' }@@ -91,21 +103,37 @@ public class PowerManagement : IOptimizationCategorySet-CimInstance -CimInstance $d -Property @{ Enable = $false } | Out-Null}}- """,- $$"""- $states = @('{{usbStates.Stdout}}' | ConvertFrom-Json)- foreach ($s in $states) {- $obj = Get-CimInstance -Namespace root\wmi -ClassName MSPower_DeviceEnable -ErrorAction SilentlyContinue |- Where-Object { $_.InstanceName -eq $s.InstanceName }- if ($obj -and $obj.Enable -ne [bool]$s.Enable) {- Write-Host "Reverting $($s.InstanceName) to $([bool]$s.Enable)"- Set-CimInstance -CimInstance $obj -Property @{ Enable = [bool]$s.Enable } | Out-Null- }- }""");- return ApplyResult.True();+ var revertStep = new UsbPowerRevertStep { States = capturedStates };+ ExecutionScope.RecordStep(+ Translations.Service_Shell_Name,+ Name,+ disableResult.ExitCode == 0,+ disableResult.ExitCode == 0 ? revertStep : null,+ disableResult.ExitCode == 0 ? null : disableResult.Stderr+ );++ return CompleteFromScope();+ }++ private static List<UsbPowerRevertStep.DeviceState> ParseUsbPowerStates(string stdout)+ {+ try+ {+ var token = JToken.Parse(stdout.Trim());+ return token switch+ {+ JArray array => array.ToObject<List<UsbPowerRevertStep.DeviceState>>() ?? [],+ JObject obj => [obj.ToObject<UsbPowerRevertStep.DeviceState>()!],+ _ => [],+ };+ }+ catch (JsonException)+ {+ return [];+ }}}@@ -198,7 +226,7 @@ public class PowerManagement : IOptimizationCategory}context.Logger.LogInformation("Installed optimizerDuck power plan successfully!");- return ApplyResult.True();+ return CompleteFromScope();}}@@ -227,7 +255,7 @@ public class PowerManagement : IOptimizationCategory));context.Logger.LogInformation("Disabled power saving features");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}}diff --git a/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs b/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.csindex 6b1bd42..4edf44d 100644--- a/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs+++ b/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs@@ -159,7 +159,7 @@ public class SecurityAndPrivacy : IOptimizationCategorycontext.Logger.LogWarning(ex, "Failed to disable task {Task}", task);}- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}@@ -216,7 +216,7 @@ public class SecurityAndPrivacy : IOptimizationCategorycontext.Logger.LogInformation("Disabled Windows Error Reporting and Compatibility Assistant");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}@@ -323,7 +323,7 @@ public class SecurityAndPrivacy : IOptimizationCategorycontext.Logger.LogInformation("Disabled advertising ID, consumer features and system suggestions");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}@@ -363,7 +363,7 @@ public class SecurityAndPrivacy : IOptimizationCategory);context.Logger.LogInformation("Disabled activity history collection and syncing");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}@@ -441,7 +441,7 @@ public class SecurityAndPrivacy : IOptimizationCategorycontext.Logger.LogInformation("Disabled location tracking, sensors and offline maps updates");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}@@ -510,7 +510,7 @@ public class SecurityAndPrivacy : IOptimizationCategory));context.Logger.LogInformation("Disabled WMI AutoLogger sessions");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}@@ -569,7 +569,7 @@ public class SecurityAndPrivacy : IOptimizationCategory));context.Logger.LogInformation("Disabled Cortana and web search");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}@@ -629,7 +629,7 @@ public class SecurityAndPrivacy : IOptimizationCategory);context.Logger.LogInformation("Disabled Windows Copilot");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}@@ -678,7 +678,7 @@ public class SecurityAndPrivacy : IOptimizationCategory));context.Logger.LogInformation("Disabled content delivery manager");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}}diff --git a/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs b/optimizerDuck/Domain/Optimizations/Categories/UserExperience.csindex 1d5459c..64628c4 100644--- a/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs+++ b/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs@@ -40,7 +40,7 @@ public class UserExperience : IOptimizationCategorynew RegistryItem(@"HKCU\Control Panel\Desktop", "MenuShowDelay", "0"));context.Logger.LogInformation("Speeded up Explorer and menus");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}@@ -75,7 +75,7 @@ public class UserExperience : IOptimizationCategorynew RegistryItem(@"HKCU\Software\Microsoft\Windows\DWM", "EnableAeroPeek", 0));context.Logger.LogInformation("Disabled visual effects for better performance");- return Task.FromResult(ApplyResult.True());+ return Task.FromResult(CompleteFromScope());}}}diff --git a/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs b/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.csindex a1c7a31..00fcfb5 100644--- a/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs+++ b/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs@@ -1,6 +1,7 @@using System.Reflection;using optimizerDuck.Domain.Abstractions;using optimizerDuck.Domain.Attributes;+using optimizerDuck.Domain.Execution;using optimizerDuck.Domain.UI;using optimizerDuck.Resources.Languages;using optimizerDuck.Services.Managers;@@ -71,6 +72,15 @@ public abstract class BaseOptimization : IOptimizationIProgress<ProcessingProgress> progress,OptimizationContext context);++ /// <summary>+ /// Returns an <see cref="ApplyResult" /> derived from steps recorded in the active <see cref="ExecutionScope" />.+ /// </summary>+ protected static ApplyResult CompleteFromScope()+ {+ return ExecutionScope.Current?.ToApplyResult()+ ?? ApplyResult.False(Translations.Revert_Error_NoSteps);+ }}/*diff --git a/optimizerDuck/Domain/Revert/RevertData.cs b/optimizerDuck/Domain/Revert/RevertData.csindex a092481..3a63e58 100644--- a/optimizerDuck/Domain/Revert/RevertData.cs+++ b/optimizerDuck/Domain/Revert/RevertData.cs@@ -28,6 +28,11 @@ public class RevertStepData/// </summary>public class RevertData{+ /// <summary>+ /// Schema version for forward-compatible migrations. Current version is <c>1</c>.+ /// </summary>+ public int SchemaVersion { get; set; } = 1;+/// <summary>/// The unique identifier of the optimization./// </summary>diff --git a/optimizerDuck/Domain/Revert/Steps/ScheduledTaskRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/ScheduledTaskRevertStep.csindex e81af9d..4564dba 100644--- a/optimizerDuck/Domain/Revert/Steps/ScheduledTaskRevertStep.cs+++ b/optimizerDuck/Domain/Revert/Steps/ScheduledTaskRevertStep.cs@@ -35,11 +35,10 @@ public class ScheduledTaskRevertStep : IRevertStep/// <inheritdoc />public Task<bool> ExecuteAsync(){- if (OriginalEnabled)- ScheduledTaskService.EnableTask(FullPath);- else- ScheduledTaskService.DisableTask(FullPath);- return Task.FromResult(true);+ var success = OriginalEnabled+ ? ScheduledTaskService.EnableTask(FullPath)+ : ScheduledTaskService.DisableTask(FullPath);+ return Task.FromResult(success);}/// <inheritdoc />diff --git a/optimizerDuck/Domain/Revert/Steps/UsbPowerRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/UsbPowerRevertStep.csnew file mode 100644index 0000000..9230002--- /dev/null+++ b/optimizerDuck/Domain/Revert/Steps/UsbPowerRevertStep.cs@@ -0,0 +1,76 @@+using System.Text;+using Newtonsoft.Json;+using Newtonsoft.Json.Linq;+using optimizerDuck.Domain.Abstractions;+using optimizerDuck.Resources.Languages;+using optimizerDuck.Services.OptimizationServices;++namespace optimizerDuck.Domain.Revert.Steps;++/// <summary>+/// Restores USB <c>MSPower_DeviceEnable</c> states captured before disable.+/// </summary>+public class UsbPowerRevertStep : IRevertStep+{+ /// <summary>+ /// A single device instance and its original enabled flag.+ /// </summary>+ public sealed class DeviceState+ {+ public string InstanceName { get; set; } = string.Empty;+ public bool Enable { get; set; }+ }++ public IList<DeviceState> States { get; set; } = [];++ /// <inheritdoc />+ public string Type => "UsbPower";++ /// <inheritdoc />+ public string Description => Translations.Revert_UsbPower_Description;++ /// <inheritdoc />+ public async Task<bool> ExecuteAsync()+ {+ if (States.Count == 0)+ return true;++ var payload = Convert.ToBase64String(+ Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(States))+ );++ var script =+ "$json = [System.Text.Encoding]::UTF8.GetString([Convert]::FromBase64String('"+ + payload+ + "')); "+ + "$states = $json | ConvertFrom-Json; "+ + "foreach ($s in $states) { "+ + "$obj = Get-CimInstance -Namespace root\\wmi -ClassName MSPower_DeviceEnable -ErrorAction SilentlyContinue | "+ + "Where-Object { $_.InstanceName -eq $s.InstanceName }; "+ + "if ($obj -and $obj.Enable -ne [bool]$s.Enable) { "+ + "Set-CimInstance -CimInstance $obj -Property @{ Enable = [bool]$s.Enable } | Out-Null "+ + "}}";++ var result = await ShellService.PowerShellAsync(script);+ return result.ExitCode == 0;+ }++ /// <inheritdoc />+ public JObject ToData()+ {+ return new JObject { [nameof(States)] = JArray.FromObject(States) };+ }++ /// <summary>+ /// Deserializes a <see cref="UsbPowerRevertStep" /> from JSON data.+ /// </summary>+ public static UsbPowerRevertStep FromData(JObject data)+ {+ var states =+ data[nameof(States)]?.ToObject<List<DeviceState>>()+ ?? data.ToObject<List<DeviceState>>()+ ?? [];++ return new UsbPowerRevertStep { States = states };+ }+}diff --git a/optimizerDuck/Resources/Languages/Translations.Designer.cs b/optimizerDuck/Resources/Languages/Translations.Designer.csindex b646979..959ecfd 100644--- a/optimizerDuck/Resources/Languages/Translations.Designer.cs+++ b/optimizerDuck/Resources/Languages/Translations.Designer.cs@@ -3791,6 +3791,15 @@ namespace optimizerDuck.Resources.Languages {}}+ /// <summary>+ /// Looks up a localized string similar to Restore USB selective suspend power states.+ /// </summary>+ internal static string Revert_UsbPower_Description {+ get {+ return ResourceManager.GetString("Revert.UsbPower.Description", resourceCulture);+ }+ }+/// <summary>/// Looks up a localized string similar to Delete./// </summary>@@ -4169,6 +4178,15 @@ namespace optimizerDuck.Resources.Languages {}}+ /// <summary>+ /// Looks up a localized string similar to Registry subtree is too large to back up safely; delete aborted for {0}.+ /// </summary>+ internal static string Service_Registry_Error_BackupTruncated {+ get {+ return ResourceManager.GetString("Service.Registry.Error.BackupTruncated", resourceCulture);+ }+ }+/// <summary>/// Looks up a localized string similar to Failed to create/open subkey./// </summary>diff --git a/optimizerDuck/Resources/Languages/Translations.resx b/optimizerDuck/Resources/Languages/Translations.resxindex 2a026a5..bf1b0e9 100644--- a/optimizerDuck/Resources/Languages/Translations.resx+++ b/optimizerDuck/Resources/Languages/Translations.resx@@ -379,6 +379,12 @@<data name="Revert.Error.StepFailed" xml:space="preserve"><value>Revert step failed</value></data>+ <data name="Revert.UsbPower.Description" xml:space="preserve">+ <value>Restore USB selective suspend power states</value>+ </data>+ <data name="Service.Registry.Error.BackupTruncated" xml:space="preserve">+ <value>Registry subtree is too large to back up safely; delete aborted for {0}</value>+ </data><data name="Revert.Error.OptimizationIdMismatch" xml:space="preserve"><value>OptimizationId mismatch.</value></data>diff --git a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx b/optimizerDuck/Resources/Languages/Translations.vi-VN.resxindex 90bc25a..df8d951 100644--- a/optimizerDuck/Resources/Languages/Translations.vi-VN.resx+++ b/optimizerDuck/Resources/Languages/Translations.vi-VN.resx@@ -376,6 +376,9 @@<data name="Revert.Error.StepFailed" xml:space="preserve"><value>Bước hoàn tác thất bại</value></data>+ <data name="Revert.UsbPower.Description" xml:space="preserve">+ <value>Khôi phục trạng thái nguồn tạm ngưng chọn lọc USB</value>+ </data><data name="Revert.Error.OptimizationIdMismatch" xml:space="preserve"><value>OptimizationId không khớp.</value></data>@@ -397,6 +400,9 @@<data name="Service.Common.Error.AccessDenied" xml:space="preserve"><value>Không có quyền truy cập</value></data>+ <data name="Service.Registry.Error.BackupTruncated" xml:space="preserve">+ <value>Subtree registry quá lớn để sao lưu an toàn; đã hủy xóa cho {0}</value>+ </data><data name="Service.Registry.Error.AccessDeniedProtectedHive" xml:space="preserve"><value>Bị từ chối truy cập (registry được bảo vệ)</value></data>diff --git a/optimizerDuck/Resources/Languages/Translations.zh-CN.resx b/optimizerDuck/Resources/Languages/Translations.zh-CN.resxindex df46301..3289493 100644--- a/optimizerDuck/Resources/Languages/Translations.zh-CN.resx+++ b/optimizerDuck/Resources/Languages/Translations.zh-CN.resx@@ -379,6 +379,9 @@<data name="Revert.Error.StepFailed" xml:space="preserve"><value>还原步骤执行失败</value></data>+ <data name="Revert.UsbPower.Description" xml:space="preserve">+ <value>还原 USB 选择性挂起电源状态</value>+ </data><data name="Revert.Error.OptimizationIdMismatch" xml:space="preserve"><value>优化项 ID 不匹配。</value></data>@@ -400,6 +403,9 @@<data name="Service.Common.Error.AccessDenied" xml:space="preserve"><value>权限拒绝</value></data>+ <data name="Service.Registry.Error.BackupTruncated" xml:space="preserve">+ <value>注册表子树太大,无法安全备份;已中止删除 {0}</value>+ </data><data name="Service.Registry.Error.AccessDeniedProtectedHive" xml:space="preserve"><value>权限拒绝(受保护的注册表配置单元)</value></data>diff --git a/optimizerDuck/Resources/Languages/Translations.zh-TW.resx b/optimizerDuck/Resources/Languages/Translations.zh-TW.resxindex 9f1ee3b..99afe45 100644--- a/optimizerDuck/Resources/Languages/Translations.zh-TW.resx+++ b/optimizerDuck/Resources/Languages/Translations.zh-TW.resx@@ -348,6 +348,9 @@<data name="Revert.Error.StepFailed" xml:space="preserve"><value>還原步驟失敗</value></data>+ <data name="Revert.UsbPower.Description" xml:space="preserve">+ <value>還原 USB 選擇性暫停電源狀態</value>+ </data><data name="Revert.Error.OptimizationIdMismatch" xml:space="preserve"><value>最佳化 ID 不符。</value></data>@@ -369,6 +372,9 @@<data name="Service.Common.Error.AccessDenied" xml:space="preserve"><value>存取被拒</value></data>+ <data name="Service.Registry.Error.BackupTruncated" xml:space="preserve">+ <value>登錄子樹過大,無法安全備份;已中止刪除 {0}</value>+ </data><data name="Service.Registry.Error.AccessDeniedProtectedHive" xml:space="preserve"><value>存取被拒(受保護的登錄區)</value></data>diff --git a/optimizerDuck/Services/Optimization/OptimizationRegistry.cs b/optimizerDuck/Services/Optimization/OptimizationRegistry.csindex 757fff4..3e0d712 100644--- a/optimizerDuck/Services/Optimization/OptimizationRegistry.cs+++ b/optimizerDuck/Services/Optimization/OptimizationRegistry.cs@@ -10,8 +10,28 @@ namespace optimizerDuck.Services;public class OptimizationRegistry(ILoggerFactory loggerFactory){private readonly ILogger _logger = loggerFactory.CreateLogger<OptimizationRegistry>();+ private Task? _preloadTask;+public IOptimizationCategory[] OptimizationCategories { get; set; } = [];+ public bool IsPreloaded { get; private set; }++ /// <summary>+ /// Starts optimization discovery on a background thread (non-blocking).+ /// </summary>+ public void StartPreload()+ {+ _preloadTask ??= PreloadOptimizationsAsync();+ }++ /// <summary>+ /// Ensures categories and applied-state are loaded before the optimize UI binds.+ /// </summary>+ public Task EnsurePreloadedAsync()+ {+ return _preloadTask ??= PreloadOptimizationsAsync();+ }+public async Task PreloadOptimizationsAsync(){// Run reflection work on background thread to avoid blocking startup@@ -67,6 +87,7 @@ public class OptimizationRegistry(ILoggerFactory loggerFactory).ConfigureAwait(false);OptimizationCategories = optimizationCategories;+ IsPreloaded = true;}public IOptimizationCategory GetCategory(Type type)diff --git a/optimizerDuck/Services/Optimization/OptimizationService.cs b/optimizerDuck/Services/Optimization/OptimizationService.csindex cc6473c..5a50c5f 100644--- a/optimizerDuck/Services/Optimization/OptimizationService.cs+++ b/optimizerDuck/Services/Optimization/OptimizationService.cs@@ -137,7 +137,8 @@ public class OptimizationService(public async Task<OptimizationResult> ApplyAsync(IOptimization optimization,- IProgress<ProcessingProgress> progress+ IProgress<ProcessingProgress> progress,+ CancellationToken cancellationToken = default){var optLogger = loggerFactory.CreateLogger(optimization.GetType());@@ -164,12 +165,17 @@ public class OptimizationService();if (!string.IsNullOrWhiteSpace(applyResult.ErrorMessage))+ {+ if (scope.HasSuccessfulSteps)+ await TrySaveRevertDataAsync(scope, optimization);+return new OptimizationResult{Status = OptimizationSuccessResult.Failed,Message = applyResult.ErrorMessage,FailedSteps = scope.GetStepResults().Where(step => !step.Success).ToList(),};+ }progress.Report(new ProcessingProgress@@ -212,7 +218,8 @@ public class OptimizationService(public async Task<RevertResult> RevertAsync(IOptimization optimization,- IProgress<ProcessingProgress>? progress = null+ IProgress<ProcessingProgress>? progress = null,+ CancellationToken cancellationToken = default){progress?.Report(diff --git a/optimizerDuck/Services/Optimization/Providers/RegistryService.cs b/optimizerDuck/Services/Optimization/Providers/RegistryService.csindex ba86ca8..ab4e0fd 100644--- a/optimizerDuck/Services/Optimization/Providers/RegistryService.cs+++ b/optimizerDuck/Services/Optimization/Providers/RegistryService.cs@@ -461,6 +461,11 @@ public static class RegistryService{ExecutionScope.LogInfo("Skip create registry {Path} (already exists)", item.Path);ExecutionScope.Track(nameof(CreateSubKey), true);+ ExecutionScope.RecordStep(+ Translations.Service_Registry_Name,+ description,+ true+ );return true;}@@ -535,7 +540,29 @@ public static class RegistryServicereturn true;}- var subSteps = BackupRegistryTree(key, item.Path);+ var (subSteps, backupComplete) = BackupRegistryTree(key, item.Path);+ if (!backupComplete)+ {+ ExecutionScope.LogError(+ null,+ "Registry subtree backup truncated for {Path}",+ item.Path+ );+ ExecutionScope.Track(nameof(DeleteSubKeyTree), false);+ ExecutionScope.RecordStep(+ Translations.Service_Registry_Name,+ description,+ false,+ null,+ string.Format(+ Translations.Service_Registry_Error_BackupTruncated,+ item.Path+ ),+ () => Task.FromResult(DeleteSubKeyTree(item))+ );+ return false;+ }+rootKey.DeleteSubKeyTree(subPath, false);var revertStep = new RegistryRevertStep@@ -585,25 +612,30 @@ public static class RegistryService}}- private static List<RegistryRevertStep> BackupRegistryTree(RegistryKey key, string keyPath)+ private static (List<RegistryRevertStep> Steps, bool IsComplete) BackupRegistryTree(+ RegistryKey key,+ string keyPath+ ){var steps = new List<RegistryRevertStep>();- BackupRegistryTreeRecursive(key, keyPath, steps, 0);- return steps;+ var truncated = false;+ BackupRegistryTreeRecursive(key, keyPath, steps, 0, ref truncated);+ return (steps, !truncated);}private static void BackupRegistryTreeRecursive(RegistryKey key,string keyPath,List<RegistryRevertStep> steps,- int depth+ int depth,+ ref bool truncated){- // Guard against massive trees (e.g., HKCR\CLSID) to prevent OOM and giant JSON filesif (depth > 15 || steps.Count > 5000){+ truncated = true;ExecutionScope.LogWarning(- "Skipping full backup of subtree {Path} (depth: {Depth}, items: {Count})",+ "Registry subtree backup limit reached at {Path} (depth: {Depth}, items: {Count})",keyPath,depth,steps.Count@@ -616,7 +648,11 @@ public static class RegistryServiceforeach (var valueName in key.GetValueNames()){if (steps.Count > 5000)- break;+ {+ truncated = true;+ return;+ }+steps.Add(new RegistryRevertStep{@@ -636,10 +672,20 @@ public static class RegistryServiceforeach (var subKeyName in key.GetSubKeyNames()){if (steps.Count > 5000)- break;+ {+ truncated = true;+ return;+ }+using var subKey = key.OpenSubKey(subKeyName, false);if (subKey != null)- BackupRegistryTreeRecursive(subKey, $@"{keyPath}\{subKeyName}", steps, depth + 1);+ BackupRegistryTreeRecursive(+ subKey,+ $@"{keyPath}\{subKeyName}",+ steps,+ depth + 1,+ ref truncated+ );}}diff --git a/optimizerDuck/Services/Optimization/Providers/ShellService.cs b/optimizerDuck/Services/Optimization/Providers/ShellService.csindex d650577..5ffac24 100644--- a/optimizerDuck/Services/Optimization/Providers/ShellService.cs+++ b/optimizerDuck/Services/Optimization/Providers/ShellService.cs@@ -151,7 +151,7 @@ public static class ShellService{try{- process.Kill(true);+ process.Kill(entireProcessTree: false);}catch (Exception ex){@@ -172,7 +172,7 @@ public static class ShellService{try{- process.Kill(true);+ process.Kill(entireProcessTree: false);if (!process.HasExited){process.WaitForExit(5000); // Wait up to 5 seconds for force killdiff --git a/optimizerDuck/Services/Revert/RevertManager.cs b/optimizerDuck/Services/Revert/RevertManager.csindex 27fb382..6892869 100644--- a/optimizerDuck/Services/Revert/RevertManager.cs+++ b/optimizerDuck/Services/Revert/RevertManager.cs@@ -16,6 +16,9 @@ namespace optimizerDuck.Services.Managers;public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _loggerFactory){+ private const int SchemaVersion = 1;+ private const int FileLockTimeoutSeconds = 30;+private static readonly Lazy<Dictionary<string, Func<JObject, IRevertStep>>> _stepRegistry =new(BuildStepRegistry);@@ -44,11 +47,14 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _logge};}+ var optimizationId = scope.OptimizationId!.Value;await WriteJsonAsync(- GetFilePath(scope.OptimizationId!.Value),+ optimizationId,+ GetFilePath(optimizationId),new RevertData{- OptimizationId = scope.OptimizationId!.Value,+ SchemaVersion = SchemaVersion,+ OptimizationId = optimizationId,OptimizationName = scope.OptimizationName ?? scope.OptimizationKey!,AppliedAt = DateTime.Now,Steps = steps,@@ -80,8 +86,6 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _loggevar sortedSteps = steps.OrderByDescending(s => s.Index).ToList();var total = sortedSteps.Count;- operationLogger.LogDebug("Reverting steps in reverse order (total: {Total})", total);-for (var i = 0; i < total; i++){var (idx, step) = sortedSteps[i];@@ -106,6 +110,12 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _logge}catch (Exception ex){+ operationLogger.LogError(+ ex,+ "Revert step {StepType} failed for {Optimization}",+ step.Type,+ optimization.OptimizationKey+ );failedSteps.Add(new OperationStepResult{@@ -123,6 +133,9 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _loggeif (failedSteps.Count < total)RemoveRevertData(optimization.Id, optimization.OptimizationKey);+ if (failedSteps.Count == 0)+ _fileLocks.TryRemove(optimization.Id, out _);+return new RevertResult{Success = failedSteps.Count == 0,@@ -155,21 +168,19 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _loggethrow new ArgumentException("Step index must be greater than 0", nameof(stepIndex));var filePath = GetFilePath(id);- var lockObj = _fileLocks.GetOrAdd(id, _ => new SemaphoreSlim(1, 1));-- await lockObj.WaitAsync(TimeSpan.FromSeconds(30));+ var lockObj = await AcquireFileLockAsync(id);try{var data =await LoadAsync(filePath)?? new RevertData{+ SchemaVersion = SchemaVersion,OptimizationId = id,OptimizationName = name,Steps = Array.Empty<RevertStepData?>(),};- // Expand array if neededif (data.Steps.Length < stepIndex){var newSteps = new RevertStepData?[stepIndex];@@ -177,7 +188,6 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _loggedata.Steps = newSteps;}- // Place step at correct position (0-based index)data.Steps[stepIndex - 1] = new RevertStepData{Index = stepIndex,@@ -185,7 +195,8 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _loggeData = step.ToData(),};- await WriteJsonAsync(filePath, data);+ data.SchemaVersion = SchemaVersion;+ await WriteJsonAtomicAsync(filePath, data);}finally{@@ -195,9 +206,10 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _logge#region Helpers- public static Task<bool> IsAppliedAsync(Guid id)+ public static async Task<bool> IsAppliedAsync(Guid id){- return Task.FromResult(File.Exists(GetFilePath(id)));+ var data = await LoadAsync(GetFilePath(id));+ return data is { Steps.Length: > 0 };}public static async Task<RevertData?> GetRevertDataAsync(Guid id)@@ -231,37 +243,78 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _loggereturn null;try{- return JsonConvert.DeserializeObject<RevertData>(await File.ReadAllTextAsync(path));+ var json = await File.ReadAllTextAsync(path);+ if (string.IsNullOrWhiteSpace(json))+ return null;++ return JsonConvert.DeserializeObject<RevertData>(json);+ }+ catch (JsonException ex)+ {+ TraceCorruptRevertFile(path, ex);+ return null;}- catch+ catch (Exception ex){+ TraceCorruptRevertFile(path, ex);return null;}}+ private static void TraceCorruptRevertFile(string path, Exception ex)+ {+ System.Diagnostics.Trace.TraceWarning(+ "Corrupt revert file {0}: {1}",+ path,+ ex.Message+ );+ }+public void RemoveRevertData(Guid id, string? name = null){Remove(id, name);+ _fileLocks.TryRemove(id, out _);+ }++ private async Task WriteJsonAsync(Guid optimizationId, string path, RevertData data)+ {+ data.SchemaVersion = SchemaVersion;+ var lockObj = await AcquireFileLockAsync(optimizationId);+ try+ {+ await WriteJsonAtomicAsync(path, data);+ var totalOperations = data.Steps.Count(s => s != null);+ _logger.LogInformation("Saved {Total} operations to {Path}", totalOperations, path);+ }+ finally+ {+ lockObj.Release();+ }}- private async Task WriteJsonAsync(string path, RevertData data)+ private static async Task WriteJsonAtomicAsync(string path, RevertData data){Directory.CreateDirectory(Path.GetDirectoryName(path)!);var json = JsonConvert.SerializeObject(data, Formatting.Indented);- await using var fileStream = new FileStream(- path,- FileMode.Create,- FileAccess.Write,- FileShare.None,- bufferSize: 4096,- useAsync: true- );- await using var writer = new StreamWriter(fileStream);- await writer.WriteAsync(json);+ var tempPath = path + ".tmp";+ await File.WriteAllTextAsync(tempPath, json).ConfigureAwait(false);++ if (File.Exists(path))+ File.Replace(tempPath, path, destinationBackupFileName: null);+ else+ File.Move(tempPath, path);+ }++ private async Task<SemaphoreSlim> AcquireFileLockAsync(Guid id)+ {+ var lockObj = _fileLocks.GetOrAdd(id, _ => new SemaphoreSlim(1, 1));+ if (!await lockObj.WaitAsync(TimeSpan.FromSeconds(FileLockTimeoutSeconds)).ConfigureAwait(false))+ throw new TimeoutException(+ string.Format("Timed out waiting for revert file lock ({0}).", id)+ );- var totalOperations = data.Steps.Count(s => s != null);- _logger.LogInformation("Saved {Total} operations to {Path}", totalOperations, path);+ return lockObj;}private async Task<List<(int Index, IRevertStep Step)>> LoadStepsAsync(Guid id)@@ -270,7 +323,6 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _loggeif (data == null || data.Steps.Length == 0)return [];- // Validate indexes: must be > 0, no duplicatesvar seenIndexes = new HashSet<int>();foreach (var step in data.Steps.Where(s => s != null)){@@ -295,7 +347,13 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _logge{var step = DeserializeStep(stepData!.Type, stepData.Data);if (step != null)- result.Add((stepData.Index, step)); // Use explicit Index+ result.Add((stepData.Index, step));+ else+ _logger.LogWarning(+ "Skipped unknown revert step type '{Type}' for optimization {Id}",+ stepData.Type,+ id+ );}return result.OrderBy(x => x.Item1).ToList();@@ -309,8 +367,12 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _loggeif (File.Exists(path)){File.Delete(path);- _logger.LogInformation("Removed revert data for {Name}", name ?? id.ToString());+ _logger.LogInformation("Removed revert data for {Name}: {Path}", name ?? id.ToString(), path);}++ var tempPath = path + ".tmp";+ if (File.Exists(tempPath))+ File.Delete(tempPath);}catch (Exception ex){@@ -322,6 +384,7 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _logge{var dict = new Dictionary<string, Func<JObject, IRevertStep>>();foreach (var type in ReflectionHelper.FindImplementationsInLoadedAssemblies<IRevertStep>())+ {try{var instance = (IRevertStep)Activator.CreateInstance(type)!;@@ -329,7 +392,15 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _loggeif (method != null)dict[instance.Type] = data => (IRevertStep)method.Invoke(null, [data])!;}- catch { }+ catch (Exception ex)+ {+ System.Diagnostics.Trace.TraceWarning(+ "Failed to register revert step {Type}: {Message}",+ type.FullName,+ ex.Message+ );+ }+ }return dict;}@@ -338,7 +409,11 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _logge{if (data is not JObject obj)return null;- return _stepRegistry.Value.TryGetValue(type, out var factory) ? factory(obj) : null;+ if (_stepRegistry.Value.TryGetValue(type, out var factory))+ return factory(obj);++ _logger.LogWarning("Unknown revert step type: {Type}", type);+ return null;}#endregiondiff --git a/optimizerDuck/UI/Behaviors/SmoothScrollBehavior.cs b/optimizerDuck/UI/Behaviors/SmoothScrollBehavior.csnew file mode 100644index 0000000..d40f7ee--- /dev/null+++ b/optimizerDuck/UI/Behaviors/SmoothScrollBehavior.cs@@ -0,0 +1,281 @@+using System.Runtime.CompilerServices;+using System.Windows;+using System.Windows.Controls;+using System.Windows.Input;+using System.Windows.Media;++namespace optimizerDuck.UI.Behaviors;++public static class SmoothScrollBehavior+{+ private sealed class ScrollState+ {+ public double TargetY;+ public double TargetX;+ public bool IsAnimating;+ public long LastScrollTicks;+ }++ private static readonly ConditionalWeakTable<ScrollViewer, ScrollState> _stateTable = new();+ private static readonly List<WeakReference<ScrollViewer>> _activeScrolls = [];+ private static bool _renderingSubscribed;++ private const double SnapThreshold = 0.5;++ public static readonly DependencyProperty IsEnabledProperty = DependencyProperty.RegisterAttached(+ "IsEnabled", typeof(bool), typeof(SmoothScrollBehavior),+ new PropertyMetadata(false, OnIsEnabledChanged));++ public static readonly DependencyProperty ScrollDeltaProperty = DependencyProperty.RegisterAttached(+ "ScrollDelta", typeof(double), typeof(SmoothScrollBehavior),+ new PropertyMetadata(48.0));++ public static readonly DependencyProperty MultiplierProperty = DependencyProperty.RegisterAttached(+ "Multiplier", typeof(double), typeof(SmoothScrollBehavior),+ new PropertyMetadata(1.0));++ public static readonly DependencyProperty SmoothingProperty = DependencyProperty.RegisterAttached(+ "Smoothing", typeof(double), typeof(SmoothScrollBehavior),+ new PropertyMetadata(0.20));++ public static bool GetIsEnabled(DependencyObject obj) => (bool)obj.GetValue(IsEnabledProperty);+ public static void SetIsEnabled(DependencyObject obj, bool value) => obj.SetValue(IsEnabledProperty, value);+ public static double GetScrollDelta(DependencyObject obj) => (double)obj.GetValue(ScrollDeltaProperty);+ public static void SetScrollDelta(DependencyObject obj, double value) => obj.SetValue(ScrollDeltaProperty, value);+ public static double GetMultiplier(DependencyObject obj) => (double)obj.GetValue(MultiplierProperty);+ public static void SetMultiplier(DependencyObject obj, double value) => obj.SetValue(MultiplierProperty, value);+ public static double GetSmoothing(DependencyObject obj) => (double)obj.GetValue(SmoothingProperty);+ public static void SetSmoothing(DependencyObject obj, double value) => obj.SetValue(SmoothingProperty, value);++ private static void OnIsEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)+ {+ if (d is ScrollViewer sv)+ {+ if ((bool)e.NewValue)+ Attach(sv);+ else+ Detach(sv);+ }+ else if (d is FrameworkElement element)+ {+ if ((bool)e.NewValue)+ element.Loaded += OnElementLoaded;+ else+ element.Loaded -= OnElementLoaded;+ }+ }++ private static void OnElementLoaded(object sender, RoutedEventArgs e)+ {+ if (sender is FrameworkElement element && FindScrollViewer(element) is { } sv)+ Attach(sv);+ }++ private static void Attach(ScrollViewer sv)+ {+ _stateTable.GetOrCreateValue(sv);+ sv.PreviewMouseWheel += OnPreviewMouseWheel;+ sv.Unloaded += OnScrollViewerUnloaded;+ }++ private static void Detach(ScrollViewer sv)+ {+ sv.PreviewMouseWheel -= OnPreviewMouseWheel;+ sv.Unloaded -= OnScrollViewerUnloaded;+ RemoveActive(sv);+ _stateTable.Remove(sv);+ }++ private static void OnScrollViewerUnloaded(object sender, RoutedEventArgs e)+ {+ if (sender is ScrollViewer sv)+ {+ RemoveActive(sv);+ if (_stateTable.TryGetValue(sv, out var state))+ state.IsAnimating = false;+ }+ }++ private static void OnPreviewMouseWheel(object sender, MouseWheelEventArgs e)+ {+ try+ {+ if (sender is not ScrollViewer sv || !_stateTable.TryGetValue(sv, out var state))+ return;++ if (!sv.IsLoaded || sv.IsSealed)+ return;++ if (IsNestedScrollViewer(e.OriginalSource as DependencyObject, sv))+ return;++ e.Handled = true;++ var delta = e.Delta / 120.0;+ var scrollDelta = GetScrollDelta(sv);++ if (!state.IsAnimating)+ {+ state.TargetX = sv.HorizontalOffset;+ state.TargetY = sv.VerticalOffset;+ state.IsAnimating = true;+ _activeScrolls.Add(new WeakReference<ScrollViewer>(sv));++ if (!_renderingSubscribed)+ {+ CompositionTarget.Rendering += OnRendering;+ _renderingSubscribed = true;+ }+ }++ var multiplier = GetMultiplier(sv);+ var now = DateTime.UtcNow.Ticks;+ var timeSinceLastScroll = TimeSpan.FromTicks(now - state.LastScrollTicks).TotalMilliseconds;+ state.LastScrollTicks = now;++ // Acceleration: apply multiplier only during rapid scrolling sequences+ var effectiveDelta = multiplier > 1.0 && timeSinceLastScroll < 400+ ? delta * scrollDelta * multiplier+ : delta * scrollDelta;++ if (Keyboard.Modifiers == ModifierKeys.Shift)+ {+ if (sv.ScrollableWidth > 0)+ state.TargetX = Math.Clamp(state.TargetX - effectiveDelta, 0, sv.ScrollableWidth);+ }+ else+ {+ if (sv.ScrollableHeight > 0)+ state.TargetY = Math.Clamp(state.TargetY - effectiveDelta, 0, sv.ScrollableHeight);+ }+ }+ catch+ {+ // ScrollViewer disposed or visual tree changed mid-handler+ }+ }++ private static void OnRendering(object? sender, EventArgs e)+ {+ for (var i = _activeScrolls.Count - 1; i >= 0; i--)+ {+ ScrollViewer? sv = null;++ try+ {+ var wr = _activeScrolls[i];+ if (!wr.TryGetTarget(out sv))+ {+ _activeScrolls.RemoveAt(i);+ continue;+ }++ if (!_stateTable.TryGetValue(sv, out var state) || !state.IsAnimating)+ {+ _activeScrolls.RemoveAt(i);+ continue;+ }++ if (!sv.IsLoaded)+ {+ state.IsAnimating = false;+ _activeScrolls.RemoveAt(i);+ continue;+ }++ var active = false;++ var dy = state.TargetY - sv.VerticalOffset;+ if (Math.Abs(dy) > SnapThreshold)+ {+ sv.ScrollToVerticalOffset(sv.VerticalOffset + dy * GetSmoothing(sv));+ active = true;+ }+ else if (dy != 0)+ {+ sv.ScrollToVerticalOffset(state.TargetY);+ }++ var dx = state.TargetX - sv.HorizontalOffset;+ if (Math.Abs(dx) > SnapThreshold)+ {+ sv.ScrollToHorizontalOffset(sv.HorizontalOffset + dx * GetSmoothing(sv));+ active = true;+ }+ else if (dx != 0)+ {+ sv.ScrollToHorizontalOffset(state.TargetX);+ }++ if (!active)+ {+ state.IsAnimating = false;+ _activeScrolls.RemoveAt(i);+ }+ }+ catch+ {+ if (sv is not null && _stateTable.TryGetValue(sv, out var s))+ s.IsAnimating = false;+ _activeScrolls.RemoveAt(i);+ }+ }++ if (_activeScrolls.Count == 0 && _renderingSubscribed)+ {+ _renderingSubscribed = false;+ CompositionTarget.Rendering -= OnRendering;+ }+ }++ private static void RemoveActive(ScrollViewer sv)+ {+ for (var i = _activeScrolls.Count - 1; i >= 0; i--)+ {+ if (_activeScrolls[i].TryGetTarget(out var target) && target == sv)+ {+ _activeScrolls.RemoveAt(i);+ return;+ }+ }+ }++ private static bool IsNestedScrollViewer(DependencyObject? element, ScrollViewer parent)+ {+ try+ {+ while (element is not null && element != parent)+ {+ if (element is ScrollViewer sv && sv != parent && (sv.ScrollableHeight > 0 || sv.ScrollableWidth > 0))+ return true;+ element = VisualTreeHelper.GetParent(element);+ }+ }+ catch+ {+ // Visual tree changed during traversal+ }+ return false;+ }++ private static ScrollViewer? FindScrollViewer(DependencyObject element)+ {+ try+ {+ if (element is ScrollViewer sv)+ return sv;+ var count = VisualTreeHelper.GetChildrenCount(element);+ for (var i = 0; i < count; i++)+ {+ var result = FindScrollViewer(VisualTreeHelper.GetChild(element, i));+ if (result is not null)+ return result;+ }+ }+ catch+ {+ // Visual tree changed during traversal+ }+ return null;+ }+}diff --git a/optimizerDuck/UI/Pages/BloatwarePage.xaml b/optimizerDuck/UI/Pages/BloatwarePage.xamlindex 67ecb68..ceddc32 100644--- a/optimizerDuck/UI/Pages/BloatwarePage.xaml+++ b/optimizerDuck/UI/Pages/BloatwarePage.xaml@@ -258,26 +258,26 @@Text="{ext:Loc Bloatware.Search.NoResults}" /></StackPanel>- <ItemsControl+ <ui:VirtualizingItemsControlGrid.Row="2"ItemsSource="{Binding ViewModel.AppxPackages}"+ VirtualizingPanel.IsVirtualizing="True"+ VirtualizingPanel.VirtualizationMode="Recycling"Visibility="{Binding ViewModel.AppxPackages.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}">- <ItemsControl.Template>+ <ui:VirtualizingItemsControl.Template><ControlTemplate TargetType="ItemsControl"><ScrollViewer HorizontalScrollBarVisibility="Disabled"><ItemsPresenter Margin="0,0,12,0" /></ScrollViewer></ControlTemplate>- </ItemsControl.Template>- <!-- Layout panel -->- <ItemsControl.ItemsPanel>+ </ui:VirtualizingItemsControl.Template>+ <ui:VirtualizingItemsControl.ItemsPanel><ItemsPanelTemplate><VirtualizingStackPanel /></ItemsPanelTemplate>- </ItemsControl.ItemsPanel>+ </ui:VirtualizingItemsControl.ItemsPanel>- <!-- Item template -->- <ItemsControl.ItemTemplate>+ <ui:VirtualizingItemsControl.ItemTemplate><DataTemplate DataType="{x:Type bloatware1:AppXPackage}"><Border Style="{StaticResource ListRowStyle}"><Grid>@@ -387,8 +387,8 @@</Grid></Border></DataTemplate>- </ItemsControl.ItemTemplate>- </ItemsControl>+ </ui:VirtualizingItemsControl.ItemTemplate>+ </ui:VirtualizingItemsControl></Grid></Border></Grid>diff --git a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xamlindex 23585df..e68ffd6 100644--- a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml+++ b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPage.xaml@@ -29,6 +29,7 @@ComparisonType="GreaterThan"Threshold="0" /><converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />+ <converters:InverseBooleanConverter x:Key="InverseBooleanConverter" /><converters:BooleanToVisibilityConverterx:Key="InverseBooleanToVisibilityConverter"False="Visible"@@ -357,7 +358,8 @@Command="{Binding DataContext.ViewModel.ToggleOptimizationCommand, RelativeSource={RelativeSource AncestorType=Page}}"CommandParameter="{Binding}"Cursor="Hand"- IsChecked="{Binding State.IsApplied, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"+ IsChecked="{Binding State.IsApplied, Mode=OneWay}"+ IsEnabled="{Binding DataContext.ViewModel.IsProcessing, RelativeSource={RelativeSource AncestorType=Page}, Converter={StaticResource InverseBooleanConverter}}"Style="{StaticResource ToggleSwitchStyle}" /><ui:ButtonHorizontalAlignment="Right"diff --git a/optimizerDuck/UI/Pages/SettingsPage.xaml b/optimizerDuck/UI/Pages/SettingsPage.xamlindex 18545f0..531726a 100644--- a/optimizerDuck/UI/Pages/SettingsPage.xaml+++ b/optimizerDuck/UI/Pages/SettingsPage.xaml@@ -119,7 +119,7 @@<ui:ToggleSwitchCommand="{Binding ViewModel.ToggleShowCompletionNotificationCommand}"Cursor="Hand"- IsChecked="{Binding ViewModel.ShowSnackbarNotificationAfterAppliedSuccessfully, Mode=TwoWay}"+ IsChecked="{Binding ViewModel.ShowSnackbarNotificationAfterAppliedSuccessfully, Mode=OneWay}"OffContent="{ext:Loc Common.Toggle.Off}"OnContent="{ext:Loc Common.Toggle.On}" /></ui:CardControl>@@ -147,7 +147,7 @@<ui:ToggleSwitchCommand="{Binding ViewModel.ToggleRemoveProvisionedCommand}"Cursor="Hand"- IsChecked="{Binding ViewModel.RemoveProvisioned, Mode=TwoWay}"+ IsChecked="{Binding ViewModel.RemoveProvisioned, Mode=OneWay}"OffContent="{ext:Loc Common.Toggle.Off}"OnContent="{ext:Loc Common.Toggle.On}" /></ui:CardControl>diff --git a/optimizerDuck/UI/Styles/FluentDesign.xaml b/optimizerDuck/UI/Styles/FluentDesign.xamlindex 68ec332..d49b528 100644--- a/optimizerDuck/UI/Styles/FluentDesign.xaml+++ b/optimizerDuck/UI/Styles/FluentDesign.xaml@@ -1,6 +1,7 @@<ResourceDictionaryxmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"+ xmlns:behaviors="clr-namespace:optimizerDuck.UI.Behaviors"xmlns:sys="clr-namespace:System;assembly=mscorlib"xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml">@@ -111,19 +112,6 @@<Setter Property="BorderThickness" Value="1" /><Setter Property="CornerRadius" Value="{StaticResource CornerRadiusMedium}" /><Setter Property="Opacity" Value="1" />- <Style.Triggers>- <EventTrigger RoutedEvent="Loaded">- <BeginStoryboard>- <Storyboard>- <DoubleAnimation- Storyboard.TargetProperty="Opacity"- From="0"- To="1"- Duration="0:0:0.12" />- </Storyboard>- </BeginStoryboard>- </EventTrigger>- </Style.Triggers></Style><Style x:Key="SubtlePillStyle" TargetType="Border">@@ -211,4 +199,10 @@<Setter Property="HorizontalAlignment" Value="Stretch" /></Style>+ <Style TargetType="ScrollViewer">+ <Setter Property="behaviors:SmoothScrollBehavior.IsEnabled" Value="True" />+ <Setter Property="behaviors:SmoothScrollBehavior.Smoothing" Value="0.20" />+ <Setter Property="behaviors:SmoothScrollBehavior.Multiplier" Value="1.3" />+ </Style>+</ResourceDictionary>diff --git a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.csindex 724e886..a7624b0 100644--- a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs@@ -34,8 +34,10 @@ public partial class OptimizationCategoryViewModel : ViewModelLazy<Task<(string Content, DateTime FetchedAt)>>> _sourceCache = new();private static readonly TimeSpan SourceCacheTtl = TimeSpan.FromMinutes(5);+ private static readonly TimeSpan FilterDebounceDelay = TimeSpan.FromMilliseconds(250);private readonly List<IOptimization> _allOptimizations = [];+ private CancellationTokenSource? _filterDebounceCts;private readonly IOptionsMonitor<AppSettings> _appOptionsMonitor;private readonly IOptimizationCategory _category;@@ -89,24 +91,43 @@ public partial class OptimizationCategoryViewModel : ViewModelpublic bool HasAppliedOptimizations => _allOptimizations.Any(o => o.State.IsApplied);- partial void OnSearchTextChanged(string value)- {- ApplyFilter();- }+ partial void OnSearchTextChanged(string value) => ScheduleApplyFilter();- partial void OnSelectedRiskFilterIndexChanged(int value)- {- ApplyFilter();- }+ partial void OnSelectedRiskFilterIndexChanged(int value) => ApplyFilter();- partial void OnSelectedSortByIndexChanged(int value)- {- ApplyFilter();- }+ partial void OnSelectedSortByIndexChanged(int value) => ApplyFilter();- partial void OnHideAppliedChanged(bool value)+ partial void OnHideAppliedChanged(bool value) => ApplyFilter();++ private void ScheduleApplyFilter(){- ApplyFilter();+ _filterDebounceCts?.Cancel();+ _filterDebounceCts?.Dispose();+ _filterDebounceCts = new CancellationTokenSource();+ var token = _filterDebounceCts.Token;++ _ = Task.Run(+ async () =>+ {+ try+ {+ await Task.Delay(FilterDebounceDelay, token).ConfigureAwait(false);+ await Application.Current.Dispatcher.InvokeAsync(+ () =>+ {+ if (!token.IsCancellationRequested)+ ApplyFilter();+ },+ System.Windows.Threading.DispatcherPriority.Background+ );+ }+ catch (OperationCanceledException)+ {+ // debounced+ }+ },+ token+ );}public override async Task OnNavigatedToAsync()diff --git a/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.csindex d10337a..b811d3c 100644--- a/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs@@ -30,6 +30,9 @@ public partial class DashboardViewModel : ViewModel[ObservableProperty]private bool _isLoading;++ [ObservableProperty]+ private bool _hasSystemInfoLoadFailed;private bool _isUpdateInfoOpen;[ObservableProperty]@@ -260,6 +263,7 @@ public partial class DashboardViewModel : ViewModelprivate async Task LoadSystemInfoAsync(){IsLoading = true;+ HasSystemInfoLoadFailed = false;try{@@ -270,7 +274,15 @@ public partial class DashboardViewModel : ViewModel}catch (Exception ex){+ HasSystemInfoLoadFailed = true;_logger.LogError(ex, "Failed to load system information");+ _snackbarService.Show(+ Translations.Snackbar_OpenFailed_Title,+ Translations.Snackbar_OpenFailed_Message,+ ControlAppearance.Danger,+ new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },+ TimeSpan.FromSeconds(5)+ );}finally{diff --git a/optimizerDuck/UI/ViewModels/Pages/OptimizeViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/OptimizeViewModel.csindex f5f4bf5..09a6c3e 100644--- a/optimizerDuck/UI/ViewModels/Pages/OptimizeViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/OptimizeViewModel.cs@@ -14,11 +14,12 @@ public class OptimizeViewModel(OptimizationRegistry optimizationService) : ViewMpublic event Action? OptimizationsLoaded;- public override Task OnNavigatedToAsync()+ public override async Task OnNavigatedToAsync(){- // Load optimization categories when user navigates to the pageif (_isInitialized)- return Task.CompletedTask;+ return;++ await optimizationService.EnsurePreloadedAsync().ConfigureAwait(true);foreach (var category in optimizationService.OptimizationCategories)OptimizationCategories.Add(@@ -34,6 +35,5 @@ public class OptimizeViewModel(OptimizationRegistry optimizationService) : ViewMOptimizationsLoaded?.Invoke();_isInitialized = true;- return Task.CompletedTask;}}diff --git a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.csindex 0a2732a..ddbc39b 100644--- a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs@@ -263,11 +263,11 @@ public partial class SettingsViewModel("bloatware:removeProvisioned",(!appOptionsMonitor.CurrentValue.Bloatware.RemoveProvisioned).ToString());+ RemoveProvisioned = appOptionsMonitor.CurrentValue.Bloatware.RemoveProvisioned;}catch (Exception ex){logger.LogError(ex, "Failed to toggle RemoveProvisioned setting");- // Revert UI property on failureRemoveProvisioned = appOptionsMonitor.CurrentValue.Bloatware.RemoveProvisioned;}}@@ -283,11 +283,14 @@ public partial class SettingsViewModel("optimize:showCompletionNotification",(!appOptionsMonitor.CurrentValue.Optimize.ShowCompletionNotification).ToString());+ ShowSnackbarNotificationAfterAppliedSuccessfully = appOptionsMonitor+ .CurrentValue+ .Optimize+ .ShowCompletionNotification;}catch (Exception ex){logger.LogError(ex, "Failed to toggle ShowCompletionNotification setting");- // Revert UI property on failureShowSnackbarNotificationAfterAppliedSuccessfully = appOptionsMonitor.CurrentValue.Optimize