Skip to content

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

refactor: add comprehensive error handling and improve robustness

itsfatduck095da199b8e8
diff --git a/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs b/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs
index 56c4ad0..77b17e9 100644
--- a/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs
+++ b/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs
@@ -74,4 +74,57 @@ public class RevertManagerTests
File.Delete(path);
}
}
-}
\ No newline at end of file
+
+ [Fact]
+ public async Task RevertAsync_WithPartialStepFailures_ReturnsFailure_And_KeepsFile()
+ {
+ var id = Guid.NewGuid();
+ var path = Path.Combine(Shared.RevertDirectory, id + ".json");
+ Directory.CreateDirectory(Shared.RevertDirectory);
+
+ var payload = new RevertData
+ {
+ OptimizationId = id,
+ OptimizationName = "TestOptimization",
+ AppliedAt = DateTime.UtcNow,
+ Steps = new List<RevertStepData>
+ {
+ new()
+ {
+ Type = "Shell",
+ Data = new optimizerDuck.Core.Models.Revert.Steps.ShellRevertStep
+ {
+ ShellType = optimizerDuck.Core.Models.Revert.Steps.ShellType.CMD,
+ Command = "exit 0"
+ }.ToData()
+ },
+ new()
+ {
+ Type = "Shell",
+ Data = new optimizerDuck.Core.Models.Revert.Steps.ShellRevertStep
+ {
+ ShellType = optimizerDuck.Core.Models.Revert.Steps.ShellType.CMD,
+ Command = "exit 1"
+ }.ToData()
+ }
+ }
+ };
+
+ try
+ {
+ var json = JsonConvert.SerializeObject(payload, Formatting.Indented);
+ await File.WriteAllTextAsync(path, json);
+
+ var manager = new RevertManager(NullLogger<RevertManager>.Instance);
+ var result = await manager.RevertAsync(id, "TestOptimization");
+
+ Assert.False(result.Success);
+ Assert.True(File.Exists(path));
+ }
+ finally
+ {
+ if (File.Exists(path))
+ File.Delete(path);
+ }
+ }
+}
diff --git a/optimizerDuck/App.xaml.cs b/optimizerDuck/App.xaml.cs
index eda3ab3..45d7181 100644
--- a/optimizerDuck/App.xaml.cs
+++ b/optimizerDuck/App.xaml.cs
@@ -110,110 +110,131 @@ public partial class App : Application
protected override async void OnStartup(StartupEventArgs e)
{
base.OnStartup(e);
-
- // Create the required directories if they don't exist
- Directory.CreateDirectory(Shared.ResourcesDirectory);
- Directory.CreateDirectory(Shared.RootDirectory);
- Directory.CreateDirectory(Shared.RevertDirectory);
-
- var logPath = Path.Combine(Shared.RootDirectory, "optimizerDuck.log");
- Log.Logger = new LoggerConfiguration()
- .MinimumLevel.Verbose()
- .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
- .Enrich.FromLogContext()
- .WriteTo.File(
- new ScopeBlockTextFormatter(),
- logPath,
- rollingInterval: RollingInterval.Infinite
- )
- .CreateLogger();
-
- _host = Host.CreateDefaultBuilder()
- .UseSerilog()
- .ConfigureAppConfiguration((c) =>
+ try
+ {
+ // Create the required directories if they don't exist
+ Directory.CreateDirectory(Shared.ResourcesDirectory);
+ Directory.CreateDirectory(Shared.RootDirectory);
+ Directory.CreateDirectory(Shared.RevertDirectory);
+
+ var logPath = Path.Combine(Shared.RootDirectory, "optimizerDuck.log");
+ Log.Logger = new LoggerConfiguration()
+ .MinimumLevel.Verbose()
+ .MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
+ .Enrich.FromLogContext()
+ .WriteTo.File(
+ new ScopeBlockTextFormatter(),
+ logPath,
+ rollingInterval: RollingInterval.Infinite
+ )
+ .CreateLogger();
+
+ _host = Host.CreateDefaultBuilder()
+ .UseSerilog()
+ .ConfigureAppConfiguration((c) =>
+ {
+ ConfigManager.ValidateConfig();
+ c.AddJsonFile(Path.Combine(Shared.RootDirectory, "appsettings.json"), false, true);
+ })
+ .ConfigureServices((context, services) =>
+ {
+ services.Configure<AppSettings>(context.Configuration);
+
+ // WPF UI shi
+ services.AddNavigationViewPageProvider();
+ services.AddSingleton<INavigationService, NavigationService>();
+ services.AddSingleton<IContentDialogService, ContentDialogService>();
+ services.AddSingleton<ISnackbarService, SnackbarService>();
+
+ // Windows
+ services.AddSingleton<MainWindow>();
+
+ // Pages
+ services.AddSingleton<DashboardViewModel>();
+ services.AddSingleton<DashboardPage>();
+
+ services.AddSingleton<OptimizeViewModel>();
+ services.AddSingleton<OptimizePage>();
+
+ services.AddSingleton<SettingsViewModel>();
+ services.AddSingleton<SettingsPage>();
+
+ // Optimizations
+ services.AddAllOptimizationPages();
+
+ // Managers
+ services.AddSingleton<ConfigManager>();
+ services.AddSingleton<RevertManager>();
+
+ // Services
+ services.AddSingleton<OptimizationRegistry>();
+ services.AddSingleton<OptimizationService>();
+ services.AddSingleton<SystemInfoService>();
+ services.AddSingleton<StreamService>();
+ })
+ .Build();
+
+ await _host.StartAsync();
+
+ var config = _host.Services.GetRequiredService<ConfigManager>();
+ await config.InitializeAsync();
+
+ var appOptionsMonitor = _host.Services.GetRequiredService<IOptionsMonitor<AppSettings>>();
+ // init shell service with config
+ ShellService.Init(appOptionsMonitor);
+
+ var appSettings = appOptionsMonitor.CurrentValue;
+
+ Loc.Instance.ChangeCulture(new CultureInfo(appSettings.App.Language));
+
+ _logger = _host.Services.GetRequiredService<ILogger<App>>();
+ _logger.LogInformation("\n{Logo}\nVersion: {Version}\n\n", Shared.RawLogo, Shared.FileVersion);
+ _logger.LogInformation("Loaded language: {Language}", appSettings.App.Language);
+
+ var optimizationRegistry = _host.Services.GetRequiredService<OptimizationRegistry>();
+ _logger.LogInformation("Preloading optimizations...");
+ await optimizationRegistry.PreloadOptimizations();
+
+ // Apply custom accent colors
+ ApplicationAccentColorManager.Apply(
+ Color.FromRgb(254, 209, 20),
+ Color.FromRgb(242, 124, 20),
+ Color.FromRgb(254, 209, 20),
+ Color.FromRgb(242, 124, 20)
+ );
+
+ ApplicationThemeManager.Apply(
+ appSettings.App.Theme switch
+ {
+ "Dark" => ApplicationTheme.Dark,
+ "HighContrast" => ApplicationTheme.HighContrast,
+ _ => ApplicationTheme.Light
+ },
+ updateAccent: false
+ );
+
+ var mainWindow = _host.Services.GetRequiredService<MainWindow>();
+ mainWindow.Show();
+ }
+ catch (Exception ex)
+ {
+ try
{
- ConfigManager.ValidateConfig();
- c.AddJsonFile(Path.Combine(Shared.RootDirectory, "appsettings.json"), false, true);
- })
- .ConfigureServices((context, services) =>
+ Log.Logger?.Fatal(ex, "Fatal error during startup");
+ await Log.CloseAndFlushAsync();
+ }
+ catch
{
- services.Configure<AppSettings>(context.Configuration);
-
- // WPF UI shi
- services.AddNavigationViewPageProvider();
- services.AddSingleton<INavigationService, NavigationService>();
- services.AddSingleton<IContentDialogService, ContentDialogService>();
- services.AddSingleton<ISnackbarService, SnackbarService>();
-
- // Windows
- services.AddSingleton<MainWindow>();
-
- // Pages
- services.AddSingleton<DashboardViewModel>();
- services.AddSingleton<DashboardPage>();
-
- services.AddSingleton<OptimizeViewModel>();
- services.AddSingleton<OptimizePage>();
-
- services.AddSingleton<SettingsViewModel>();
- services.AddSingleton<SettingsPage>();
-
- // Optimizations
- services.AddAllOptimizationPages();
-
- // Managers
- services.AddSingleton<ConfigManager>();
- services.AddScoped<RevertManager>();
-
- // Services
- services.AddSingleton<OptimizationRegistry>();
- services.AddScoped<OptimizationService>();
- services.AddSingleton<SystemInfoService>();
- services.AddSingleton<StreamService>();
- })
- .Build();
-
- await _host.StartAsync();
-
- var config = _host.Services.GetRequiredService<ConfigManager>();
- await config.InitializeAsync();
-
- var appOptionsMonitor = _host.Services.GetRequiredService<IOptionsMonitor<AppSettings>>();
- // init shell service with config
- ShellService.Init(appOptionsMonitor);
-
- var appSettings = appOptionsMonitor.CurrentValue;
-
- Loc.Instance.ChangeCulture(new CultureInfo(appSettings.App.Language));
-
- _logger = _host.Services.GetRequiredService<ILogger<App>>();
- _logger.LogInformation("\n{Logo}\nVersion: {Version}\n\n", Shared.RawLogo, Shared.FileVersion);
- _logger.LogInformation("Loaded language: {Language}", appSettings.App.Language);
-
- var optimizationRegistry = _host.Services.GetRequiredService<OptimizationRegistry>();
- _logger.LogInformation("Preloading optimizations...");
- await optimizationRegistry.PreloadOptimizations();
-
- // Apply custom accent colors
- ApplicationAccentColorManager.Apply(
- Color.FromRgb(254, 209, 20),
- Color.FromRgb(242, 124, 20),
- Color.FromRgb(254, 209, 20),
- Color.FromRgb(242, 124, 20)
- );
+ // ignore logging failures during fatal startup handling
+ }
- ApplicationThemeManager.Apply(
- appSettings.App.Theme switch
- {
- "Dark" => ApplicationTheme.Dark,
- "HighContrast" => ApplicationTheme.HighContrast,
- _ => ApplicationTheme.Light
- },
- updateAccent: false
- );
-
- var mainWindow = _host.Services.GetRequiredService<MainWindow>();
- mainWindow.Show();
+ MessageBox.Show(
+ $"Failed to start optimizerDuck.{Environment.NewLine}{Environment.NewLine}{ex.Message}",
+ "optimizerDuck",
+ MessageBoxButton.OK,
+ MessageBoxImage.Error);
+ Shutdown(-1);
+ }
}
protected override async void OnExit(ExitEventArgs e)
@@ -228,4 +249,4 @@ public partial class App : Application
base.OnExit(e);
}
-}
\ No newline at end of file
+}
diff --git a/optimizerDuck/Common/Helpers/Shared.cs b/optimizerDuck/Common/Helpers/Shared.cs
index d7b485b..8ccf985 100644
--- a/optimizerDuck/Common/Helpers/Shared.cs
+++ b/optimizerDuck/Common/Helpers/Shared.cs
@@ -19,7 +19,7 @@ public static class Shared
public const string DiscordInviteURL = "https://discord.gg/GqvJYQsgSm";
public const string GitHubRepoURL = "https://github.com/itsfatduck/optimizerDuck";
- public const string SupportMeURL = "https://github.com/itsfatduck/optimizerDuck/SUPPORT.md";
+ public const string SupportMeURL = "https://github.com/itsfatduck/optimizerDuck/blob/master/SUPPORT.md";
public const string AcknowledgementsURL = "https://github.com/itsfatduck/optimizerDuck/blob/master/THIRD-PARTY-NOTICES.md";
@@ -43,4 +43,4 @@ public static class Shared
public static string RevertDirectory =>
Path.Combine(RootDirectory, "Revert");
-}
\ No newline at end of file
+}
diff --git a/optimizerDuck/Core/Optimizers/PowerManagement.cs b/optimizerDuck/Core/Optimizers/PowerManagement.cs
index 4a7705e..0140fee 100644
--- a/optimizerDuck/Core/Optimizers/PowerManagement.cs
+++ b/optimizerDuck/Core/Optimizers/PowerManagement.cs
@@ -122,15 +122,12 @@ public class PowerManagement : IOptimizationCategory
var (success, powerPlanPath) = await context.StreamService.TryDownloadAsync(
Shared.PowerPlanUrl,
"optimizerDuck.pow");
- if (!success)
- {
- context.Logger.LogInformation("Downloaded optimizerDuck power plan successfully");
- }
- else
+ if (!success || string.IsNullOrWhiteSpace(powerPlanPath))
{
context.Logger.LogError("Failed to download optimizerDuck power plan");
return ApplyResult.False(Loc.Instance[$"{ErrorPrefix}.DownloadFailed"]);
}
+ context.Logger.LogInformation("Downloaded optimizerDuck power plan to {Path}", powerPlanPath);
progress?.Report(new ProcessingProgress
{
@@ -143,8 +140,19 @@ public class PowerManagement : IOptimizationCategory
if (result.ExitCode == 0)
context.Logger.LogInformation("Deleted old power plan");
- ShellService.CMD($"powercfg /import \"{powerPlanPath}\" {Shared.PowerPlanGUID}");
- ShellService.CMD($"powercfg /setactive {Shared.PowerPlanGUID}");
+ var importResult = ShellService.CMD($"powercfg /import \"{powerPlanPath}\" {Shared.PowerPlanGUID}");
+ if (importResult.ExitCode != 0)
+ {
+ context.Logger.LogError("Failed to import optimizerDuck power plan: {Error}", importResult.Stderr);
+ return ApplyResult.False("Failed to import optimizerDuck power plan.");
+ }
+
+ var setActiveResult = ShellService.CMD($"powercfg /setactive {Shared.PowerPlanGUID}");
+ if (setActiveResult.ExitCode != 0)
+ {
+ context.Logger.LogError("Failed to activate optimizerDuck power plan: {Error}", setActiveResult.Stderr);
+ return ApplyResult.False("Failed to activate optimizerDuck power plan.");
+ }
context.Logger.LogInformation("Installed optimizerDuck power plan successfully!");
return ApplyResult.True();
}
@@ -170,4 +178,4 @@ public class PowerManagement : IOptimizationCategory
return Task.FromResult(ApplyResult.True());
}
}
-}
\ No newline at end of file
+}
diff --git a/optimizerDuck/Resources/Languages/Translations.Designer.cs b/optimizerDuck/Resources/Languages/Translations.Designer.cs
index ae5fff3..a40721e 100644
--- a/optimizerDuck/Resources/Languages/Translations.Designer.cs
+++ b/optimizerDuck/Resources/Languages/Translations.Designer.cs
@@ -2300,5 +2300,41 @@ namespace optimizerDuck.Resources.Languages {
return ResourceManager.GetString("Sidebar.Settings", resourceCulture);
}
}
+
+ /// <summary>
+ /// Looks up a localized string similar to An error occurred while opening the folder or file. Please check the log..
+ /// </summary>
+ public static string Snackbar_OpenFailed_Message {
+ get {
+ return ResourceManager.GetString("Snackbar.OpenFailed.Message", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unable to open the folder or file.
+ /// </summary>
+ public static string Snackbar_OpenFailed_Title {
+ get {
+ return ResourceManager.GetString("Snackbar.OpenFailed.Title", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to An error occurred while opening the path. Please check the log..
+ /// </summary>
+ public static string Snackbar_OpenLinkFailed_Message {
+ get {
+ return ResourceManager.GetString("Snackbar.OpenLinkFailed.Message", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unable to open the path.
+ /// </summary>
+ public static string Snackbar_OpenLinkFailed_Title {
+ get {
+ return ResourceManager.GetString("Snackbar.OpenLinkFailed.Title", resourceCulture);
+ }
+ }
}
}
diff --git a/optimizerDuck/Resources/Languages/Translations.resx b/optimizerDuck/Resources/Languages/Translations.resx
index d532360..a3a4815 100644
--- a/optimizerDuck/Resources/Languages/Translations.resx
+++ b/optimizerDuck/Resources/Languages/Translations.resx
@@ -766,4 +766,16 @@
<data name="RestorePoint.Snackbar.Success.Message" xml:space="preserve">
<value>A restore point has been created with the name: {0}.</value>
</data>
+ <data name="Snackbar.OpenLinkFailed.Title" xml:space="preserve">
+ <value>Unable to open the path</value>
+ </data>
+ <data name="Snackbar.OpenLinkFailed.Message" xml:space="preserve">
+ <value>An error occurred while opening the path. Please check the log.</value>
+ </data>
+ <data name="Snackbar.OpenFailed.Message" xml:space="preserve">
+ <value>An error occurred while opening the folder or file. Please check the log.</value>
+ </data>
+ <data name="Snackbar.OpenFailed.Title" xml:space="preserve">
+ <value>Unable to open the folder or file</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/optimizerDuck/Resources/Languages/Translations.vi-vn.resx b/optimizerDuck/Resources/Languages/Translations.vi-vn.resx
index 727392d..16a6076 100644
--- a/optimizerDuck/Resources/Languages/Translations.vi-vn.resx
+++ b/optimizerDuck/Resources/Languages/Translations.vi-vn.resx
@@ -763,4 +763,16 @@
<data name="RestorePoint.Snackbar.Success.Message" xml:space="preserve">
<value>Điểm khôi phục đã được tạo với tên: {0}.</value>
</data>
+ <data name="Snackbar.OpenLinkFailed.Title" xml:space="preserve">
+ <value>Không thể mở đường dẫn</value>
+ </data>
+ <data name="Snackbar.OpenLinkFailed.Message" xml:space="preserve">
+ <value>Lỗi khi mở đường dẫn, bạn hãy kiểm tra log.</value>
+ </data>
+ <data name="Snackbar.OpenFailed.Message" xml:space="preserve">
+ <value>Lỗi khi mở thư mục hoặc tệp, hãy thử kiểm tra log.</value>
+ </data>
+ <data name="Snackbar.OpenFailed.Title" xml:space="preserve">
+ <value>Không thể mở thư mục hoặc tệp</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/optimizerDuck/Services/Managers/ConfigManager.cs b/optimizerDuck/Services/Managers/ConfigManager.cs
index 6388da7..47a718c 100644
--- a/optimizerDuck/Services/Managers/ConfigManager.cs
+++ b/optimizerDuck/Services/Managers/ConfigManager.cs
@@ -39,20 +39,33 @@ public class ConfigManager(IConfiguration configuration, ILogger<ConfigManager>
}
}
- public void Remove(string key)
+ public async Task RemoveAsync(string key)
{
- var parts = key.Split(':');
- var current = _cache;
+ await _lock.WaitAsync();
+ try
+ {
+ var parts = key.Split(':');
+ var current = _cache;
- for (var i = 0; i < parts.Length - 1; i++)
+ for (var i = 0; i < parts.Length - 1; i++)
+ {
+ var next = GetTokenIgnoreCase(current, parts[i]);
+ if (next is not JObject nextObj) return;
+ current = nextObj;
+ }
+
+ RemoveIgnoreCase(current, parts[^1]);
+ await SaveConfigAsync();
+ }
+ finally
{
- var next = GetTokenIgnoreCase(current, parts[i]);
- if (next is not JObject nextObj) return;
- current = nextObj;
+ _lock.Release();
}
+ }
- RemoveIgnoreCase(current, parts[^1]);
- _ = SaveConfigAsync();
+ public void Remove(string key)
+ {
+ _ = RemoveAsync(key);
}
private async Task<JObject> LoadConfigAsync()
@@ -165,4 +178,4 @@ public class ConfigManager(IConfiguration configuration, ILogger<ConfigManager>
File.WriteAllText(configPath, "{}");
}
}
-}
\ No newline at end of file
+}
diff --git a/optimizerDuck/Services/Managers/RevertManager.cs b/optimizerDuck/Services/Managers/RevertManager.cs
index 1e89cfa..eb78271 100644
--- a/optimizerDuck/Services/Managers/RevertManager.cs
+++ b/optimizerDuck/Services/Managers/RevertManager.cs
@@ -127,17 +127,18 @@ public class RevertManager(ILogger<RevertManager> logger)
if (!success) failedSteps++;
}
- var failed = failedSteps == steps.Count;
+ var allFailed = failedSteps == steps.Count;
+ var hasFailures = failedSteps > 0;
- if (!failed)
+ if (!hasFailures)
await RemoveAsync(optimizationId, optimizationKey);
return new RevertResult
{
- Success = !failed,
- Message = failed
+ Success = !hasFailures,
+ Message = allFailed
? string.Format(Translations.Optimization_Revert_Error_Failed, optimizationKey)
- : failedSteps > 0
+ : hasFailures
? string.Format(Translations.Optimization_Revert_Error_FailedWithSteps, optimizationKey,
failedSteps)
: string.Format(Translations.Optimization_Revert_Success, optimizationKey)
@@ -347,4 +348,4 @@ public class RevertManager(ILogger<RevertManager> logger)
}
private sealed record RevertStepEntry(int Index, IRevertStep Step);
-}
\ No newline at end of file
+}
diff --git a/optimizerDuck/Services/OptimizationRegistry.cs b/optimizerDuck/Services/OptimizationRegistry.cs
index a5b3926..6b42b7f 100644
--- a/optimizerDuck/Services/OptimizationRegistry.cs
+++ b/optimizerDuck/Services/OptimizationRegistry.cs
@@ -49,17 +49,18 @@ public class OptimizationRegistry(ILoggerFactory loggerFactory)
return instance;
})
.Where(c => c != null) // skip nulls
- .OrderBy(c => c!.Order)
+ .Cast<IOptimizationCategory>()
+ .OrderBy(c => c.Order)
.ToArray();
_logger.LogInformation("Total {CategoryCount} categories and {OptimizationCount} optimizations found",
- optimizationCategories.Length, optimizationCategories.Sum(c => c!.Optimizations.Count));
+ optimizationCategories.Length, optimizationCategories.Sum(c => c.Optimizations.Count));
await OptimizationService.UpdateOptimizationStateAsync(optimizationCategories.SelectMany(c => c.Optimizations));
foreach (var category in optimizationCategories)
{
- var sorted = category!.Optimizations
+ var sorted = category.Optimizations
.OrderBy(o => o.Risk)
.ThenByDescending(o => o.State.IsApplied ? 1 : 0)
.ToList();
@@ -69,11 +70,11 @@ public class OptimizationRegistry(ILoggerFactory loggerFactory)
category.Optimizations.Add(opt);
}
- OptimizationCategories = optimizationCategories!;
+ OptimizationCategories = optimizationCategories;
}
public IOptimizationCategory GetCategory(Type type)
{
return OptimizationCategories.First(c => c.GetType() == type);
}
-}
\ No newline at end of file
+}
diff --git a/optimizerDuck/Services/OptimizationService.cs b/optimizerDuck/Services/OptimizationService.cs
index 790d274..4a50e3c 100644
--- a/optimizerDuck/Services/OptimizationService.cs
+++ b/optimizerDuck/Services/OptimizationService.cs
@@ -325,6 +325,12 @@ public class OptimizationService(
Total = totalSteps
});
+ if (step.RetryAction == null)
+ {
+ stillFailed.Add(step);
+ continue;
+ }
+
var success = await step.RetryAction();
if (!success)
stillFailed.Add(step);
diff --git a/optimizerDuck/Services/OptimizationServices/RegistryService.cs b/optimizerDuck/Services/OptimizationServices/RegistryService.cs
index ecb72db..2799740 100644
--- a/optimizerDuck/Services/OptimizationServices/RegistryService.cs
+++ b/optimizerDuck/Services/OptimizationServices/RegistryService.cs
@@ -142,6 +142,9 @@ public static class RegistryService
createdSubKeys))
return default;
+ if (subKey is null)
+ return default;
+
try
{
return action(subKey);
@@ -149,7 +152,7 @@ public static class RegistryService
finally
{
if (shouldDispose)
- subKey.Dispose();
+ subKey?.Dispose();
}
}
@@ -166,7 +169,7 @@ public static class RegistryService
var result = ConvertRegistryValue<T>(value);
ServiceTracker.LogInfo("Read registry {Path}:{Name} = {Value}",
- item.Path, item.Name!, result);
+ item.Path, item.Name!, result?.ToString() ?? "<null>");
return result;
}
@@ -176,7 +179,7 @@ public static class RegistryService
item.Path, item.Name!);
ServiceTracker.LogInfo("Read registry {Path}:{Name} = <default> (raw={RawType})",
- item.Path, item.Name!, value?.GetType().FullName);
+ item.Path, item.Name!, value?.GetType().FullName ?? "<null>");
return default;
}
@@ -606,4 +609,4 @@ public static class RegistryService
}
#endregion Helpers
-}
\ No newline at end of file
+}
diff --git a/optimizerDuck/Services/OptimizationServices/ServiceProcessService.cs b/optimizerDuck/Services/OptimizationServices/ServiceProcessService.cs
index 28ae9c9..8c3b43b 100644
--- a/optimizerDuck/Services/OptimizationServices/ServiceProcessService.cs
+++ b/optimizerDuck/Services/OptimizationServices/ServiceProcessService.cs
@@ -94,6 +94,13 @@ public static class ServiceProcessService
if (resultCode == 0)
{
+ if (originalStartupType.HasValue && originalStartupType.Value != item.StartupType)
+ RevertManager.Record(new ServiceRevertStep
+ {
+ ServiceName = item.Name,
+ OriginalStartupType = originalStartupType.Value
+ });
+
// Handle delayed auto start registry key
var registrySuccess = item.StartupType == ServiceStartupType.AutomaticDelayedStart
? RegistryService.Write(new RegistryItem(
@@ -104,13 +111,6 @@ public static class ServiceProcessService
$@"HKLM\SYSTEM\CurrentControlSet\Services\{item.Name}",
"DelayedAutoStart"));
- if (registrySuccess && originalStartupType.HasValue)
- RevertManager.Record(new ServiceRevertStep
- {
- ServiceName = item.Name,
- OriginalStartupType = originalStartupType.Value
- });
-
sw.Stop();
ServiceTracker.LogInfo(
@@ -171,4 +171,4 @@ public static class ServiceProcessService
foreach (var item in items)
ChangeServiceStartupType(item);
}
-}
\ No newline at end of file
+}
diff --git a/optimizerDuck/Services/OptimizationServices/ShellService.cs b/optimizerDuck/Services/OptimizationServices/ShellService.cs
index 61dff7d..803a1a4 100644
--- a/optimizerDuck/Services/OptimizationServices/ShellService.cs
+++ b/optimizerDuck/Services/OptimizationServices/ShellService.cs
@@ -81,95 +81,118 @@ public static class ShellService
CreateNoWindow = true
};
- using var process = new Process();
- process.StartInfo = psi;
+ try
+ {
+ using var process = new Process();
+ process.StartInfo = psi;
- var stdoutBuilder = new StringBuilder();
- var stderrBuilder = new StringBuilder();
+ var stdoutBuilder = new StringBuilder();
+ var stderrBuilder = new StringBuilder();
- process.OutputDataReceived += (_, e) =>
- {
- if (e.Data == null) return;
- stdoutBuilder.AppendLine(e.Data);
- };
+ process.OutputDataReceived += (_, e) =>
+ {
+ if (e.Data == null) return;
+ stdoutBuilder.AppendLine(e.Data);
+ };
- process.ErrorDataReceived += (_, e) =>
- {
- if (e.Data == null) return;
- stderrBuilder.AppendLine(e.Data);
- };
- var sw = Stopwatch.StartNew();
+ process.ErrorDataReceived += (_, e) =>
+ {
+ if (e.Data == null) return;
+ stderrBuilder.AppendLine(e.Data);
+ };
+ var sw = Stopwatch.StartNew();
- process.Start();
- process.BeginOutputReadLine();
- process.BeginErrorReadLine();
+ process.Start();
+ process.BeginOutputReadLine();
+ process.BeginErrorReadLine();
- var exited =
- process.WaitForExit(_options?.CurrentValue.Optimize.ShellTimeoutMs ?? 120000); // fallback to 2 minutes
- var timedOut = !exited;
+ var exited =
+ process.WaitForExit(_options?.CurrentValue.Optimize.ShellTimeoutMs ?? 120000); // fallback to 2 minutes
+ var timedOut = !exited;
- if (timedOut)
- {
- try
- {
- process.Kill(true);
- }
- catch
+ if (timedOut)
{
- ServiceTracker.LogError(null, "Failed to kill process for timeout");
+ try
+ {
+ process.Kill(true);
+ }
+ catch
+ {
+ ServiceTracker.LogError(null, "Failed to kill process for timeout");
+ }
+
+ process.WaitForExit(2000); // grace drain
}
- process.WaitForExit(2000); // grace drain
+ sw.Stop();
+ var duration = sw.Elapsed;
+ var stdout = stdoutBuilder.ToString().Trim();
+ var stderr = stderrBuilder.ToString().ParseCliXml().Trim();
+
+ var result = new ShellResult(
+ fullCommandForUser,
+ stdout,
+ stderr,
+ timedOut ? -1 : process.ExitCode, // use -1 error code for timed out
+ duration);
+
+ var success = policy.IsSuccess(result);
+
+ ServiceTracker.Track(serviceName, success);
+
+ ServiceTracker.LogInfo("[{Service}][{Status}][EC={ExitCode}][D={Duration}] {Command}",
+ serviceName,
+ timedOut ? "TIMEOUT" : success ? "OK" : "FAIL",
+ result.ExitCode,
+ duration.FormatTime(),
+ fullCommandForUser);
+
+ ServiceTracker.LogTrace("[{Service}][STDOUT] {Stdout}",
+ serviceName,
+ string.IsNullOrWhiteSpace(stdout) ? "N/A" : stdout
+ );
+ ServiceTracker.LogTrace("[{Service}][STDERR] {Stderr}",
+ serviceName,
+ string.IsNullOrWhiteSpace(stderr) ? "N/A" : stderr
+ );
+
+ var error = success ? null : policy.ErrorFactory(result);
+
+ ServiceTracker.TrackStep(
+ "Shell",
+ fullCommandForUser,
+ success,
+ error,
+ () => Task.Run(() =>
+ policy.IsSuccess(Run(fileName, arguments, command, serviceName, revertStep, policy))
+ )
+ );
+
+ if (success && revertStep is not null)
+ RevertManager.Record(revertStep);
+
+ return result;
+ }
+ catch (Exception ex)
+ {
+ var result = new ShellResult(
+ fullCommandForUser,
+ string.Empty,
+ ex.Message,
+ -2,
+ TimeSpan.Zero);
+
+ ServiceTracker.Track(serviceName, false);
+ ServiceTracker.LogError(ex, "[{Service}][FAIL][EXCEPTION] {Command}", serviceName, fullCommandForUser);
+ ServiceTracker.TrackStep(
+ "Shell",
+ fullCommandForUser,
+ false,
+ ex.Message,
+ () => Task.FromResult(false));
+
+ return result;
}
-
- sw.Stop();
- var duration = sw.Elapsed;
- var stdout = stdoutBuilder.ToString().Trim();
- var stderr = stderrBuilder.ToString().ParseCliXml().Trim();
-
- var result = new ShellResult(
- fullCommandForUser,
- stdout,
- stderr,
- timedOut ? -1 : process.ExitCode, // use -1 error code for timed out
- duration);
-
- var success = policy.IsSuccess(result);
-
- ServiceTracker.Track(serviceName, success);
-
- ServiceTracker.LogInfo("[{Service}][{Status}][EC={ExitCode}][D={Duration}] {Command}",
- serviceName,
- timedOut ? "TIMEOUT" : success ? "OK" : "FAIL",
- process.ExitCode,
- duration.FormatTime(),
- fullCommandForUser);
-
- ServiceTracker.LogTrace("[{Service}][STDOUT] {Stdout}",
- serviceName,
- string.IsNullOrWhiteSpace(stdout) ? "N/A" : stdout
- );
- ServiceTracker.LogTrace("[{Service}][STDERR] {Stderr}",
- serviceName,
- string.IsNullOrWhiteSpace(stderr) ? "N/A" : stderr
- );
-
- var error = success ? null : policy.ErrorFactory(result);
-
- ServiceTracker.TrackStep(
- "Shell",
- fullCommandForUser,
- success,
- error,
- () => Task.Run(() =>
- policy.IsSuccess(Run(fileName, arguments, command, serviceName, revertStep, policy))
- )
- );
-
- if (success && revertStep is not null)
- RevertManager.Record(revertStep);
-
- return result;
}
#region Command Prompt methods
@@ -231,4 +254,4 @@ public static class ShellService
}
#endregion PowerShell methods
-}
\ No newline at end of file
+}
diff --git a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs
index b8139cd..8561c4e 100644
--- a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs
@@ -2,13 +2,17 @@ using System.Diagnostics;
using System.IO;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
+using Microsoft.Extensions.Logging;
using optimizerDuck.Common.Helpers;
using optimizerDuck.Core.Interfaces;
+using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Managers;
+using Wpf.Ui;
+using Wpf.Ui.Controls;
namespace optimizerDuck.UI.ViewModels.Dialogs;
-public partial class OptimizationDetailsViewModel(IOptimization optimization) : ObservableObject
+public partial class OptimizationDetailsViewModel(IOptimization optimization, ISnackbarService snackbarService, ILogger logger) : ObservableObject
{
public IOptimization Optimization { get; } = optimization;
@@ -18,12 +22,26 @@ public partial class OptimizationDetailsViewModel(IOptimization optimization) :
var revertData = await RevertManager.IsAppliedAsync(Optimization.Id);
if (!revertData) return;
- var filePath = Path.Combine(Shared.RevertDirectory, Optimization.Id + ".json");
- Process.Start(new ProcessStartInfo
+ try
{
- FileName = "explorer.exe",
- Arguments = $"/select,\"{filePath}\"",
- UseShellExecute = true
- });
+ var filePath = Path.Combine(Shared.RevertDirectory, Optimization.Id + ".json");
+ Process.Start(new ProcessStartInfo
+ {
+ FileName = "explorer.exe",
+ Arguments = $"/select,\"{filePath}\"",
+ UseShellExecute = true
+ });
+ }
+ catch (Exception ex)
+ {
+ snackbarService.Show(
+ Translations.Snackbar_OpenFailed_Title,
+ Translations.Snackbar_OpenFailed_Message,
+ ControlAppearance.Danger,
+ new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },
+ TimeSpan.FromSeconds(5)
+ );
+ logger.LogError(ex, "Failed to open revert file for optimization {Id}", Optimization.Id);
+ }
}
}
\ No newline at end of file
diff --git a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
index 935314e..ccb8387 100644
--- a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
@@ -8,7 +8,6 @@ using optimizerDuck.Core.Interfaces;
using optimizerDuck.Core.Models.Optimization;
using optimizerDuck.Core.Models.UI;
using optimizerDuck.Resources.Languages;
-using optimizerDuck.Resources.Languages;
using optimizerDuck.Services;
using optimizerDuck.UI.ViewModels.Dialogs;
using optimizerDuck.UI.Views.Dialogs;
@@ -164,6 +163,7 @@ public partial class OptimizationCategoryViewModel : ViewModel
var success = await _optimizationService.CreateRestorePointAsync();
if (!success)
+ {
_snackbarService.Show(
Translations.RestorePoint_Snackbar_Error_Title,
Translations.RestorePoint_Snackbar_Error_Message,
@@ -171,7 +171,9 @@ public partial class OptimizationCategoryViewModel : ViewModel
new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },
TimeSpan.FromSeconds(5)
);
+ }
else
+ {
_snackbarService.Show(
Translations.RestorePoint_Snackbar_Success_Title,
string.Format(Translations.RestorePoint_Snackbar_Success_Message, Shared.RestorePointName),
@@ -179,6 +181,7 @@ public partial class OptimizationCategoryViewModel : ViewModel
new SymbolIcon { Symbol = SymbolRegular.CheckmarkCircle24, Filled = true },
TimeSpan.FromSeconds(5)
);
+ }
}
private static StackPanel BuildDialogTitle(IOptimization optimization)
@@ -218,6 +221,7 @@ public partial class OptimizationCategoryViewModel : ViewModel
{
await HandleRestorePointAsync();
_isApplied = true;
+
}
// Keep a stable reference to the previous state in case we need to roll back UI changes.
@@ -309,7 +313,7 @@ public partial class OptimizationCategoryViewModel : ViewModel
optimization,
progress => _optimizationService.RevertAsync(optimization, progress));
- // Revert removes data regardless of failures, so state should be refreshed immediately.
+ // Refresh state after revert attempt. Failed steps can still be retried in the current session.
await OptimizationService.UpdateOptimizationStateAsync(optimization);
var retryOutcome = await HandleFailedStepsAsync(
@@ -332,7 +336,7 @@ public partial class OptimizationCategoryViewModel : ViewModel
if (partial)
{
_snackbarService.Show(
- Translations.Optimization_Apply_Snackbar_Error_Title,
+ Translations.Optimization_Revert_Snackbar_Error_Title,
revertResult.Message,
ControlAppearance.Caution,
new SymbolIcon { Symbol = SymbolRegular.Warning24, Filled = true },
@@ -368,7 +372,7 @@ public partial class OptimizationCategoryViewModel : ViewModel
[RelayCommand]
private async Task ShowDetailsAsync(IOptimization optimization)
{
- var dialogViewModel = new OptimizationDetailsViewModel(optimization);
+ var dialogViewModel = new OptimizationDetailsViewModel(optimization, _snackbarService, _logger);
var dialogContent = new OptimizationDetailsDialog { DataContext = dialogViewModel };
var dialog = new ContentDialog
{
@@ -380,4 +384,4 @@ public partial class OptimizationCategoryViewModel : ViewModel
}
#endregion Commands
-}
\ No newline at end of file
+}
diff --git a/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs
index e33208c..b49c7c7 100644
--- a/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs
@@ -5,8 +5,11 @@ using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
using optimizerDuck.Common.Helpers;
+using optimizerDuck.Resources.Languages;
using optimizerDuck.Services;
+using Wpf.Ui;
using Wpf.Ui.Appearance;
+using Wpf.Ui.Controls;
namespace optimizerDuck.UI.ViewModels.Pages;
@@ -14,6 +17,7 @@ public partial class DashboardViewModel : ViewModel
{
private readonly ILogger<DashboardViewModel> _logger;
private readonly SystemInfoService _systemInfoService;
+ private readonly ISnackbarService _snackbarService;
private readonly DispatcherTimer _updateTimer;
[ObservableProperty] private ApplicationTheme _currentApplicationTheme = ApplicationTheme.Unknown;
@@ -23,9 +27,10 @@ public partial class DashboardViewModel : ViewModel
[ObservableProperty] private RamInfo _runtimeRam = RamInfo.Unknown;
[ObservableProperty] private SystemSnapshot _systemInfo = SystemSnapshot.Unknown;
- public DashboardViewModel(SystemInfoService systemInfoService, ILogger<DashboardViewModel> logger)
+ public DashboardViewModel(SystemInfoService systemInfoService,ISnackbarService snackbarService, ILogger<DashboardViewModel> logger)
{
_systemInfoService = systemInfoService;
+ _snackbarService = snackbarService;
_logger = logger;
_updateTimer = new DispatcherTimer
@@ -112,6 +117,13 @@ public partial class DashboardViewModel : ViewModel
}
catch (Exception ex)
{
+ _snackbarService.Show(
+ Translations.Snackbar_OpenFailed_Title,
+ Translations.Snackbar_OpenFailed_Message,
+ ControlAppearance.Danger,
+ new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },
+ TimeSpan.FromSeconds(5)
+ );
_logger.LogError(ex, "Failed to open {Action} link", action);
}
}
@@ -119,31 +131,45 @@ public partial class DashboardViewModel : ViewModel
[RelayCommand]
private void Run(string action)
{
- switch (action)
+ try
+ {
+ switch (action)
+ {
+ case "Settings":
+ Process.Start(new ProcessStartInfo
+ {
+ FileName = "ms-settings:",
+ UseShellExecute = true
+ });
+ break;
+
+ case "TaskManager":
+ Process.Start(new ProcessStartInfo
+ {
+ FileName = "taskmgr",
+ UseShellExecute = true
+ });
+ break;
+
+ case "ControlPanel":
+ Process.Start(new ProcessStartInfo
+ {
+ FileName = "control",
+ UseShellExecute = true
+ });
+ break;
+ }
+ }
+ catch (Exception ex)
{
- case "Settings":
- Process.Start(new ProcessStartInfo
- {
- FileName = "ms-settings:",
- UseShellExecute = true
- });
- break;
-
- case "TaskManager":
- Process.Start(new ProcessStartInfo
- {
- FileName = "taskmgr",
- UseShellExecute = true
- });
- break;
-
- case "ControlPanel":
- Process.Start(new ProcessStartInfo
- {
- FileName = "control",
- UseShellExecute = true
- });
- break;
+ _snackbarService.Show(
+ Translations.Snackbar_OpenFailed_Title,
+ Translations.Snackbar_OpenFailed_Message,
+ ControlAppearance.Danger,
+ new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },
+ TimeSpan.FromSeconds(5)
+ );
+ _logger.LogError(ex, "Failed to run action {Action}", action);
}
}
@@ -185,4 +211,4 @@ public partial class DashboardViewModel : ViewModel
}
#endregion
-}
\ No newline at end of file
+}
diff --git a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs
index b0ca4ba..9754df9 100644
--- a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs
@@ -4,6 +4,7 @@ using System.Globalization;
using System.Windows.Media;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
+using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using optimizerDuck.Common.Helpers;
using optimizerDuck.Core.Models.Config;
@@ -22,7 +23,9 @@ public partial class SettingsViewModel(
ConfigManager configManager,
IOptionsMonitor<AppSettings> appOptionsMonitor,
OptimizationRegistry optimizationRegistry,
- IContentDialogService contentDialogService) : ViewModel
+ IContentDialogService contentDialogService,
+ ISnackbarService snackbarService,
+ ILogger<SettingsViewModel> logger) : ViewModel
{
[ObservableProperty] private ApplicationTheme _currentApplicationTheme = ApplicationTheme.Unknown;
private bool _isInitialized;
@@ -94,11 +97,26 @@ public partial class SettingsViewModel(
[RelayCommand]
private void OpenRootDir()
{
- Process.Start(new ProcessStartInfo
+ try
{
- FileName = Shared.RootDirectory,
- UseShellExecute = true
- });
+ logger.LogInformation("Opening root directory: {Path}", Shared.RootDirectory);
+ Process.Start(new ProcessStartInfo
+ {
+ FileName = Shared.RootDirectory,
+ UseShellExecute = true
+ });
+ }
+ catch (Exception ex)
+ {
+ snackbarService.Show(
+ Translations.Snackbar_OpenFailed_Title,
+ Translations.Snackbar_OpenFailed_Message,
+ ControlAppearance.Danger,
+ new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },
+ TimeSpan.FromSeconds(5)
+ );
+ logger.LogError(ex, "Failed to open root directory: {Path}", Shared.RootDirectory);
+ }
}
[RelayCommand]
@@ -121,15 +139,30 @@ public partial class SettingsViewModel(
optimizationRegistry.OptimizationCategories.SelectMany(c => c.Optimizations));
}
}
-
+
[RelayCommand]
private void OpenAcknowledgements()
{
- Process.Start(new ProcessStartInfo
+ try
{
- FileName = Shared.AcknowledgementsURL,
- UseShellExecute = true
- });
+ logger.LogInformation("Opening acknowledgements page: {Url}", Shared.AcknowledgementsURL);
+ Process.Start(new ProcessStartInfo
+ {
+ FileName = Shared.AcknowledgementsURL,
+ UseShellExecute = true
+ });
+ }
+ catch (Exception ex)
+ {
+ snackbarService.Show(
+ Translations.Snackbar_OpenLinkFailed_Title,
+ Translations.Snackbar_OpenLinkFailed_Message,
+ ControlAppearance.Danger,
+ new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },
+ TimeSpan.FromSeconds(5)
+ );
+ logger.LogError(ex, "Failed to open acknowledgements page");
+ }
}
#endregion Commands
diff --git a/optimizerDuck/UI/Views/Pages/SettingsPage.xaml b/optimizerDuck/UI/Views/Pages/SettingsPage.xaml
index 3b25607..56d087f 100644
--- a/optimizerDuck/UI/Views/Pages/SettingsPage.xaml
+++ b/optimizerDuck/UI/Views/Pages/SettingsPage.xaml
@@ -216,7 +216,7 @@
</ui:CardControl.Header>
</ui:CardControl>
- <ui:CardAction Command="{Binding ViewModel.AcknowledgementsCommand}" VerticalAlignment="Stretch">
+ <ui:CardAction Command="{Binding ViewModel.OpenAcknowledgementsCommand}" VerticalAlignment="Stretch">
<ui:CardAction.Icon>
<ui:SymbolIcon Symbol="DocumentHeart24" />
</ui:CardAction.Icon>