Free, open-source Windows optimization tool for performance, privacy, and simplicity.
C# csharpdebloatdotnetgamingopen-sourceoptimizationoptimizeroptimizerduckperformanceprivacytweakertweakswindowswinui
feat: add preloading and add async for optimization and customization registry
fatDuck14d5cec03a96
diff --git a/optimizerDuck/App.xaml.cs b/optimizerDuck/App.xaml.csindex 612e7c9..4042945 100644--- a/optimizerDuck/App.xaml.cs+++ b/optimizerDuck/App.xaml.cs@@ -430,8 +430,14 @@ public partial class App : ApplicationmainWindow.Show();});- _logger.LogInformation("Preloading optimizations in background...");- optimizationRegistry.StartPreload();+ _logger.LogInformation("Preloading optimizations...");+ await optimizationRegistry.PreloadOptimizationsAsync().ConfigureAwait(false);++ _logger.LogInformation("Preloading customize settings...");+ var customizeRegistry = _host.Services.GetRequiredService<CustomizeRegistry>();+ await customizeRegistry.PreloadCategoriesAsync().ConfigureAwait(false);++ _logger.LogInformation("Preloading completed.");}protected override async void OnExit(ExitEventArgs e)diff --git a/optimizerDuck/Common/Extensions/CustomizePageRegistryExtensions.cs b/optimizerDuck/Common/Extensions/CustomizePageRegistryExtensions.csindex 651a999..abc4bdc 100644--- a/optimizerDuck/Common/Extensions/CustomizePageRegistryExtensions.cs+++ b/optimizerDuck/Common/Extensions/CustomizePageRegistryExtensions.cs@@ -37,6 +37,11 @@ public static class CustomizePageRegistryExtensionsvar registry = serviceProvider.GetRequiredService<CustomizeRegistry>();var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();var registryWatcher = serviceProvider.GetRequiredService<IRegistryWatcher>();++ // Fall back to synchronous registration if preloading hasn't completed yet.+ // RegisterCategories is a no-op if already preloaded.+ registry.RegisterCategories();+var category = registry.Categories.First(c => c.GetType() == categoryType);var viewModel = new CustomizeCategoryViewModel(category, loggerFactory, registryWatcher);diff --git a/optimizerDuck/Services/Customize/CustomizeRegistry.cs b/optimizerDuck/Services/Customize/CustomizeRegistry.csindex d59f2a1..ec91272 100644--- a/optimizerDuck/Services/Customize/CustomizeRegistry.cs+++ b/optimizerDuck/Services/Customize/CustomizeRegistry.cs@@ -18,62 +18,93 @@ public class CustomizeRegistry_logger = logger;}- /// <summary>Gets the registered customize categories. Each category contains its child customize settings. Populated after calling <see cref="RegisterCategories"/>.</summary>+ /// <summary>Gets the registered customize categories. Each category contains its child customize settings. Populated after calling <see cref="RegisterCategories"/> or via preloading.</summary>public ICustomizeCategory[] Categories { get; private set; } = [];- /// <summary>Discovers all customize setting categories and their child settings via reflection, then populates <see cref="Categories"/>.</summary>- public void RegisterCategories()+ /// <summary>Gets a value that indicates whether the customize categories have been fully discovered.</summary>+ public bool IsPreloaded { get; private set; }++ /// <summary>+ /// Ensures categories have been discovered before the customize UI binds.+ /// If preloading has already completed, returns a completed task.+ /// </summary>+ public Task EnsurePreloadedAsync(){- _logger.LogInformation("Discovering customize setting categories...");+ if (IsPreloaded)+ return Task.CompletedTask;+ return PreloadCategoriesAsync();+ }- var categories = ReflectionHelper- .FindImplementationsInLoadedAssemblies<ICustomizeCategory>()- .Select(t =>+ /// <summary>Discovers all customize setting categories and their child settings via reflection, then populates <see cref="Categories"/>.</summary>+ public async Task PreloadCategoriesAsync()+ {+ // Run reflection work on background thread to avoid blocking startup+ var categories = await Task.Run(() =>{- var featureTypes = t.GetNestedTypes(BindingFlags.Public)- .Where(nt => typeof(ICustomizeSetting).IsAssignableFrom(nt) && !nt.IsAbstract)- .Select(nt =>+ _logger.LogInformation("Discovering customize setting categories...");++ var result = ReflectionHelper+ .FindImplementationsInLoadedAssemblies<ICustomizeCategory>()+ .Select(t =>{- var opt = (ICustomizeSetting)Activator.CreateInstance(nt)!;+ var featureTypes = t.GetNestedTypes(BindingFlags.Public)+ .Where(nt => typeof(ICustomizeSetting).IsAssignableFrom(nt) && !nt.IsAbstract)+ .Select(nt =>+ {+ var opt = (ICustomizeSetting)Activator.CreateInstance(nt)!;- if (opt is BaseCustomizeSetting bo)- bo.OwnerType = t;+ if (opt is BaseCustomizeSetting bo)+ bo.OwnerType = t;- return opt;- })- .ToList();+ return opt;+ })+ .ToList();++ if (featureTypes.Count == 0)+ return null;- if (featureTypes.Count == 0)- return null;+ var features = new ObservableCollection<ICustomizeSetting>(featureTypes);- var features = new ObservableCollection<ICustomizeSetting>(featureTypes);+ var instance = (ICustomizeCategory)Activator.CreateInstance(t)!;- var instance = (ICustomizeCategory)Activator.CreateInstance(t)!;+ var featuresProp = t.GetProperty(+ nameof(ICustomizeCategory.Features),+ BindingFlags.Public | BindingFlags.Instance+ );+ if (featuresProp != null && featuresProp.CanWrite)+ featuresProp.SetValue(instance, features);- var featuresProp = t.GetProperty(- nameof(ICustomizeCategory.Features),- BindingFlags.Public | BindingFlags.Instance+ return instance;+ })+ .Where(c => c != null)+ .Cast<ICustomizeCategory>()+ .OrderBy(c => c.Order)+ .ToArray();++ _logger.LogInformation(+ "Registered {CategoryCount} customize categories with {SettingCount} total settings",+ result.Length,+ result.Sum(c => c.Features.Count));- if (featuresProp != null && featuresProp.CanWrite)- featuresProp.SetValue(instance, features);- return instance;+ return result;})- .Where(c => c != null)- .Cast<ICustomizeCategory>()- .OrderBy(c => c.Order)- .ToArray();+ .ConfigureAwait(false);Categories = categories;+ IsPreloaded = true;+ }++ /// <summary>Synchronous fallback for registration (used when preloading hasn't started yet, e.g., during DI page creation).</summary>+ public void RegisterCategories()+ {+ if (IsPreloaded)+ return;- _logger.LogInformation(- "Registered {CategoryCount} customize categories with {SettingCount} total settings",- categories.Length,- categories.Sum(c => c.Features.Count)- );+ PreloadCategoriesAsync().GetAwaiter().GetResult();}- /// <summary>Builds the navigation items for the UI from the registered categories. Calls <see cref="RegisterCategories"/> if not yet registered.</summary>+ /// <summary>Builds the navigation items for the UI from the registered categories.</summary>/// <returns>A sequence of <see cref="NavigationViewItem"/> instances mapped to customize pages.</returns>public IEnumerable<NavigationViewItem> GetNavigationItems(){diff --git a/optimizerDuck/Services/Optimization/OptimizationRegistry.cs b/optimizerDuck/Services/Optimization/OptimizationRegistry.csindex 4e60317..f4c4627 100644--- a/optimizerDuck/Services/Optimization/OptimizationRegistry.cs+++ b/optimizerDuck/Services/Optimization/OptimizationRegistry.cs@@ -10,7 +10,6 @@ namespace optimizerDuck.Services.Optimization;public class OptimizationRegistry(ILoggerFactory loggerFactory){private readonly ILogger _logger = loggerFactory.CreateLogger<OptimizationRegistry>();- private Task? _preloadTask;/// <summary>Gets or sets the discovered optimization categories after preloading. Each category contains its child optimizations.</summary>public IOptimizationCategory[] OptimizationCategories { get; set; } = [];@@ -18,20 +17,15 @@ public class OptimizationRegistry(ILoggerFactory loggerFactory)/// <summary>Gets a value that indicates whether the optimizations have been fully discovered and their applied states loaded.</summary>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.+ /// If preloading has already completed, returns a completed task./// </summary>public Task EnsurePreloadedAsync(){- return _preloadTask ??= PreloadOptimizationsAsync();+ if (IsPreloaded)+ return Task.CompletedTask;+ return PreloadOptimizationsAsync();}/// <summary>Discovers all optimization categories and their optimizations via reflection, then loads the applied state from revert data on disk.</summary>diff --git a/optimizerDuck/UI/Pages/Customize/CustomizePage.xaml.cs b/optimizerDuck/UI/Pages/Customize/CustomizePage.xaml.csindex 609258d..60ecdb1 100644--- a/optimizerDuck/UI/Pages/Customize/CustomizePage.xaml.cs+++ b/optimizerDuck/UI/Pages/Customize/CustomizePage.xaml.cs@@ -1,4 +1,4 @@-using optimizerDuck.UI.ViewModels.Pages;+using optimizerDuck.UI.ViewModels.Pages;using Wpf.Ui.Abstractions.Controls;namespace optimizerDuck.UI.Pages;@@ -11,8 +11,6 @@ public partial class CustomizePage : INavigableView<CustomizeViewModel>DataContext = this;InitializeComponent();-- Loaded += async (_, _) => await ViewModel.InitializeAsync();}public CustomizeViewModel ViewModel { get; }diff --git a/optimizerDuck/UI/ViewModels/Pages/CustomizeCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/CustomizeCategoryViewModel.csindex 5eb54eb..573bfee 100644--- a/optimizerDuck/UI/ViewModels/Pages/CustomizeCategoryViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/CustomizeCategoryViewModel.cs@@ -67,11 +67,9 @@ public partial class CustomizeCategoryViewModel : ViewModel_allSettings.Clear();foreach (var setting in _currentCategory.Features)_allSettings.Add(new CustomizeItemViewModel(setting, loggerFactory, registryWatcher));-- _ = InitializeAsync();}- private async Task InitializeAsync()+ protected override async Task InitializeOnceAsync(){await Task.WhenAll(_allSettings.Select(s => s.LoadStateAsync()));ApplyFilters();diff --git a/optimizerDuck/UI/ViewModels/Pages/CustomizeViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/CustomizeViewModel.csindex f910e2a..dd50620 100644--- a/optimizerDuck/UI/ViewModels/Pages/CustomizeViewModel.cs+++ b/optimizerDuck/UI/ViewModels/Pages/CustomizeViewModel.cs@@ -9,7 +9,7 @@ using Wpf.Ui.Controls;namespace optimizerDuck.UI.ViewModels.Pages;-public partial class CustomizeViewModel : ObservableObject+public partial class CustomizeViewModel : ViewModel{private readonly INavigationService _navigationService;private readonly CustomizeRegistry _registry;@@ -26,12 +26,12 @@ public partial class CustomizeViewModel : ObservableObject_registry = registry;}- public async Task InitializeAsync()++ protected override async Task InitializeOnceAsync(){IsLoading = true;- if (_registry.Categories.Length == 0)- _registry.RegisterCategories();+ await _registry.EnsurePreloadedAsync().ConfigureAwait(false);var categoryViewModels = new ObservableCollection<CustomizeCategoryItemViewModel>();@@ -52,8 +52,6 @@ public partial class CustomizeViewModel : ObservableObjectCategories = categoryViewModels;IsLoading = false;-- await Task.CompletedTask;}[RelayCommand]