Skip to content

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

refactor: lean power core with record results and System.Primitives layout

fatDuck4a35c82ef070
diff --git a/optimizerDuck.Test/Core/DependencyInjectionTests.cs b/optimizerDuck.Test/Core/DependencyInjectionTests.cs
index e1ae755..1f3be29 100644
--- a/optimizerDuck.Test/Core/DependencyInjectionTests.cs
+++ b/optimizerDuck.Test/Core/DependencyInjectionTests.cs
@@ -4,8 +4,8 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.Revert;
+using optimizerDuck.Services.System.Primitives;
/// <summary>
/// Guards the composition root: the application graph must build and validate the same
diff --git a/optimizerDuck.Test/Domain/Customize/BaseCustomizeSettingTests.cs b/optimizerDuck.Test/Domain/Customize/BaseCustomizeSettingTests.cs
index 014c34a..0275a77 100644
--- a/optimizerDuck.Test/Domain/Customize/BaseCustomizeSettingTests.cs
+++ b/optimizerDuck.Test/Domain/Customize/BaseCustomizeSettingTests.cs
@@ -9,7 +9,7 @@ using optimizerDuck.Domain.Customize.Models;
using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using Xunit;
namespace optimizerDuck.Test.Domain.Customize;
diff --git a/optimizerDuck.Test/Domain/Optimizations/PowerManagementTests.cs b/optimizerDuck.Test/Domain/Optimizations/PowerManagementTests.cs
index 96ef48d..d2909e7 100644
--- a/optimizerDuck.Test/Domain/Optimizations/PowerManagementTests.cs
+++ b/optimizerDuck.Test/Domain/Optimizations/PowerManagementTests.cs
@@ -1,7 +1,7 @@
using Microsoft.Extensions.Logging.Abstractions;
using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Test.Domain.Optimizations;
diff --git a/optimizerDuck.Test/Services/ApplyRevertComprehensiveTests.cs b/optimizerDuck.Test/Services/ApplyRevertComprehensiveTests.cs
index c3ca741..965b78a 100644
--- a/optimizerDuck.Test/Services/ApplyRevertComprehensiveTests.cs
+++ b/optimizerDuck.Test/Services/ApplyRevertComprehensiveTests.cs
@@ -8,9 +8,9 @@ using optimizerDuck.Domain.Revert;
using optimizerDuck.Domain.Revert.Steps;
using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Optimization;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.Revert;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.Test.TestDoubles;
using Wpf.Ui;
diff --git a/optimizerDuck.Test/Services/Configuration/LanguageManagerTests.cs b/optimizerDuck.Test/Services/Configuration/LanguageManagerTests.cs
index 74e3d0a..9c41006 100644
--- a/optimizerDuck.Test/Services/Configuration/LanguageManagerTests.cs
+++ b/optimizerDuck.Test/Services/Configuration/LanguageManagerTests.cs
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Globalization;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Test.Services.Configuration;
diff --git a/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs b/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs
index 4d4ef62..a7cc74b 100644
--- a/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs
+++ b/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs
@@ -9,9 +9,9 @@ using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Revert;
using optimizerDuck.Domain.Revert.Steps;
using optimizerDuck.Domain.UI;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.Revert;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.Test.TestDoubles;
namespace optimizerDuck.Test.Services.Managers;
diff --git a/optimizerDuck.Test/Services/OptimizationExecutionContextTests.cs b/optimizerDuck.Test/Services/OptimizationExecutionContextTests.cs
index 7cd431a..b6e8a04 100644
--- a/optimizerDuck.Test/Services/OptimizationExecutionContextTests.cs
+++ b/optimizerDuck.Test/Services/OptimizationExecutionContextTests.cs
@@ -2,7 +2,7 @@ using Microsoft.Extensions.Logging;
using Newtonsoft.Json.Linq;
using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Execution;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Test.Services;
diff --git a/optimizerDuck.Test/Services/OptimizationServiceIntegrationTests.cs b/optimizerDuck.Test/Services/OptimizationServiceIntegrationTests.cs
index 4d60498..b732908 100644
--- a/optimizerDuck.Test/Services/OptimizationServiceIntegrationTests.cs
+++ b/optimizerDuck.Test/Services/OptimizationServiceIntegrationTests.cs
@@ -13,9 +13,9 @@ using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Revert;
using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Optimization;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.Revert;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.Test.TestDoubles;
using Xunit;
diff --git a/optimizerDuck.Test/Services/OptimizationServiceTests.cs b/optimizerDuck.Test/Services/OptimizationServiceTests.cs
index 641a728..bfab7f8 100644
--- a/optimizerDuck.Test/Services/OptimizationServiceTests.cs
+++ b/optimizerDuck.Test/Services/OptimizationServiceTests.cs
@@ -8,9 +8,9 @@ using optimizerDuck.Domain.Revert;
using optimizerDuck.Domain.Revert.Steps;
using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Optimization;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.Revert;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.Test.TestDoubles;
using Wpf.Ui;
diff --git a/optimizerDuck.Test/Services/OptimizationServices/RegistryServiceTests.cs b/optimizerDuck.Test/Services/OptimizationServices/RegistryServiceTests.cs
index 11fb05f..b8e81b2 100644
--- a/optimizerDuck.Test/Services/OptimizationServices/RegistryServiceTests.cs
+++ b/optimizerDuck.Test/Services/OptimizationServices/RegistryServiceTests.cs
@@ -5,7 +5,7 @@ using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Win32;
using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.Test.TestDoubles;
using Xunit;
diff --git a/optimizerDuck.Test/Services/OptimizationServices/ScheduledTaskServiceTests.cs b/optimizerDuck.Test/Services/OptimizationServices/ScheduledTaskServiceTests.cs
index 9011f42..e6b857f 100644
--- a/optimizerDuck.Test/Services/OptimizationServices/ScheduledTaskServiceTests.cs
+++ b/optimizerDuck.Test/Services/OptimizationServices/ScheduledTaskServiceTests.cs
@@ -1,6 +1,6 @@
using Microsoft.Extensions.Logging.Abstractions;
using optimizerDuck.Domain.Optimizations.Models.ScheduledTask;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Test.Services.OptimizationServices;
diff --git a/optimizerDuck.Test/Services/OptimizationServices/ServiceProcessServiceTests.cs b/optimizerDuck.Test/Services/OptimizationServices/ServiceProcessServiceTests.cs
index 9569f5b..0e62bd6 100644
--- a/optimizerDuck.Test/Services/OptimizationServices/ServiceProcessServiceTests.cs
+++ b/optimizerDuck.Test/Services/OptimizationServices/ServiceProcessServiceTests.cs
@@ -1,7 +1,7 @@
using Microsoft.Extensions.Logging.Abstractions;
using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Test.Services.OptimizationServices;
diff --git a/optimizerDuck.Test/Services/OptimizationServices/ShellPolicyTests.cs b/optimizerDuck.Test/Services/OptimizationServices/ShellPolicyTests.cs
index fc03034..a4e8778 100644
--- a/optimizerDuck.Test/Services/OptimizationServices/ShellPolicyTests.cs
+++ b/optimizerDuck.Test/Services/OptimizationServices/ShellPolicyTests.cs
@@ -1,5 +1,5 @@
using optimizerDuck.Domain.Optimizations.Models.Services;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Test.Services.OptimizationServices;
diff --git a/optimizerDuck.Test/Services/OptimizationServices/ShellServiceTests.cs b/optimizerDuck.Test/Services/OptimizationServices/ShellServiceTests.cs
index 4de3d9a..2932ec5 100644
--- a/optimizerDuck.Test/Services/OptimizationServices/ShellServiceTests.cs
+++ b/optimizerDuck.Test/Services/OptimizationServices/ShellServiceTests.cs
@@ -1,7 +1,7 @@
using Microsoft.Extensions.Logging.Abstractions;
using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Test.Services.OptimizationServices;
diff --git a/optimizerDuck.Test/Services/PowerPlanChangesTests.cs b/optimizerDuck.Test/Services/PowerPlanChangesTests.cs
new file mode 100644
index 0000000..c373646
--- /dev/null
+++ b/optimizerDuck.Test/Services/PowerPlanChangesTests.cs
@@ -0,0 +1,359 @@
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using optimizerDuck.Domain.Execution;
+using optimizerDuck.Domain.Optimizations.Models.Power;
+using optimizerDuck.Domain.Revert.Steps;
+using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
+
+namespace optimizerDuck.Test.Services;
+
+/// <summary>
+/// Unit tests for the lean power core's edge recording and atomic install.
+/// Hand-subclassed doubles (no mocking libraries); no native calls.
+/// </summary>
+public class PowerPlanChangesTests
+{
+ private sealed class StubPowerPlanService : PowerPlanService
+ {
+ public StubPowerPlanService()
+ : base(NullLogger<PowerPlanService>.Instance) { }
+
+ public Guid? ActiveId { get; set; } = Guid.NewGuid();
+
+ public int ActivateCalls { get; private set; }
+
+ public Func<Guid, ActivationResult>? ActivateFunc { get; set; }
+
+ public Func<string, Guid, Task<SchemeRefResult>>? ImportFunc { get; set; }
+
+ public Func<string, Guid, Task<InstallResult>>? InstallFunc { get; set; }
+
+ public Func<Guid, Guid, Guid, uint?, uint?, SettingWriteResult>? WriteFunc { get; set; }
+
+ public override Guid? GetActiveSchemeId() => ActiveId;
+
+ public override ActivationResult SetActiveScheme(Guid schemeId, ILogger? logger = null)
+ {
+ ActivateCalls++;
+ return ActivateFunc?.Invoke(schemeId)
+ ?? new ActivationResult(OpResult.Fail("no stub", "no stub"), null);
+ }
+
+ public override Task<SchemeRefResult> ImportSchemeAsync(
+ string filePath,
+ Guid destinationId,
+ ILogger? logger = null,
+ CancellationToken ct = default
+ ) =>
+ ImportFunc is null
+ ? Task.FromResult(new SchemeRefResult(OpResult.Fail("no stub", "no stub"), null))
+ : ImportFunc(filePath, destinationId);
+
+ public override Task<InstallResult> InstallSchemeAsync(
+ string filePath,
+ Guid destinationId,
+ ILogger? logger = null,
+ CancellationToken ct = default
+ ) =>
+ InstallFunc is null
+ ? base.InstallSchemeAsync(filePath, destinationId, logger, ct)
+ : InstallFunc(filePath, destinationId);
+
+ public override SettingWriteResult SetSetting(
+ Guid schemeId,
+ Guid subgroupId,
+ Guid settingId,
+ uint? acValue,
+ uint? dcValue,
+ ILogger? logger = null
+ ) =>
+ WriteFunc?.Invoke(schemeId, subgroupId, settingId, acValue, dcValue)
+ ?? new SettingWriteResult(OpResult.Fail("no stub", "no stub"), null, null);
+ }
+
+ private static OpCall NewCall() => new() { Logger = NullLogger.Instance };
+
+ [Fact]
+ public void Activate_Success_RecordsStepWithPreviousAndInstalled()
+ {
+ var previous = Guid.NewGuid();
+ var target = Guid.NewGuid();
+ var installed = Guid.NewGuid();
+ var plans = new StubPowerPlanService
+ {
+ ActivateFunc = _ => new ActivationResult(OpResult.Success(), previous),
+ };
+ var call = NewCall();
+
+ var result = PowerPlanChanges.Activate(call, plans, target, installed);
+
+ Assert.True(result.Ok);
+ var change = Assert.Single(call.Changes.Changes);
+ Assert.True(change.Ok);
+ var step = Assert.IsType<PowerPlanRevertStep>(change.Revert);
+ Assert.Equal(previous, step.PreviousSchemeId);
+ Assert.Equal(installed, step.InstalledSchemeId);
+ }
+
+ [Fact]
+ public async Task Activate_Failure_RecordsErrorWithRetry()
+ {
+ var plans = new StubPowerPlanService
+ {
+ ActivateFunc = _ => new ActivationResult(
+ OpResult.Fail("PowerSetActiveScheme failed.", "detail"),
+ null
+ ),
+ };
+ var call = NewCall();
+
+ var result = PowerPlanChanges.Activate(call, plans, Guid.NewGuid());
+
+ Assert.False(result.Ok);
+ var change = Assert.Single(call.Changes.FailedSteps);
+ Assert.NotNull(change.Retry);
+ var retryCall = NewCall();
+ var retryResult = await change.Retry(retryCall);
+ Assert.False(retryResult.Ok);
+ Assert.Single(retryCall.Changes.FailedSteps);
+ }
+
+ [Fact]
+ public void Activate_AlreadyActive_RecordsSkippedWithoutStep()
+ {
+ var active = Guid.NewGuid();
+ var plans = new StubPowerPlanService
+ {
+ ActivateFunc = _ => new ActivationResult(OpResult.Success(), active),
+ };
+ var call = NewCall();
+
+ var result = PowerPlanChanges.Activate(call, plans, active);
+
+ Assert.True(result.Ok);
+ var change = Assert.Single(call.Changes.SuccessfulSteps);
+ Assert.Null(change.Revert);
+ }
+
+ [Fact]
+ public void WriteSetting_Success_RecordsPreviousValues()
+ {
+ var plans = new StubPowerPlanService
+ {
+ WriteFunc = (_, _, _, _, _) => new SettingWriteResult(OpResult.Success(), 10u, 20u),
+ };
+ var call = NewCall();
+ var scheme = Guid.NewGuid();
+ var group = Guid.NewGuid();
+ var setting = Guid.NewGuid();
+
+ var result = PowerPlanChanges.WriteSetting(call, plans, scheme, group, setting, 1u, 2u);
+
+ Assert.True(result.Ok);
+ var step = Assert.IsType<PowerSettingRevertStep>(
+ Assert.Single(call.Changes.SuccessfulSteps).Revert
+ );
+ Assert.Equal(10u, step.PreviousAcValue);
+ Assert.Equal(20u, step.PreviousDcValue);
+ }
+
+ [Fact]
+ public void WriteSetting_Failure_RecordsErrorWithRetry()
+ {
+ var plans = new StubPowerPlanService
+ {
+ WriteFunc = (_, _, _, _, _) =>
+ new SettingWriteResult(OpResult.Fail("nope", "detail"), null, null),
+ };
+ var call = NewCall();
+
+ var result = PowerPlanChanges.WriteSetting(
+ call,
+ plans,
+ Guid.NewGuid(),
+ Guid.NewGuid(),
+ Guid.NewGuid(),
+ 1u,
+ null
+ );
+
+ Assert.False(result.Ok);
+ Assert.NotNull(Assert.Single(call.Changes.FailedSteps).Retry);
+ }
+
+ [Fact]
+ public async Task InstallAsync_Success_RecordsSingleStep()
+ {
+ var installed = Guid.NewGuid();
+ var previous = Guid.NewGuid();
+ var plans = new StubPowerPlanService
+ {
+ InstallFunc = (_, _) =>
+ Task.FromResult(new InstallResult(OpResult.Success(), installed, previous)),
+ };
+ var call = NewCall();
+
+ var install = await PowerPlanChanges.InstallAsync(
+ call,
+ plans,
+ "x.pow",
+ Guid.NewGuid(),
+ TestContext.Current.CancellationToken
+ );
+ var result = install.Result;
+ var installedId = install.InstalledId;
+ var previousId = install.PreviousId;
+
+ Assert.True(result.Ok);
+ Assert.Equal(installed, installedId);
+ Assert.Equal(previous, previousId);
+ var step = Assert.IsType<PowerPlanRevertStep>(
+ Assert.Single(call.Changes.SuccessfulSteps).Revert
+ );
+ Assert.Equal(previous, step.PreviousSchemeId);
+ Assert.Equal(installed, step.InstalledSchemeId);
+ }
+
+ [Fact]
+ public async Task InstallAsync_ImportFailure_KeepsPreviousForErrorMapping()
+ {
+ var previous = Guid.NewGuid();
+ var plans = new StubPowerPlanService
+ {
+ InstallFunc = (_, _) =>
+ Task.FromResult(
+ new InstallResult(
+ OpResult.Fail("PowerImportPowerScheme failed.", "detail"),
+ null,
+ previous
+ )
+ ),
+ };
+ var call = NewCall();
+
+ var install = await PowerPlanChanges.InstallAsync(
+ call,
+ plans,
+ "missing.pow",
+ Guid.NewGuid(),
+ TestContext.Current.CancellationToken
+ );
+ var result = install.Result;
+ var installedId = install.InstalledId;
+ var previousId = install.PreviousId;
+
+ Assert.False(result.Ok);
+ Assert.Null(installedId);
+ Assert.Equal(previous, previousId);
+ Assert.Single(call.Changes.FailedSteps);
+ }
+
+ [Fact]
+ public async Task InstallScheme_ImportFails_DoesNotActivate()
+ {
+ var previous = Guid.NewGuid();
+ var plans = new StubPowerPlanService
+ {
+ ActiveId = previous,
+ ImportFunc = (_, _) =>
+ Task.FromResult(
+ new SchemeRefResult(
+ OpResult.Fail("PowerImportPowerScheme failed.", "detail"),
+ null
+ )
+ ),
+ ActivateFunc = _ => new ActivationResult(OpResult.Success(), previous),
+ };
+
+ var install = await plans.InstallSchemeAsync(
+ "missing.pow",
+ Guid.NewGuid(),
+ ct: TestContext.Current.CancellationToken
+ );
+ var result = install.Result;
+ var installedId = install.InstalledId;
+ var previousId = install.PreviousId;
+
+ Assert.False(result.Ok);
+ Assert.Null(installedId);
+ Assert.Equal(previous, previousId);
+ Assert.Equal(0, plans.ActivateCalls);
+ }
+
+ [Fact]
+ public async Task InstallScheme_ActivateFails_ReturnsInstalledAndPrevious()
+ {
+ var previous = Guid.NewGuid();
+ var installed = Guid.NewGuid();
+ var plans = new StubPowerPlanService
+ {
+ ActiveId = previous,
+ ImportFunc = (_, _) =>
+ Task.FromResult(new SchemeRefResult(OpResult.Success(), installed)),
+ ActivateFunc = _ => new ActivationResult(
+ OpResult.Fail("PowerSetActiveScheme failed.", "detail"),
+ null
+ ),
+ };
+
+ var install = await plans.InstallSchemeAsync(
+ "x.pow",
+ Guid.NewGuid(),
+ ct: TestContext.Current.CancellationToken
+ );
+ var result = install.Result;
+ var installedId = install.InstalledId;
+ var previousId = install.PreviousId;
+
+ Assert.False(result.Ok);
+ Assert.Equal(installed, installedId);
+ Assert.Equal(previous, previousId);
+ }
+
+ [Fact]
+ public async Task InstallScheme_Success_ReturnsBothIds()
+ {
+ var previous = Guid.NewGuid();
+ var installed = Guid.NewGuid();
+ var plans = new StubPowerPlanService
+ {
+ ActiveId = previous,
+ ImportFunc = (_, _) =>
+ Task.FromResult(new SchemeRefResult(OpResult.Success(), installed)),
+ ActivateFunc = _ => new ActivationResult(OpResult.Success(), previous),
+ };
+
+ var install = await plans.InstallSchemeAsync(
+ "x.pow",
+ installed,
+ ct: TestContext.Current.CancellationToken
+ );
+ var result = install.Result;
+ var installedId = install.InstalledId;
+ var previousId = install.PreviousId;
+
+ Assert.True(result.Ok);
+ Assert.Equal(installed, installedId);
+ Assert.Equal(previous, previousId);
+ Assert.Equal(1, plans.ActivateCalls);
+ }
+
+ [Fact]
+ public async Task ImportSchemeAsync_MissingFile_FailsWithoutNativeCall()
+ {
+ var service = new PowerPlanService(NullLogger<PowerPlanService>.Instance);
+
+ var import = await service.ImportSchemeAsync(
+ Path.Combine(Path.GetTempPath(), Guid.NewGuid() + ".pow"),
+ Guid.NewGuid(),
+ ct: TestContext.Current.CancellationToken
+ );
+ var result = import.Result;
+ var schemeId = import.SchemeId;
+
+ Assert.False(result.Ok);
+ Assert.Null(schemeId);
+ Assert.Contains("PowerImportPowerScheme", result.Error);
+ }
+}
diff --git a/optimizerDuck.Test/Services/PowerPlanIntegrationTests.cs b/optimizerDuck.Test/Services/PowerPlanIntegrationTests.cs
index 2af0314..e09d021 100644
--- a/optimizerDuck.Test/Services/PowerPlanIntegrationTests.cs
+++ b/optimizerDuck.Test/Services/PowerPlanIntegrationTests.cs
@@ -1,4 +1,5 @@
using Microsoft.Extensions.Logging.Abstractions;
+using optimizerDuck.Domain.Optimizations.Models.Power;
using optimizerDuck.Services.System;
namespace optimizerDuck.Test.Services;
@@ -100,17 +101,18 @@ public class PowerPlanIntegrationTests
try
{
- var call = new optimizerDuck.Domain.Execution.OpCall { Logger = NullLogger.Instance };
// Write back the same values: exercises the write path with no semantic change.
var write = service.SetSetting(
- call,
activeId.Value,
target.GroupId,
target.Id,
origAc.Value,
- origDc.Value
+ origDc.Value,
+ NullLogger.Instance
);
- Assert.True(write.Ok);
+ Assert.True(write.Result.Ok);
+ Assert.Equal(origAc, write.PreviousAcValue);
+ Assert.Equal(origDc, write.PreviousDcValue);
var rereadAc = service.GetSettingValue(
activeId.Value,
@@ -129,14 +131,13 @@ public class PowerPlanIntegrationTests
}
finally
{
- var call = new optimizerDuck.Domain.Execution.OpCall { Logger = NullLogger.Instance };
service.SetSetting(
- call,
activeId.Value,
target.GroupId,
target.Id,
origAc.Value,
- origDc.Value
+ origDc.Value,
+ NullLogger.Instance
);
}
}
@@ -147,9 +148,7 @@ public class PowerPlanIntegrationTests
var service = new PowerPlanService(NullLogger<PowerPlanService>.Instance);
var activeId = service.GetActiveSchemeId();
Assert.NotNull(activeId);
- var call = new optimizerDuck.Domain.Execution.OpCall { Logger = NullLogger.Instance };
-
- var result = service.DeleteScheme(call, activeId.Value);
+ var result = service.DeleteScheme(activeId.Value, NullLogger.Instance);
Assert.False(result.Ok);
}
@@ -160,26 +159,26 @@ public class PowerPlanIntegrationTests
var service = new PowerPlanService(NullLogger<PowerPlanService>.Instance);
var activeId = service.GetActiveSchemeId();
Assert.NotNull(activeId);
- var call = new optimizerDuck.Domain.Execution.OpCall { Logger = NullLogger.Instance };
-
- var (dupResult, dupId) = service.DuplicateScheme(call, activeId.Value);
+ var dup = service.DuplicateScheme(activeId.Value, NullLogger.Instance);
+ var dupResult = dup.Result;
+ var dupId = dup.SchemeId;
Assert.True(dupResult.Ok);
Assert.NotNull(dupId);
Assert.True(service.SchemeExists(dupId.Value));
try
{
- var rename = service.SetSchemeName(call, dupId.Value, "optimizerDuck test plan");
+ var rename = service.SetSchemeName(dupId.Value, "optimizerDuck test plan");
Assert.True(rename.Ok);
var renamed = service.GetScheme(dupId.Value);
Assert.Equal("optimizerDuck test plan", renamed?.Name);
- var describe = service.SetSchemeDescription(call, dupId.Value, "test description");
+ var describe = service.SetSchemeDescription(dupId.Value, "test description");
Assert.True(describe.Ok);
}
finally
{
- var del = service.DeleteScheme(call, dupId.Value);
+ var del = service.DeleteScheme(dupId.Value, NullLogger.Instance);
Assert.True(del.Ok);
Assert.False(service.SchemeExists(dupId.Value));
}
diff --git a/optimizerDuck.Test/Services/PowerPlanModelsTests.cs b/optimizerDuck.Test/Services/PowerPlanModelsTests.cs
index 19159f8..6d635d2 100644
--- a/optimizerDuck.Test/Services/PowerPlanModelsTests.cs
+++ b/optimizerDuck.Test/Services/PowerPlanModelsTests.cs
@@ -1,5 +1,5 @@
using Microsoft.Extensions.Logging.Abstractions;
-using optimizerDuck.Domain.Execution;
+using optimizerDuck.Domain.Optimizations.Models.Power;
using optimizerDuck.Services.System;
namespace optimizerDuck.Test.Services;
@@ -106,38 +106,31 @@ public class PowerPlanModelsTests
public void SetSetting_BothNull_FailsWithoutNativeCall()
{
var service = new PowerPlanService(NullLogger<PowerPlanService>.Instance);
- var call = new OpCall { Logger = NullLogger.Instance };
- var result = service.SetSetting(
- call,
- Guid.NewGuid(),
- Guid.NewGuid(),
- Guid.NewGuid(),
- null,
- null
- );
+ var write = service.SetSetting(Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), null, null);
+ var result = write.Result;
+ var prevAc = write.PreviousAcValue;
+ var prevDc = write.PreviousDcValue;
Assert.False(result.Ok);
Assert.NotNull(result.Error);
- Assert.Single(call.Changes.FailedSteps);
+ Assert.Null(prevAc);
+ Assert.Null(prevDc);
}
[Fact]
- public void SetActiveScheme_UnknownActive_FailsClosed()
+ public void SetActiveScheme_UnknownScheme_FailsClosed()
{
- // Random GUIDs force the unreadable path only when Windows cannot
- // resolve them; the assertion is fail-closed shape, not live state.
+ // A bogus GUID must never report success; the failure carries the
+ // native operation truth instead of a fabricated code.
var service = new PowerPlanService(NullLogger<PowerPlanService>.Instance);
- var call = new OpCall { Logger = NullLogger.Instance };
- var result = service.SetActiveScheme(call, Guid.NewGuid());
+ var activation = service.SetActiveScheme(Guid.NewGuid());
+ var result = activation.Result;
+ var previousId = activation.PreviousSchemeId;
- // Either refused (no active readable / unknown scheme) or, on a
- // machine where GetActiveSchemeId works, a recorded native failure.
- // What must never happen: success with a revert for a bogus GUID.
- if (result.Ok)
- Assert.NotNull(call.Changes.SuccessfulSteps);
- else
- Assert.NotNull(result.Error);
+ Assert.False(result.Ok);
+ Assert.NotNull(result.Error);
+ Assert.Null(previousId);
}
}
diff --git a/optimizerDuck.Test/Services/SystemInfoTests.cs b/optimizerDuck.Test/Services/SystemInfoTests.cs
index 658a3a1..f5615ef 100644
--- a/optimizerDuck.Test/Services/SystemInfoTests.cs
+++ b/optimizerDuck.Test/Services/SystemInfoTests.cs
@@ -61,9 +61,8 @@ public class SystemInfoTests
public void PowerPlanService_BadDelete_FailsClosed()
{
var service = new PowerPlanService(NullLogger<PowerPlanService>.Instance);
- var call = new optimizerDuck.Domain.Execution.OpCall { Logger = NullLogger.Instance };
// Deleting a nonexistent scheme must report failure, never throw.
- var result = service.DeleteScheme(call, Guid.NewGuid());
+ var result = service.DeleteScheme(Guid.NewGuid(), NullLogger.Instance);
Assert.False(result.Ok);
}
diff --git a/optimizerDuck.Test/Services/UI/DiskCleanupServiceTests.cs b/optimizerDuck.Test/Services/UI/DiskCleanupServiceTests.cs
index 4183f08..80ca571 100644
--- a/optimizerDuck.Test/Services/UI/DiskCleanupServiceTests.cs
+++ b/optimizerDuck.Test/Services/UI/DiskCleanupServiceTests.cs
@@ -1,6 +1,6 @@
using Microsoft.Extensions.Logging.Abstractions;
using optimizerDuck.Domain.Optimizations.Models.Cleanup;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.Services.UI;
using Wpf.Ui.Controls;
diff --git a/optimizerDuck.Test/TestDoubles/TestShell.cs b/optimizerDuck.Test/TestDoubles/TestShell.cs
index 110ca51..badaf77 100644
--- a/optimizerDuck.Test/TestDoubles/TestShell.cs
+++ b/optimizerDuck.Test/TestDoubles/TestShell.cs
@@ -1,8 +1,8 @@
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using optimizerDuck.Domain.Abstractions;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Test.TestDoubles;
diff --git a/optimizerDuck.Test/UI/ViewModels/CustomizeItemViewModelTests.cs b/optimizerDuck.Test/UI/ViewModels/CustomizeItemViewModelTests.cs
index ae8b46b..015f5f0 100644
--- a/optimizerDuck.Test/UI/ViewModels/CustomizeItemViewModelTests.cs
+++ b/optimizerDuck.Test/UI/ViewModels/CustomizeItemViewModelTests.cs
@@ -6,8 +6,8 @@ using optimizerDuck.Domain.Customize.Models;
using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.UI.ViewModels.Customize;
using Wpf.Ui.Controls;
diff --git a/optimizerDuck/App.xaml.cs b/optimizerDuck/App.xaml.cs
index 31ea150..203e3d9 100644
--- a/optimizerDuck/App.xaml.cs
+++ b/optimizerDuck/App.xaml.cs
@@ -15,9 +15,9 @@ using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Configuration;
using optimizerDuck.Services.Customize;
using optimizerDuck.Services.Optimization;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.Revert;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.Services.UI;
using optimizerDuck.UI.Behaviors;
using optimizerDuck.UI.Pages;
diff --git a/optimizerDuck/ApplicationServiceCollectionExtensions.cs b/optimizerDuck/ApplicationServiceCollectionExtensions.cs
index 2873e04..acb6bab 100644
--- a/optimizerDuck/ApplicationServiceCollectionExtensions.cs
+++ b/optimizerDuck/ApplicationServiceCollectionExtensions.cs
@@ -6,9 +6,9 @@ using optimizerDuck.Domain.Configuration;
using optimizerDuck.Services.Configuration;
using optimizerDuck.Services.Customize;
using optimizerDuck.Services.Optimization;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.Revert;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.Services.UI;
using optimizerDuck.UI.Pages;
using optimizerDuck.UI.ViewModels.Dialogs;
diff --git a/optimizerDuck/Common/Converters/BytesToGBConverter.cs b/optimizerDuck/Common/Converters/BytesToGBConverter.cs
index a14e94c..b1914d1 100644
--- a/optimizerDuck/Common/Converters/BytesToGBConverter.cs
+++ b/optimizerDuck/Common/Converters/BytesToGBConverter.cs
@@ -13,11 +13,11 @@ public class BytesToGBConverter : IValueConverter
{
long l => l,
int i => i,
+ ulong ul => ul,
double d => d,
_ => double.NaN,
};
- if (double.IsNaN(bytes) || bytes < 0)
- return Loc.Instance["Common.Unknown"];
+ return Loc.Instance["Common.Unknown"];
return (bytes / (1024.0 * 1024.0 * 1024.0)).ToString("F1", culture);
}
diff --git a/optimizerDuck/Common/Converters/NullToUnknownTextConverter.cs b/optimizerDuck/Common/Converters/NullToUnknownTextConverter.cs
index 0c44a2e..3a15915 100644
--- a/optimizerDuck/Common/Converters/NullToUnknownTextConverter.cs
+++ b/optimizerDuck/Common/Converters/NullToUnknownTextConverter.cs
@@ -4,12 +4,12 @@ using optimizerDuck.Services.Configuration;
namespace optimizerDuck.Common.Converters;
-/// <summary>Passes strings through; null or empty becomes localized Unknown.</summary>
+/// <summary>Passes non-empty strings through; anything else becomes localized Unknown.</summary>
public class NullToUnknownTextConverter : IValueConverter
{
public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
{
- return string.IsNullOrEmpty(value as string) ? Loc.Instance["Common.Unknown"] : value!;
+ return value is string s && s.Length > 0 ? s : Loc.Instance["Common.Unknown"];
}
public object ConvertBack(
diff --git a/optimizerDuck/Domain/Abstractions/IRevertStep.cs b/optimizerDuck/Domain/Abstractions/IRevertStep.cs
index 9ab267a..a787c0c 100644
--- a/optimizerDuck/Domain/Abstractions/IRevertStep.cs
+++ b/optimizerDuck/Domain/Abstractions/IRevertStep.cs
@@ -1,7 +1,7 @@
using Microsoft.Extensions.Logging;
using Newtonsoft.Json.Linq;
using optimizerDuck.Domain.Optimizations.Models.Services;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Domain.Abstractions;
diff --git a/optimizerDuck/Domain/Abstractions/RevertContext.cs b/optimizerDuck/Domain/Abstractions/RevertContext.cs
index dd0c7a9..ee033a0 100644
--- a/optimizerDuck/Domain/Abstractions/RevertContext.cs
+++ b/optimizerDuck/Domain/Abstractions/RevertContext.cs
@@ -1,6 +1,6 @@
using Microsoft.Extensions.Logging;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Domain.Abstractions;
diff --git a/optimizerDuck/Domain/Conditions/BuiltIn/RegistryKeyExistsCondition.cs b/optimizerDuck/Domain/Conditions/BuiltIn/RegistryKeyExistsCondition.cs
index 0a9caa7..876a4ea 100644
--- a/optimizerDuck/Domain/Conditions/BuiltIn/RegistryKeyExistsCondition.cs
+++ b/optimizerDuck/Domain/Conditions/BuiltIn/RegistryKeyExistsCondition.cs
@@ -1,6 +1,6 @@
using optimizerDuck.Domain.Optimizations.Models.Services;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Domain.Conditions;
diff --git a/optimizerDuck/Domain/Conditions/BuiltIn/ServiceExistsCondition.cs b/optimizerDuck/Domain/Conditions/BuiltIn/ServiceExistsCondition.cs
index 15ec899..5fb1692 100644
--- a/optimizerDuck/Domain/Conditions/BuiltIn/ServiceExistsCondition.cs
+++ b/optimizerDuck/Domain/Conditions/BuiltIn/ServiceExistsCondition.cs
@@ -1,6 +1,6 @@
using optimizerDuck.Domain.Optimizations.Models.Services;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Domain.Conditions;
diff --git a/optimizerDuck/Domain/Customize/Categories/Desktop.cs b/optimizerDuck/Domain/Customize/Categories/Desktop.cs
index 88bd2ce..7bc07ff 100644
--- a/optimizerDuck/Domain/Customize/Categories/Desktop.cs
+++ b/optimizerDuck/Domain/Customize/Categories/Desktop.cs
@@ -8,7 +8,7 @@ using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.UI.Pages.Customize.Categories;
using Wpf.Ui.Controls;
diff --git a/optimizerDuck/Domain/Customize/Categories/Gaming.cs b/optimizerDuck/Domain/Customize/Categories/Gaming.cs
index 499986d..7b6f52c 100644
--- a/optimizerDuck/Domain/Customize/Categories/Gaming.cs
+++ b/optimizerDuck/Domain/Customize/Categories/Gaming.cs
@@ -8,7 +8,7 @@ using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.UI.Pages.Customize.Categories;
using Wpf.Ui.Controls;
diff --git a/optimizerDuck/Domain/Customize/Categories/Preferences.cs b/optimizerDuck/Domain/Customize/Categories/Preferences.cs
index 599966e..610c471 100644
--- a/optimizerDuck/Domain/Customize/Categories/Preferences.cs
+++ b/optimizerDuck/Domain/Customize/Categories/Preferences.cs
@@ -9,7 +9,7 @@ using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.UI.Pages.Customize.Categories;
using Wpf.Ui.Controls;
diff --git a/optimizerDuck/Domain/Customize/Categories/SystemFeatures.cs b/optimizerDuck/Domain/Customize/Categories/SystemFeatures.cs
index b1891eb..284a2ff 100644
--- a/optimizerDuck/Domain/Customize/Categories/SystemFeatures.cs
+++ b/optimizerDuck/Domain/Customize/Categories/SystemFeatures.cs
@@ -10,7 +10,7 @@ using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.UI.Pages.Customize.Categories;
using Wpf.Ui.Controls;
diff --git a/optimizerDuck/Domain/Customize/Models/BaseCustomizeSetting.cs b/optimizerDuck/Domain/Customize/Models/BaseCustomizeSetting.cs
index 6470dcc..7f62d39 100644
--- a/optimizerDuck/Domain/Customize/Models/BaseCustomizeSetting.cs
+++ b/optimizerDuck/Domain/Customize/Models/BaseCustomizeSetting.cs
@@ -7,7 +7,7 @@ using optimizerDuck.Domain.Attributes;
using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using Wpf.Ui.Controls;
namespace optimizerDuck.Domain.Customize.Models;
diff --git a/optimizerDuck/Domain/Customize/Models/RegistryToggle.cs b/optimizerDuck/Domain/Customize/Models/RegistryToggle.cs
index 8792255..d015ed0 100644
--- a/optimizerDuck/Domain/Customize/Models/RegistryToggle.cs
+++ b/optimizerDuck/Domain/Customize/Models/RegistryToggle.cs
@@ -1,7 +1,7 @@
using Microsoft.Win32;
using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Domain.Customize.Models;
diff --git a/optimizerDuck/Domain/Optimizations/Categories/AI.cs b/optimizerDuck/Domain/Optimizations/Categories/AI.cs
index bb4192b..122069b 100644
--- a/optimizerDuck/Domain/Optimizations/Categories/AI.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/AI.cs
@@ -9,7 +9,7 @@ using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.UI.Pages.Optimize.Categories;
namespace optimizerDuck.Domain.Optimizations.Categories;
diff --git a/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs b/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs
index 5c613b4..9a0f283 100644
--- a/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs
@@ -8,7 +8,7 @@ using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.UI.Pages.Optimize.Categories;
namespace optimizerDuck.Domain.Optimizations.Categories;
diff --git a/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs b/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs
index 21ca1a6..b81a4e0 100644
--- a/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs
@@ -9,8 +9,8 @@ using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.UI.Pages.Optimize.Categories;
namespace optimizerDuck.Domain.Optimizations.Categories;
diff --git a/optimizerDuck/Domain/Optimizations/Categories/Performance.cs b/optimizerDuck/Domain/Optimizations/Categories/Performance.cs
index 445d692..83fb943 100644
--- a/optimizerDuck/Domain/Optimizations/Categories/Performance.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/Performance.cs
@@ -9,7 +9,7 @@ using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.UI.Pages.Optimize.Categories;
namespace optimizerDuck.Domain.Optimizations.Categories;
diff --git a/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs b/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs
index b2d9e90..0c471db 100644
--- a/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs
@@ -13,8 +13,8 @@ using optimizerDuck.Domain.Revert.Steps;
using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.UI.Pages.Optimize.Categories;
namespace optimizerDuck.Domain.Optimizations.Categories;
@@ -158,21 +158,6 @@ public class PowerManagement : LocalizedObject, IOptimizationCategory
OptimizationContext context
)
{
- var previousPlanId = context.PowerPlans.GetActiveSchemeId();
- if (previousPlanId is null)
- {
- context.Logger.LogError("Failed to detect current active power plan");
- return ApplyResult.False(Loc.Instance[$"{ErrorPrefix}.DetectActivePlanFailed"]);
- }
-
- var previousName =
- context.PowerPlans.GetSchemeName(previousPlanId.Value) ?? previousPlanId.ToString();
- context.Logger.LogInformation(
- "Current active power plan: {Name} ({Guid})",
- previousName,
- previousPlanId
- );
-
var powerPlanPath = Path.Combine(
Shared.AssetsDirectory,
"PowerPlans",
@@ -202,52 +187,32 @@ public class PowerManagement : LocalizedObject, IOptimizationCategory
}
);
- var (importResult, installedId) = await context.PowerPlans.ImportSchemeAsync(
+ var install = await PowerPlanChanges.InstallAsync(
+ context,
+ context.PowerPlans,
powerPlanPath,
OptimizerDuckPlanId,
context.CancellationToken
);
- if (!importResult.Ok || installedId is null)
- {
- context.Logger.LogError(
- "Failed to import optimizerDuck power plan: {Error}",
- importResult.Error ?? "unknown"
- );
- return ApplyResult.False(Loc.Instance[$"{ErrorPrefix}.ImportFailed"]);
- }
-
- var setActive = context.PowerPlans.SetActiveScheme(context, installedId.Value);
- if (!setActive.Ok)
+ var installResult = install.Result;
+ var installedId = install.InstalledId;
+ var previousId = install.PreviousId;
+ if (!installResult.Ok)
{
context.Logger.LogError(
- "Failed to activate optimizerDuck power plan: {Error}",
- setActive.Error ?? "unknown"
+ "Failed to install optimizerDuck power plan: {Error}",
+ installResult.Error ?? "unknown"
);
- return ApplyResult.False(Loc.Instance[$"{ErrorPrefix}.ActivateFailed"]);
- }
-
- // SetActiveScheme records its own revert step with PreviousSchemeId;
- // point it at the installed scheme so revert restores then deletes.
- var activation = context.Changes.Changes.LastOrDefault(c =>
- c.Ok && c.Revert is PowerPlanRevertStep
- );
- if (activation?.Revert is PowerPlanRevertStep activationStep)
- activationStep.InstalledSchemeId = installedId.Value;
- else
- context.Changes.Add(
- ServiceStrings.PowerPlanName,
+ if (previousId is null)
+ return ApplyResult.False(Loc.Instance[$"{ErrorPrefix}.DetectActivePlanFailed"]);
+ return ApplyResult.False(
Loc.Instance[
- "Revert.PowerPlan.Description.Set",
- context.PowerPlans.GetSchemeName(installedId.Value)
- ?? installedId.ToString()
- ],
- true,
- new PowerPlanRevertStep
- {
- PreviousSchemeId = previousPlanId.Value,
- InstalledSchemeId = installedId.Value,
- }
+ installedId is null
+ ? $"{ErrorPrefix}.ImportFailed"
+ : $"{ErrorPrefix}.ActivateFailed"
+ ]
);
+ }
context.Logger.LogInformation("Installed optimizerDuck power plan successfully!");
return context.Changes.ToApplyResult();
diff --git a/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs b/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs
index e983c82..3ac274e 100644
--- a/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs
@@ -10,7 +10,7 @@ using optimizerDuck.Domain.Optimizations.Models.ScheduledTask;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.UI.Pages.Optimize.Categories;
namespace optimizerDuck.Domain.Optimizations.Categories;
diff --git a/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs b/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs
index e94a3ba..2f66f25 100644
--- a/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs
@@ -10,7 +10,7 @@ using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.UI.Pages.Optimize.Categories;
namespace optimizerDuck.Domain.Optimizations.Categories;
diff --git a/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs b/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs
index 2b36780..b1ba56f 100644
--- a/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs
@@ -9,7 +9,7 @@ using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using Wpf.Ui.Controls;
using OptimizationState = optimizerDuck.Domain.UI.OptimizationState;
diff --git a/optimizerDuck/Domain/Optimizations/Models/OptimizationContext.cs b/optimizerDuck/Domain/Optimizations/Models/OptimizationContext.cs
index ff094f9..0e2b876 100644
--- a/optimizerDuck/Domain/Optimizations/Models/OptimizationContext.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/OptimizationContext.cs
@@ -1,8 +1,8 @@
using Microsoft.Extensions.Logging;
using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Execution;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Domain.Optimizations.Models;
diff --git a/optimizerDuck/Services/System/PowerPlanModels.cs b/optimizerDuck/Domain/Optimizations/Models/Power/PowerPlanModels.cs
similarity index 98%
rename from optimizerDuck/Services/System/PowerPlanModels.cs
rename to optimizerDuck/Domain/Optimizations/Models/Power/PowerPlanModels.cs
index d6a9e28..c02ce62 100644
--- a/optimizerDuck/Services/System/PowerPlanModels.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/Power/PowerPlanModels.cs
@@ -1,4 +1,4 @@
-namespace optimizerDuck.Services.System;
+namespace optimizerDuck.Domain.Optimizations.Models.Power;
/// <summary>
/// A Windows power scheme (power plan): GUID identity plus the live metadata
diff --git a/optimizerDuck/Domain/Optimizations/Models/Power/PowerResults.cs b/optimizerDuck/Domain/Optimizations/Models/Power/PowerResults.cs
new file mode 100644
index 0000000..a379223
--- /dev/null
+++ b/optimizerDuck/Domain/Optimizations/Models/Power/PowerResults.cs
@@ -0,0 +1,19 @@
+using optimizerDuck.Domain.Execution;
+
+namespace optimizerDuck.Domain.Optimizations.Models.Power;
+
+/// <summary>Activation outcome plus the previously active scheme id (null on failure).</summary>
+public sealed record ActivationResult(OpResult Result, Guid? PreviousSchemeId);
+
+/// <summary>Setting-write outcome plus the previous AC/DC values (null on failure).</summary>
+public sealed record SettingWriteResult(
+ OpResult Result,
+ uint? PreviousAcValue,
+ uint? PreviousDcValue
+);
+
+/// <summary>Duplicate/import outcome plus the resulting scheme id (null on failure).</summary>
+public sealed record SchemeRefResult(OpResult Result, Guid? SchemeId);
+
+/// <summary>Atomic install outcome plus installed and previous ids (null on failure).</summary>
+public sealed record InstallResult(OpResult Result, Guid? InstalledId, Guid? PreviousId);
diff --git a/optimizerDuck/Domain/Revert/Steps/PowerPlanRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/PowerPlanRevertStep.cs
index 1ba5037..8fd76b7 100644
--- a/optimizerDuck/Domain/Revert/Steps/PowerPlanRevertStep.cs
+++ b/optimizerDuck/Domain/Revert/Steps/PowerPlanRevertStep.cs
@@ -2,7 +2,6 @@ using Microsoft.Extensions.Logging;
using Newtonsoft.Json.Linq;
using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Exceptions;
-using optimizerDuck.Domain.Execution;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Configuration;
@@ -31,12 +30,12 @@ public class PowerPlanRevertStep : IRevertStep
{
ArgumentNullException.ThrowIfNull(context);
var powerPlans = context.PowerPlans;
- var call = new OpCall { Logger = logger };
var restored = false;
if (PreviousSchemeId != Guid.Empty)
{
- var setActive = powerPlans.SetActiveScheme(call, PreviousSchemeId);
+ var activation = powerPlans.SetActiveScheme(PreviousSchemeId, logger);
+ var setActive = activation.Result;
if (!setActive.Ok)
throw new StepExecutionException(
Loc.Instance["Revert.PowerPlan.Error.RestoreFailed", setActive.Error ?? ""],
@@ -68,7 +67,7 @@ public class PowerPlanRevertStep : IRevertStep
{
if (powerPlans.SchemeExists(InstalledSchemeId))
{
- var deleted = powerPlans.DeleteScheme(call, InstalledSchemeId);
+ var deleted = powerPlans.DeleteScheme(InstalledSchemeId, logger);
if (!deleted.Ok)
throw new StepExecutionException(
Loc.Instance[
diff --git a/optimizerDuck/Domain/Revert/Steps/PowerSettingRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/PowerSettingRevertStep.cs
index 4eddcad..60efea3 100644
--- a/optimizerDuck/Domain/Revert/Steps/PowerSettingRevertStep.cs
+++ b/optimizerDuck/Domain/Revert/Steps/PowerSettingRevertStep.cs
@@ -2,10 +2,9 @@ using Microsoft.Extensions.Logging;
using Newtonsoft.Json.Linq;
using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Exceptions;
-using optimizerDuck.Domain.Execution;
+using optimizerDuck.Domain.Optimizations.Models.Power;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.System;
namespace optimizerDuck.Domain.Revert.Steps;
@@ -37,15 +36,15 @@ public class PowerSettingRevertStep : IRevertStep
public Task<bool> ExecuteAsync(RevertContext context, ILogger logger)
{
ArgumentNullException.ThrowIfNull(context);
- var call = new OpCall { Logger = logger };
- var result = context.PowerPlans.SetSetting(
- call,
+ var write = context.PowerPlans.SetSetting(
SchemeId,
SubgroupId,
SettingId,
PreviousAcValue,
- PreviousDcValue
+ PreviousDcValue,
+ logger
);
+ var result = write.Result;
if (!result.Ok)
throw new StepExecutionException(result.Error ?? Description, result.ErrorDetail);
diff --git a/optimizerDuck/Domain/Revert/Steps/RegistryRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/RegistryRevertStep.cs
index 2636b8b..4e04ed7 100644
--- a/optimizerDuck/Domain/Revert/Steps/RegistryRevertStep.cs
+++ b/optimizerDuck/Domain/Revert/Steps/RegistryRevertStep.cs
@@ -7,7 +7,7 @@ using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Domain.Revert.Steps;
diff --git a/optimizerDuck/Domain/Revert/Steps/ScheduledTaskRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/ScheduledTaskRevertStep.cs
index 4202956..861708f 100644
--- a/optimizerDuck/Domain/Revert/Steps/ScheduledTaskRevertStep.cs
+++ b/optimizerDuck/Domain/Revert/Steps/ScheduledTaskRevertStep.cs
@@ -5,7 +5,7 @@ using optimizerDuck.Domain.Exceptions;
using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.ScheduledTask;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Domain.Revert.Steps;
diff --git a/optimizerDuck/Domain/Revert/Steps/ServiceRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/ServiceRevertStep.cs
index 31305c1..86ef23e 100644
--- a/optimizerDuck/Domain/Revert/Steps/ServiceRevertStep.cs
+++ b/optimizerDuck/Domain/Revert/Steps/ServiceRevertStep.cs
@@ -6,7 +6,7 @@ using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Domain.Revert.Steps;
diff --git a/optimizerDuck/Domain/Revert/Steps/ShellRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/ShellRevertStep.cs
index e32abaf..dadd479 100644
--- a/optimizerDuck/Domain/Revert/Steps/ShellRevertStep.cs
+++ b/optimizerDuck/Domain/Revert/Steps/ShellRevertStep.cs
@@ -5,7 +5,7 @@ using optimizerDuck.Domain.Exceptions;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Domain.Revert.Steps;
diff --git a/optimizerDuck/Domain/Revert/Steps/UsbPowerRevertStep.cs b/optimizerDuck/Domain/Revert/Steps/UsbPowerRevertStep.cs
index dd4e7f8..eccc966 100644
--- a/optimizerDuck/Domain/Revert/Steps/UsbPowerRevertStep.cs
+++ b/optimizerDuck/Domain/Revert/Steps/UsbPowerRevertStep.cs
@@ -6,7 +6,7 @@ using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Exceptions;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Domain.Revert.Steps;
diff --git a/optimizerDuck/Services/Optimization/OptimizationService.cs b/optimizerDuck/Services/Optimization/OptimizationService.cs
index 599962f..dcadf30 100644
--- a/optimizerDuck/Services/Optimization/OptimizationService.cs
+++ b/optimizerDuck/Services/Optimization/OptimizationService.cs
@@ -10,9 +10,9 @@ using optimizerDuck.Domain.Revert;
using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.Revert;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.UI.Dialogs;
using optimizerDuck.UI.ViewModels.Dialogs;
using Wpf.Ui;
diff --git a/optimizerDuck/Services/Revert/RevertManager.cs b/optimizerDuck/Services/Revert/RevertManager.cs
index 818d76b..9584c63 100644
--- a/optimizerDuck/Services/Revert/RevertManager.cs
+++ b/optimizerDuck/Services/Revert/RevertManager.cs
@@ -14,8 +14,8 @@ using optimizerDuck.Domain.Revert;
using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Services.Revert;
@@ -750,18 +750,12 @@ public class RevertManager(
public string Type => rawType;
public string Description =>
- Services.Optimization.Providers.ServiceStrings.Format(
- Services.Optimization.Providers.ServiceStrings.RevertDataUnloadableDescription,
- rawType
- );
+ ServiceStrings.Format(ServiceStrings.RevertDataUnloadableDescription, rawType);
public Task<bool> ExecuteAsync(RevertContext _, ILogger logger)
{
throw new StepExecutionException(
- Services.Optimization.Providers.ServiceStrings.Format(
- Services.Optimization.Providers.ServiceStrings.RevertDataUnknownType,
- rawType
- ),
+ ServiceStrings.Format(ServiceStrings.RevertDataUnknownType, rawType),
null
);
}
diff --git a/optimizerDuck/Services/System/DownloadResult.cs b/optimizerDuck/Services/System/DownloadResult.cs
new file mode 100644
index 0000000..6fc96d2
--- /dev/null
+++ b/optimizerDuck/Services/System/DownloadResult.cs
@@ -0,0 +1,4 @@
+namespace optimizerDuck.Services.System;
+
+/// <summary>Download outcome: <c>Ok</c> plus the full local path on success.</summary>
+public sealed record DownloadResult(bool Ok, string? FilePath);
diff --git a/optimizerDuck/Services/System/PowerPlanService.cs b/optimizerDuck/Services/System/PowerPlanService.cs
index 22f5519..8494477 100644
--- a/optimizerDuck/Services/System/PowerPlanService.cs
+++ b/optimizerDuck/Services/System/PowerPlanService.cs
@@ -4,18 +4,18 @@ using System.Runtime.Versioning;
using System.Text;
using Microsoft.Extensions.Logging;
using optimizerDuck.Domain.Execution;
-using optimizerDuck.Domain.Revert.Steps;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Domain.Optimizations.Models.Power;
+using optimizerDuck.Services.System.Primitives;
namespace optimizerDuck.Services.System;
-/// <summary>
/// Power scheme operations over powrprof (no child processes).
/// Single owner of every power P/Invoke in the app.
/// Fast Win32 calls run synchronously on the caller thread; only the
-/// file-I/O-bound import is async. Mutating paths take an
-/// <see cref="OpCall"/>, record a <see cref="Change"/>, and return
-/// <see cref="OpResult"/> like <see cref="RegistryService"/> does.
+/// file-I/O-bound import is async. Reads take ids only; mutating paths take
+/// an optional <see cref="ILogger"/> (default null), return <see cref="OpResult"/>
+/// with native diagnostics, and record nothing: revert recording lives at the
+/// optimization edge (see PowerPlanChanges), so tools reuse the same core.
/// Import semantics: a non-empty <c>destinationId</c> pre-seeds the GUID**
/// slot so Windows imports under it (replacing any scheme with the same
/// GUID, same as <c>powercfg /import file guid</c>); an empty GUID passes
@@ -26,7 +26,8 @@ namespace optimizerDuck.Services.System;
/// <c>DisableHibernateAndFastStartup</c>.
/// </summary>
[SupportedOSPlatform("windows")]
-public sealed class PowerPlanService
+// Virtual members are a hand-double seam for tests (no mocking libraries).
+public class PowerPlanService
{
private const uint ERROR_SUCCESS = 0;
private const uint ERROR_MORE_DATA = 234;
@@ -41,7 +42,7 @@ public sealed class PowerPlanService
_logger = logger;
}
- public Guid? GetActiveSchemeId()
+ public virtual Guid? GetActiveSchemeId()
{
IntPtr ptr = IntPtr.Zero;
try
@@ -223,39 +224,19 @@ public sealed class PowerPlanService
}
}
- public OpResult SetSetting(
- OpCall call,
+ public virtual SettingWriteResult SetSetting(
Guid schemeId,
Guid subgroupId,
Guid settingId,
uint? acValue,
- uint? dcValue
+ uint? dcValue,
+ ILogger? logger = null
)
{
- ArgumentNullException.ThrowIfNull(call);
- var description = ServiceStrings.Format(
- "Write power setting {0}/{1}/{2}",
- schemeId,
- subgroupId,
- settingId
- );
-
if (acValue is null && dcValue is null)
{
const string error = "No value to write: both AC and DC are null.";
- call.Changes.Add(
- ServiceStrings.PowerPlanName,
- description,
- false,
- null,
- error,
- error,
- retryCall =>
- Task.FromResult(
- SetSetting(retryCall, schemeId, subgroupId, settingId, acValue, dcValue)
- )
- );
- return OpResult.Fail(error, error);
+ return new SettingWriteResult(OpResult.Fail(error, error), null, null);
}
var prevAc = TryReadRaw(schemeId, subgroupId, settingId, PowerSource.Ac);
@@ -271,56 +252,25 @@ public sealed class PowerPlanService
subgroupId,
settingId
);
- call.Logger.LogError(
+ logger?.LogError(
"Refusing power-setting write: previous {Source} value unreadable for {SchemeId}/{SubgroupId}/{SettingId}",
missing,
schemeId,
subgroupId,
settingId
);
- call.Changes.Add(
- ServiceStrings.PowerPlanName,
- description,
- false,
- null,
- error,
- error,
- retryCall =>
- Task.FromResult(
- SetSetting(retryCall, schemeId, subgroupId, settingId, acValue, dcValue)
- )
- );
- return OpResult.Fail(error, error);
+ return new SettingWriteResult(OpResult.Fail(error, error), null, null);
}
var failure = WriteValues(schemeId, subgroupId, settingId, acValue, dcValue);
if (failure is not null)
- {
- call.Changes.Add(
- ServiceStrings.PowerPlanName,
- description,
- false,
+ return new SettingWriteResult(
+ OpResult.Fail(failure.Describe(), failure.Describe()),
null,
- failure.Describe(),
- failure.Describe(),
- retryCall =>
- Task.FromResult(
- SetSetting(retryCall, schemeId, subgroupId, settingId, acValue, dcValue)
- )
+ null
);
- return OpResult.Fail(failure.Describe(), failure.Describe());
- }
- var revertStep = new PowerSettingRevertStep
- {
- SchemeId = schemeId,
- SubgroupId = subgroupId,
- SettingId = settingId,
- PreviousAcValue = prevAc.Value,
- PreviousDcValue = prevDc.Value,
- };
- call.Changes.Add(ServiceStrings.PowerPlanName, description, true, revertStep);
- call.Logger.LogInformation(
+ logger?.LogInformation(
"Wrote power setting {SchemeId}/{SubgroupId}/{SettingId} AC={Ac} DC={Dc}",
schemeId,
subgroupId,
@@ -328,41 +278,24 @@ public sealed class PowerPlanService
acValue?.ToString() ?? "(unchanged)",
dcValue?.ToString() ?? "(unchanged)"
);
- return OpResult.Success(revertStep);
+ return new SettingWriteResult(OpResult.Success(), prevAc, prevDc);
}
- public OpResult SetActiveScheme(OpCall call, Guid schemeId)
+ public virtual ActivationResult SetActiveScheme(Guid schemeId, ILogger? logger = null)
{
- ArgumentNullException.ThrowIfNull(call);
- var name = GetSchemeName(schemeId) ?? schemeId.ToString();
- var description = ServiceStrings.Format("Activate power plan {0}", name);
-
var previous = GetActiveSchemeId();
if (previous is null)
{
const string error = "Could not read the active power plan; refusing to switch.";
- call.Logger.LogError("Refusing power-plan switch: active scheme unreadable");
- call.Changes.Add(
- ServiceStrings.PowerPlanName,
- description,
- false,
- null,
- error,
- error,
- retryCall => Task.FromResult(SetActiveScheme(retryCall, schemeId))
- );
- return OpResult.Fail(error, error);
+ logger?.LogError("Refusing power-plan switch: active scheme unreadable");
+ return new ActivationResult(OpResult.Fail(error, error), null);
}
if (previous.Value == schemeId)
{
- call.Logger.LogInformation("Power plan {Name} already active, skipping", name);
- call.Changes.Add(
- ServiceStrings.PowerPlanName,
- ServiceStrings.Format("Power plan {0} already active (skipped)", name),
- true
- );
- return OpResult.Success();
+ var skippedName = GetSchemeName(schemeId) ?? schemeId.ToString();
+ logger?.LogInformation("Power plan {Name} already active, skipping", skippedName);
+ return new ActivationResult(OpResult.Success(), previous);
}
uint code;
@@ -379,17 +312,8 @@ public sealed class PowerPlanService
SchemeId = schemeId,
ExceptionText = ex.Message,
};
- call.Logger.LogWarning(ex, "PowerSetActiveScheme threw for {SchemeId}", schemeId);
- call.Changes.Add(
- ServiceStrings.PowerPlanName,
- description,
- false,
- null,
- err.Describe(),
- ex.ToString(),
- retryCall => Task.FromResult(SetActiveScheme(retryCall, schemeId))
- );
- return OpResult.Fail(err.Describe(), ex.ToString());
+ logger?.LogWarning(ex, "PowerSetActiveScheme threw for {SchemeId}", schemeId);
+ return new ActivationResult(OpResult.Fail(err.Describe(), ex.ToString()), null);
}
if (code != ERROR_SUCCESS)
@@ -400,37 +324,20 @@ public sealed class PowerPlanService
SchemeId = schemeId,
ErrorCode = code,
};
- _logger.LogWarning(
+ logger?.LogWarning(
"PowerSetActiveScheme failed for {SchemeId}: Win32 {ErrorCode}",
schemeId,
code
);
- call.Changes.Add(
- ServiceStrings.PowerPlanName,
- description,
- false,
- null,
- err.Describe(),
- err.Describe(),
- retryCall => Task.FromResult(SetActiveScheme(retryCall, schemeId))
- );
- return OpResult.Fail(err.Describe(), err.Describe());
+ return new ActivationResult(OpResult.Fail(err.Describe(), err.Describe()), null);
}
- var revertStep = new PowerPlanRevertStep
- {
- PreviousSchemeId = previous.Value,
- InstalledSchemeId = Guid.Empty,
- };
- call.Changes.Add(ServiceStrings.PowerPlanName, description, true, revertStep);
- return OpResult.Success(revertStep);
+ return new ActivationResult(OpResult.Success(), previous);
}
- public OpResult DeleteScheme(OpCall call, Guid schemeId)
+ public virtual OpResult DeleteScheme(Guid schemeId, ILogger? logger = null)
{
- ArgumentNullException.ThrowIfNull(call);
var name = GetSchemeName(schemeId) ?? schemeId.ToString();
- var description = ServiceStrings.Format("Delete power plan {0}", name);
if (GetActiveSchemeId() == schemeId)
{
@@ -438,8 +345,7 @@ public sealed class PowerPlanService
"Refusing to delete the active power plan {0}; activate another plan first.",
name
);
- call.Logger.LogError("Refusing to delete active power plan {SchemeId}", schemeId);
- call.Changes.Add(ServiceStrings.PowerPlanName, description, false, null, error, error);
+ logger?.LogError("Refusing to delete active power plan {SchemeId}", schemeId);
return OpResult.Fail(error, error);
}
@@ -457,16 +363,7 @@ public sealed class PowerPlanService
SchemeId = schemeId,
ExceptionText = ex.Message,
};
- call.Logger.LogWarning(ex, "PowerDeleteScheme threw for {SchemeId}", schemeId);
- call.Changes.Add(
- ServiceStrings.PowerPlanName,
- description,
- false,
- null,
- err.Describe(),
- ex.ToString(),
- retryCall => Task.FromResult(DeleteScheme(retryCall, schemeId))
- );
+ logger?.LogWarning(ex, "PowerDeleteScheme threw for {SchemeId}", schemeId);
return OpResult.Fail(err.Describe(), ex.ToString());
}
@@ -478,31 +375,22 @@ public sealed class PowerPlanService
SchemeId = schemeId,
ErrorCode = code,
};
- _logger.LogWarning(
+ logger?.LogWarning(
"PowerDeleteScheme failed for {SchemeId}: Win32 {ErrorCode}",
schemeId,
code
);
- call.Changes.Add(
- ServiceStrings.PowerPlanName,
- description,
- false,
- null,
- err.Describe(),
- err.Describe(),
- retryCall => Task.FromResult(DeleteScheme(retryCall, schemeId))
- );
return OpResult.Fail(err.Describe(), err.Describe());
}
// Deleted schemes are gone: no revert step can restore them.
- call.Changes.Add(ServiceStrings.PowerPlanName, description, true);
return OpResult.Success();
}
- public async Task<(OpResult Result, Guid? SchemeId)> ImportSchemeAsync(
+ public virtual async Task<SchemeRefResult> ImportSchemeAsync(
string filePath,
Guid destinationId,
+ ILogger? logger = null,
CancellationToken ct = default
)
{
@@ -515,7 +403,7 @@ public sealed class PowerPlanService
Path = filePath,
ExceptionText = "File not found.",
};
- return (OpResult.Fail(missing.Describe(), missing.Describe()), null);
+ return new SchemeRefResult(OpResult.Fail(missing.Describe(), missing.Describe()), null);
}
// Genuine async boundary: file I/O, not a faked-async native call.
@@ -552,14 +440,14 @@ public sealed class PowerPlanService
Path = filePath,
ErrorCode = code,
};
- _logger.LogWarning(
+ logger?.LogWarning(
"PowerImportPowerScheme failed for {Path}: Win32 {ErrorCode}",
filePath,
code
);
- return (OpResult.Fail(err.Describe(), err.Describe()), null);
+ return new SchemeRefResult(OpResult.Fail(err.Describe(), err.Describe()), null);
}
- return (OpResult.Success(), imported);
+ return new SchemeRefResult(OpResult.Success(), imported);
}
catch (Exception ex)
{
@@ -569,8 +457,8 @@ public sealed class PowerPlanService
Path = filePath,
ExceptionText = ex.Message,
};
- _logger.LogWarning(ex, "PowerImportPowerScheme threw for {Path}", filePath);
- return (OpResult.Fail(err.Describe(), ex.ToString()), null);
+ logger?.LogWarning(ex, "PowerImportPowerScheme threw for {Path}", filePath);
+ return new SchemeRefResult(OpResult.Fail(err.Describe(), ex.ToString()), null);
}
finally
{
@@ -581,11 +469,47 @@ public sealed class PowerPlanService
}
}
- public (OpResult Result, Guid? SchemeId) DuplicateScheme(OpCall call, Guid sourceId)
+ /// <summary>
+ /// Atomic install: capture previous, import file, activate. Returns the
+ /// installed and previous ids together so the caller records revert once.
+ /// Import and activation failures stay distinguishable by operation name.
+ /// </summary>
+ public virtual async Task<InstallResult> InstallSchemeAsync(
+ string filePath,
+ Guid destinationId,
+ ILogger? logger = null,
+ CancellationToken ct = default
+ )
{
- ArgumentNullException.ThrowIfNull(call);
- var description = ServiceStrings.Format("Duplicate power plan {0}", sourceId);
+ ct.ThrowIfCancellationRequested();
+ var previous = GetActiveSchemeId();
+ if (previous is null)
+ {
+ const string error = "Could not read the active power plan; refusing to install.";
+ logger?.LogError("Refusing power-plan install: active scheme unreadable");
+ return new InstallResult(OpResult.Fail(error, error), null, null);
+ }
+
+ var import = await ImportSchemeAsync(filePath, destinationId, logger, ct)
+ .ConfigureAwait(false);
+ if (!import.Result.Ok || import.SchemeId is null)
+ return new InstallResult(import.Result, null, previous);
+
+ var activation = SetActiveScheme(import.SchemeId.Value, logger);
+ if (!activation.Result.Ok)
+ return new InstallResult(activation.Result, import.SchemeId, previous);
+
+ logger?.LogInformation(
+ "Installed power plan {InstalledId} (previous {PreviousId})",
+ import.SchemeId,
+ previous
+ );
+ return new InstallResult(OpResult.Success(), import.SchemeId, previous);
+ }
+
+ public virtual SchemeRefResult DuplicateScheme(Guid sourceId, ILogger? logger = null)
+ {
IntPtr ppGuid = IntPtr.Zero;
try
{
@@ -609,25 +533,15 @@ public sealed class PowerPlanService
SchemeId = sourceId,
ErrorCode = code,
};
- _logger.LogWarning(
+ logger?.LogWarning(
"PowerDuplicateScheme failed for {SchemeId}: Win32 {ErrorCode}",
sourceId,
code
);
- call.Changes.Add(
- ServiceStrings.PowerPlanName,
- description,
- false,
- null,
- err.Describe(),
- err.Describe(),
- retryCall => Task.FromResult(DuplicateScheme(retryCall, sourceId).Result)
- );
- return (OpResult.Fail(err.Describe(), err.Describe()), null);
+ return new SchemeRefResult(OpResult.Fail(err.Describe(), err.Describe()), null);
}
- call.Changes.Add(ServiceStrings.PowerPlanName, description, true);
- return (OpResult.Success(), duplicated);
+ return new SchemeRefResult(OpResult.Success(), duplicated);
}
catch (Exception ex)
{
@@ -637,17 +551,8 @@ public sealed class PowerPlanService
SchemeId = sourceId,
ExceptionText = ex.Message,
};
- call.Logger.LogWarning(ex, "PowerDuplicateScheme threw for {SchemeId}", sourceId);
- call.Changes.Add(
- ServiceStrings.PowerPlanName,
- description,
- false,
- null,
- err.Describe(),
- ex.ToString(),
- retryCall => Task.FromResult(DuplicateScheme(retryCall, sourceId).Result)
- );
- return (OpResult.Fail(err.Describe(), ex.ToString()), null);
+ logger?.LogWarning(ex, "PowerDuplicateScheme threw for {SchemeId}", sourceId);
+ return new SchemeRefResult(OpResult.Fail(err.Describe(), ex.ToString()), null);
}
finally
{
@@ -656,11 +561,8 @@ public sealed class PowerPlanService
}
}
- public OpResult SetSchemeName(OpCall call, Guid schemeId, string name)
+ public OpResult SetSchemeName(Guid schemeId, string name, ILogger? logger = null)
{
- ArgumentNullException.ThrowIfNull(call);
- var description = ServiceStrings.Format("Rename power plan {0}", schemeId);
-
var bytes = Encoding.Unicode.GetBytes(name + '\0');
IntPtr buffer = IntPtr.Zero;
try
@@ -677,26 +579,12 @@ public sealed class PowerPlanService
(uint)bytes.Length
);
if (code != ERROR_SUCCESS)
- return FailTextWrite(
- call,
- description,
- nameof(PowerWriteFriendlyName),
- schemeId,
- code
- );
- call.Changes.Add(ServiceStrings.PowerPlanName, description, true);
+ return FailTextWrite(nameof(PowerWriteFriendlyName), schemeId, code, null, logger);
return OpResult.Success();
}
catch (Exception ex)
{
- return FailTextWrite(
- call,
- description,
- nameof(PowerWriteFriendlyName),
- schemeId,
- null,
- ex
- );
+ return FailTextWrite(nameof(PowerWriteFriendlyName), schemeId, null, ex, logger);
}
finally
{
@@ -705,11 +593,12 @@ public sealed class PowerPlanService
}
}
- public OpResult SetSchemeDescription(OpCall call, Guid schemeId, string descriptionText)
+ public OpResult SetSchemeDescription(
+ Guid schemeId,
+ string descriptionText,
+ ILogger? logger = null
+ )
{
- ArgumentNullException.ThrowIfNull(call);
- var description = ServiceStrings.Format("Re-describe power plan {0}", schemeId);
-
var bytes = Encoding.Unicode.GetBytes(descriptionText + '\0');
IntPtr buffer = IntPtr.Zero;
try
@@ -726,26 +615,12 @@ public sealed class PowerPlanService
(uint)bytes.Length
);
if (code != ERROR_SUCCESS)
- return FailTextWrite(
- call,
- description,
- nameof(PowerWriteDescription),
- schemeId,
- code
- );
- call.Changes.Add(ServiceStrings.PowerPlanName, description, true);
+ return FailTextWrite(nameof(PowerWriteDescription), schemeId, code, null, logger);
return OpResult.Success();
}
catch (Exception ex)
{
- return FailTextWrite(
- call,
- description,
- nameof(PowerWriteDescription),
- schemeId,
- null,
- ex
- );
+ return FailTextWrite(nameof(PowerWriteDescription), schemeId, null, ex, logger);
}
finally
{
@@ -755,12 +630,11 @@ public sealed class PowerPlanService
}
private static OpResult FailTextWrite(
- OpCall call,
- string description,
string operation,
Guid schemeId,
uint? code,
- Exception? ex = null
+ Exception? ex,
+ ILogger? logger
)
{
var err = new PowerPlanError
@@ -771,13 +645,12 @@ public sealed class PowerPlanService
ExceptionText = ex?.Message,
};
var detail = ex?.ToString() ?? err.Describe();
- call.Changes.Add(
- ServiceStrings.PowerPlanName,
- description,
- false,
- null,
- err.Describe(),
- detail
+ logger?.LogWarning(
+ ex,
+ "{Operation} failed for {SchemeId}: {Detail}",
+ operation,
+ schemeId,
+ err.Describe()
);
return OpResult.Fail(err.Describe(), detail);
}
diff --git a/optimizerDuck/Services/System/Primitives/PowerPlanChanges.cs b/optimizerDuck/Services/System/Primitives/PowerPlanChanges.cs
new file mode 100644
index 0000000..0fa1ee3
--- /dev/null
+++ b/optimizerDuck/Services/System/Primitives/PowerPlanChanges.cs
@@ -0,0 +1,181 @@
+using optimizerDuck.Domain.Execution;
+using optimizerDuck.Domain.Optimizations.Models.Power;
+using optimizerDuck.Domain.Revert.Steps;
+
+namespace optimizerDuck.Services.System.Primitives;
+
+/// <summary>
+/// Optimization-edge recorder for lean <see cref="PowerPlanService"/> results:
+/// the single place turning a finished native call into a <see cref="Change"/>
+/// with revert step and retry. Categories call here, never hand-roll steps.
+/// Tools call the service directly and skip this entirely.
+/// </summary>
+public static class PowerPlanChanges
+{
+ public static OpResult Activate(
+ OpCall call,
+ PowerPlanService plans,
+ Guid schemeId,
+ Guid? installedSchemeId = null
+ )
+ {
+ ArgumentNullException.ThrowIfNull(call);
+ ArgumentNullException.ThrowIfNull(plans);
+
+ var name = plans.GetSchemeName(schemeId) ?? schemeId.ToString();
+ var activation = plans.SetActiveScheme(schemeId, call.Logger);
+ var result = activation.Result;
+ var previousId = activation.PreviousSchemeId;
+ if (!result.Ok)
+ {
+ call.Changes.Add(
+ ServiceStrings.PowerPlanName,
+ ServiceStrings.Format("Activate power plan {0}", name),
+ false,
+ null,
+ result.Error,
+ result.ErrorDetail,
+ retryCall =>
+ Task.FromResult(Activate(retryCall, plans, schemeId, installedSchemeId))
+ );
+ return result;
+ }
+
+ if (previousId is null || previousId.Value == schemeId)
+ {
+ call.Changes.Add(
+ ServiceStrings.PowerPlanName,
+ ServiceStrings.Format("Power plan {0} already active (skipped)", name),
+ true
+ );
+ return OpResult.Success();
+ }
+
+ var step = new PowerPlanRevertStep
+ {
+ PreviousSchemeId = previousId.Value,
+ InstalledSchemeId = installedSchemeId ?? Guid.Empty,
+ };
+ call.Changes.Add(
+ ServiceStrings.PowerPlanName,
+ ServiceStrings.Format("Activate power plan {0}", name),
+ true,
+ step
+ );
+ return OpResult.Success(step);
+ }
+
+ public static async Task<InstallResult> InstallAsync(
+ OpCall call,
+ PowerPlanService plans,
+ string filePath,
+ Guid destinationId,
+ CancellationToken ct = default
+ )
+ {
+ ArgumentNullException.ThrowIfNull(call);
+ ArgumentNullException.ThrowIfNull(plans);
+
+ var install = await plans
+ .InstallSchemeAsync(filePath, destinationId, call.Logger, ct)
+ .ConfigureAwait(false);
+ if (!install.Result.Ok || install.InstalledId is null || install.PreviousId is null)
+ {
+ call.Changes.Add(
+ ServiceStrings.PowerPlanName,
+ ServiceStrings.Format("Install power plan {0}", destinationId),
+ false,
+ null,
+ install.Result.Error,
+ install.Result.ErrorDetail,
+ async retryCall =>
+ (
+ await InstallAsync(retryCall, plans, filePath, destinationId, ct)
+ .ConfigureAwait(false)
+ ).Result
+ );
+ return install;
+ }
+
+ var name = plans.GetSchemeName(install.InstalledId.Value) ?? install.InstalledId.ToString();
+ var step = new PowerPlanRevertStep
+ {
+ PreviousSchemeId = install.PreviousId.Value,
+ InstalledSchemeId = install.InstalledId.Value,
+ };
+ call.Changes.Add(
+ ServiceStrings.PowerPlanName,
+ ServiceStrings.Format("Install power plan {0}", name),
+ true,
+ step
+ );
+ return new InstallResult(OpResult.Success(step), install.InstalledId, install.PreviousId);
+ }
+
+ public static OpResult WriteSetting(
+ OpCall call,
+ PowerPlanService plans,
+ Guid schemeId,
+ Guid subgroupId,
+ Guid settingId,
+ uint? acValue,
+ uint? dcValue
+ )
+ {
+ ArgumentNullException.ThrowIfNull(call);
+ ArgumentNullException.ThrowIfNull(plans);
+
+ var description = ServiceStrings.Format(
+ "Write power setting {0}/{1}/{2}",
+ schemeId,
+ subgroupId,
+ settingId
+ );
+ var write = plans.SetSetting(
+ schemeId,
+ subgroupId,
+ settingId,
+ acValue,
+ dcValue,
+ call.Logger
+ );
+ var result = write.Result;
+ var prevAc = write.PreviousAcValue;
+ var prevDc = write.PreviousDcValue;
+ if (!result.Ok || prevAc is null || prevDc is null)
+ {
+ call.Changes.Add(
+ ServiceStrings.PowerPlanName,
+ description,
+ false,
+ null,
+ result.Error,
+ result.ErrorDetail,
+ retryCall =>
+ Task.FromResult(
+ WriteSetting(
+ retryCall,
+ plans,
+ schemeId,
+ subgroupId,
+ settingId,
+ acValue,
+ dcValue
+ )
+ )
+ );
+ return result;
+ }
+
+ var step = new PowerSettingRevertStep
+ {
+ SchemeId = schemeId,
+ SubgroupId = subgroupId,
+ SettingId = settingId,
+ PreviousAcValue = prevAc.Value,
+ PreviousDcValue = prevDc.Value,
+ };
+ call.Changes.Add(ServiceStrings.PowerPlanName, description, true, step);
+ return OpResult.Success(step);
+ }
+}
diff --git a/optimizerDuck/Services/Optimization/Providers/ProcessRunner.cs b/optimizerDuck/Services/System/Primitives/ProcessRunner.cs
similarity index 99%
rename from optimizerDuck/Services/Optimization/Providers/ProcessRunner.cs
rename to optimizerDuck/Services/System/Primitives/ProcessRunner.cs
index e1114f1..3f30077 100644
--- a/optimizerDuck/Services/Optimization/Providers/ProcessRunner.cs
+++ b/optimizerDuck/Services/System/Primitives/ProcessRunner.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using optimizerDuck.Domain.Configuration;
-namespace optimizerDuck.Services.Optimization.Providers;
+namespace optimizerDuck.Services.System.Primitives;
/// <summary>
/// The captured output of a single child-process execution.
diff --git a/optimizerDuck/Services/Optimization/Providers/RegistryService.cs b/optimizerDuck/Services/System/Primitives/RegistryService.cs
similarity index 99%
rename from optimizerDuck/Services/Optimization/Providers/RegistryService.cs
rename to optimizerDuck/Services/System/Primitives/RegistryService.cs
index f9e5955..e1dfa6f 100644
--- a/optimizerDuck/Services/Optimization/Providers/RegistryService.cs
+++ b/optimizerDuck/Services/System/Primitives/RegistryService.cs
@@ -8,7 +8,7 @@ using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.Revert.Steps;
-namespace optimizerDuck.Services.Optimization.Providers;
+namespace optimizerDuck.Services.System.Primitives;
public static class RegistryService
{
diff --git a/optimizerDuck/Services/Optimization/Providers/ScheduledTaskService.cs b/optimizerDuck/Services/System/Primitives/ScheduledTaskService.cs
similarity index 99%
rename from optimizerDuck/Services/Optimization/Providers/ScheduledTaskService.cs
rename to optimizerDuck/Services/System/Primitives/ScheduledTaskService.cs
index b86aa66..1828f5e 100644
--- a/optimizerDuck/Services/Optimization/Providers/ScheduledTaskService.cs
+++ b/optimizerDuck/Services/System/Primitives/ScheduledTaskService.cs
@@ -11,7 +11,7 @@ using optimizerDuck.Services.UI;
using ScheduledTaskModel = optimizerDuck.Domain.Optimizations.Models.ScheduledTask.ScheduledTaskModel;
using Task = Microsoft.Win32.TaskScheduler.Task;
-namespace optimizerDuck.Services.Optimization.Providers;
+namespace optimizerDuck.Services.System.Primitives;
public static class ScheduledTaskService
{
diff --git a/optimizerDuck/Services/Optimization/Providers/ServiceProcessService.cs b/optimizerDuck/Services/System/Primitives/ServiceProcessService.cs
similarity index 99%
rename from optimizerDuck/Services/Optimization/Providers/ServiceProcessService.cs
rename to optimizerDuck/Services/System/Primitives/ServiceProcessService.cs
index df762cf..3810d40 100644
--- a/optimizerDuck/Services/Optimization/Providers/ServiceProcessService.cs
+++ b/optimizerDuck/Services/System/Primitives/ServiceProcessService.cs
@@ -6,7 +6,7 @@ using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.Revert.Steps;
-namespace optimizerDuck.Services.Optimization.Providers;
+namespace optimizerDuck.Services.System.Primitives;
public static class ServiceProcessService
{
diff --git a/optimizerDuck/Services/Optimization/Providers/ServiceStrings.cs b/optimizerDuck/Services/System/Primitives/ServiceStrings.cs
similarity index 98%
rename from optimizerDuck/Services/Optimization/Providers/ServiceStrings.cs
rename to optimizerDuck/Services/System/Primitives/ServiceStrings.cs
index 0b3944a..5676349 100644
--- a/optimizerDuck/Services/Optimization/Providers/ServiceStrings.cs
+++ b/optimizerDuck/Services/System/Primitives/ServiceStrings.cs
@@ -1,6 +1,6 @@
using System.Globalization;
-namespace optimizerDuck.Services.Optimization.Providers;
+namespace optimizerDuck.Services.System.Primitives;
/// <summary>
/// English-only provider strings: step names, step descriptions and log/error text.
diff --git a/optimizerDuck/Services/Optimization/Providers/ShellMapping.cs b/optimizerDuck/Services/System/Primitives/ShellMapping.cs
similarity index 96%
rename from optimizerDuck/Services/Optimization/Providers/ShellMapping.cs
rename to optimizerDuck/Services/System/Primitives/ShellMapping.cs
index 508ba3d..4fce11b 100644
--- a/optimizerDuck/Services/Optimization/Providers/ShellMapping.cs
+++ b/optimizerDuck/Services/System/Primitives/ShellMapping.cs
@@ -1,7 +1,7 @@
using optimizerDuck.Common.Extensions;
using optimizerDuck.Domain.Optimizations.Models.Services;
-namespace optimizerDuck.Services.Optimization.Providers;
+namespace optimizerDuck.Services.System.Primitives;
/// <summary>
/// Shared mapping between <see cref="ProcessResult"/> and <see cref="ShellResult"/>
diff --git a/optimizerDuck/Services/Optimization/Providers/ShellService.cs b/optimizerDuck/Services/System/Primitives/ShellService.cs
similarity index 99%
rename from optimizerDuck/Services/Optimization/Providers/ShellService.cs
rename to optimizerDuck/Services/System/Primitives/ShellService.cs
index fed8c3a..0b4cce8 100644
--- a/optimizerDuck/Services/Optimization/Providers/ShellService.cs
+++ b/optimizerDuck/Services/System/Primitives/ShellService.cs
@@ -6,7 +6,7 @@ using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.Revert.Steps;
using optimizerDuck.Services.Configuration;
-namespace optimizerDuck.Services.Optimization.Providers;
+namespace optimizerDuck.Services.System.Primitives;
/// <summary>
/// Thin instance facade over <see cref="ProcessRunner"/>: builds the
diff --git a/optimizerDuck/Services/System/StreamService.cs b/optimizerDuck/Services/System/StreamService.cs
index a54b7ea..bf5921f 100644
--- a/optimizerDuck/Services/System/StreamService.cs
+++ b/optimizerDuck/Services/System/StreamService.cs
@@ -12,16 +12,14 @@ public class StreamService(ILogger<StreamService> logger) : IDisposable
/// <summary>Downloads a file from the specified URL and saves it to the local downloads directory.</summary>
/// <param name="url">The URL to download from.</param>
/// <param name="fileName">The target file name (not path) to save as.</param>
- /// <returns>A tuple where <c>Success</c> indicates whether the download completed, and <c>FilePath</c> is the full local path on success.</returns>
+ /// <returns>A <see cref="DownloadResult"/> where <c>Ok</c> indicates whether the download completed, and <c>FilePath</c> is the full local path on success.</returns>
/// <example>
/// <code language="csharp">
- /// var (success, path) = await streamService.TryDownloadAsync("https://example.com/file.zip", "file.zip");
+ /// var download = await streamService.TryDownloadAsync("https://example.com/file.zip", "file.zip");
+ /// if (download.Ok) Console.WriteLine(download.FilePath);
/// </code>
/// </example>
- public async Task<(bool Success, string? FilePath)> TryDownloadAsync(
- string url,
- string fileName
- )
+ public async Task<DownloadResult> TryDownloadAsync(string url, string fileName)
{
var filePath = Path.Combine(Shared.DownloadsDirectory, fileName);
@@ -53,27 +51,27 @@ public class StreamService(ILogger<StreamService> logger) : IDisposable
filePath
);
- return (true, filePath);
+ return new DownloadResult(true, filePath);
}
catch (HttpRequestException ex)
{
logger.LogError(ex, "Network error while downloading {Url}", url);
- return (false, null);
+ return new DownloadResult(false, null);
}
catch (IOException ex)
{
logger.LogError(ex, "File I/O error while saving {FilePath}", filePath);
- return (false, null);
+ return new DownloadResult(false, null);
}
catch (UnauthorizedAccessException ex)
{
logger.LogError(ex, "Access denied when writing to {FilePath}", filePath);
- return (false, null);
+ return new DownloadResult(false, null);
}
catch (Exception ex)
{
logger.LogError(ex, "Unexpected error downloading {Url} to {FilePath}", url, filePath);
- return (false, null);
+ return new DownloadResult(false, null);
}
}
diff --git a/optimizerDuck/Services/UI/BloatwareService.cs b/optimizerDuck/Services/UI/BloatwareService.cs
index b73d956..2c527dc 100644
--- a/optimizerDuck/Services/UI/BloatwareService.cs
+++ b/optimizerDuck/Services/UI/BloatwareService.cs
@@ -9,7 +9,7 @@ using Microsoft.Extensions.Options;
using optimizerDuck.Common.Helpers;
using optimizerDuck.Domain.Configuration;
using optimizerDuck.Domain.Optimizations.Models.Bloatware;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using AppXPackage = optimizerDuck.Domain.Optimizations.Models.Bloatware.AppXPackage;
using JsonSerializer = System.Text.Json.JsonSerializer;
diff --git a/optimizerDuck/Services/UI/DiskCleanupService.cs b/optimizerDuck/Services/UI/DiskCleanupService.cs
index 93d5861..fb30e29 100644
--- a/optimizerDuck/Services/UI/DiskCleanupService.cs
+++ b/optimizerDuck/Services/UI/DiskCleanupService.cs
@@ -2,7 +2,7 @@ using System.IO;
using Microsoft.Extensions.Logging;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using Wpf.Ui.Controls;
using CleanupItem = optimizerDuck.Domain.Optimizations.Models.Cleanup.CleanupItem;
diff --git a/optimizerDuck/Services/UI/StartupManagerService.cs b/optimizerDuck/Services/UI/StartupManagerService.cs
index 47ff977..6676356 100644
--- a/optimizerDuck/Services/UI/StartupManagerService.cs
+++ b/optimizerDuck/Services/UI/StartupManagerService.cs
@@ -11,7 +11,7 @@ using Microsoft.Extensions.Logging;
using Microsoft.Win32;
using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models.StartupManager;
-using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.System.Primitives;
using Windows.ApplicationModel;
using Windows.Management.Deployment;
using StartupApp = optimizerDuck.Domain.Optimizations.Models.StartupManager.StartupApp;
diff --git a/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs
index 2aa5d79..b9772ee 100644
--- a/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/ScheduledTasksViewModel.cs
@@ -7,8 +7,8 @@ using Microsoft.Extensions.Logging;
using optimizerDuck.Domain.Execution;
using optimizerDuck.Resources.Languages;
using optimizerDuck.Services.Configuration;
-using optimizerDuck.Services.Optimization.Providers;
using optimizerDuck.Services.System;
+using optimizerDuck.Services.System.Primitives;
using optimizerDuck.UI.Dialogs;
using Wpf.Ui;
using Wpf.Ui.Controls;