mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-04 10:16:24 +02:00
## Summary of the Pull Request Extracts persistence (load/save) logic from `SettingsModel` and `AppStateModel` into dedicated service classes, following the single-responsibility principle. Consumers now interact with `ISettingsService` and `IAppStateService` instead of receiving raw model objects through DI. **New services introduced:** - `IPersistenceService` / `PersistenceService` — generic `Load<T>` / `Save<T>` with AOT-compatible `JsonTypeInfo<T>`, ensures target directory exists before writing - `ISettingsService` / `SettingsService` — loads settings on construction, runs migrations, exposes `Settings` property and `SettingsChanged` event - `IAppStateService` / `AppStateService` — loads state on construction, exposes `State` property and `StateChanged` event **Key changes:** - `SettingsModel` and `AppStateModel` are now pure data models — all file I/O, migration, and directory management removed - Raw `SettingsModel` and `AppStateModel` removed from DI container; consumers receive the appropriate service - `IApplicationInfoService.ConfigDirectory` injected into services for config path resolution (no more hardcoded `Utilities.BaseSettingsPath`) - ~30 consumer files updated across `Microsoft.CmdPal.UI.ViewModels` and `Microsoft.CmdPal.UI` projects - All `#pragma warning disable SA1300` suppressions removed — convenience accessors replaced with direct `_settingsService.Settings` / `_appStateService.State` access - Namespace prefixes (`Services.ISettingsService`) replaced with proper `using` directives ## PR Checklist - [ ] **Communication:** I've discussed this with core contributors already. - [x] **Tests:** Added/updated and all pass - [ ] **Localization:** N/A — no end-user-facing strings changed - [ ] **Dev docs:** N/A — internal refactor, no public API changes - [ ] **New binaries:** N/A — no new binaries introduced ## Detailed Description of the Pull Request / Additional comments ### Architecture Services are registered as singletons in `App.xaml.cs`: ```csharp services.AddSingleton<IPersistenceService, PersistenceService>(); services.AddSingleton<ISettingsService, SettingsService>(); services.AddSingleton<IAppStateService, AppStateService>(); ``` `PersistenceService.Save<T>` writes the serialized model directly to disk, creating the target directory if it doesn't exist. It also does not attempt to merge existing and new settings/state. `SettingsService` runs hotkey migrations on load and raises `SettingsChanged` after saves. `AppStateService` always raises `StateChanged` after saves. ### Files changed (41 files, +1169/−660) | Area | Files | What changed | |------|-------|-------------| | New services | `Services/IPersistenceService.cs`, `PersistenceService.cs`, `ISettingsService.cs`, `SettingsService.cs`, `IAppStateService.cs`, `AppStateService.cs` | New service interfaces and implementations | | Models | `SettingsModel.cs`, `AppStateModel.cs` | Stripped to pure data bags | | DI | `App.xaml.cs` | Service registration, removed raw model DI | | ViewModels | 12 files | Constructor injection of services | | UI | 10 files | Service injection replacing model access | | Settings | `DockSettings.cs` | `Colors.Transparent` replaced with struct literal to avoid WinUI3 COM dependency | | Tests | `PersistenceServiceTests.cs`, `SettingsServiceTests.cs`, `AppStateServiceTests.cs` | 38 unit tests covering all three services | | Config | `.gitignore` | Added `.squad/`, `.github/agents/` exclusions | ## Validation Steps Performed - Built `Microsoft.CmdPal.UI` with MSBuild (x64/Debug) — exit code 0, clean build - Ran 38 unit tests via `vstest.console.exe` — all passing - Verified no remaining `#pragma warning disable SA1300` blocks - Verified no remaining `Services.` namespace prefixes --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
326 lines
12 KiB
C#
326 lines
12 KiB
C#
// Copyright (c) Microsoft Corporation
|
|
// The Microsoft Corporation licenses this file to you under the MIT license.
|
|
// See the LICENSE file in the project root for more information.
|
|
|
|
using CommunityToolkit.Mvvm.Messaging;
|
|
using ManagedCommon;
|
|
using Microsoft.CmdPal.UI.ViewModels;
|
|
using Microsoft.CmdPal.UI.ViewModels.Messages;
|
|
using Microsoft.CmdPal.UI.ViewModels.Services;
|
|
using Microsoft.CmdPal.UI.ViewModels.Settings;
|
|
using Microsoft.CommandPalette.Extensions;
|
|
using Microsoft.CommandPalette.Extensions.Toolkit;
|
|
using RS_ = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance;
|
|
|
|
namespace Microsoft.CmdPal.UI;
|
|
|
|
internal sealed partial class CommandPaletteContextMenuFactory : IContextMenuFactory
|
|
{
|
|
private readonly ISettingsService _settingsService;
|
|
private readonly TopLevelCommandManager _topLevelCommandManager;
|
|
|
|
public CommandPaletteContextMenuFactory(ISettingsService settingsService, TopLevelCommandManager topLevelCommandManager)
|
|
{
|
|
_settingsService = settingsService;
|
|
_topLevelCommandManager = topLevelCommandManager;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Constructs the view models for the MoreCommands of a
|
|
/// CommandItemViewModel. In our case, we can use our settings to add a
|
|
/// contextually-relevant pin/unpin command to this item.
|
|
///
|
|
/// This is called on all CommandItemViewModels. There are however some
|
|
/// weird edge cases we need to handle, concerning
|
|
/// </summary>
|
|
public List<IContextItemViewModel> UnsafeBuildAndInitMoreCommands(
|
|
IContextItem[] items,
|
|
CommandItemViewModel commandItem)
|
|
{
|
|
var results = DefaultContextMenuFactory.Instance.UnsafeBuildAndInitMoreCommands(items, commandItem);
|
|
|
|
IPageContext? page = null;
|
|
var succeeded = commandItem.PageContext.TryGetTarget(out page);
|
|
if (!succeeded || page is null)
|
|
{
|
|
return results;
|
|
}
|
|
|
|
var isTopLevelItem = page is TopLevelItemPageContext;
|
|
if (isTopLevelItem)
|
|
{
|
|
// Bail early. We'll handle it below.
|
|
return results;
|
|
}
|
|
|
|
List<IContextItem> moreCommands = [];
|
|
var itemId = commandItem.Command.Id;
|
|
var providerContext = page.ProviderContext;
|
|
var supportsPinning = providerContext.SupportsPinning;
|
|
|
|
if (supportsPinning &&
|
|
!string.IsNullOrEmpty(itemId))
|
|
{
|
|
// Add pin/unpin commands for pinning items to the top-level or to
|
|
// the dock.
|
|
var providerId = providerContext.ProviderId;
|
|
if (_topLevelCommandManager.LookupProvider(providerId) is CommandProviderWrapper provider)
|
|
{
|
|
var providerSettings = _settingsService.Settings.GetProviderSettings(provider);
|
|
|
|
var alreadyPinnedToTopLevel = providerSettings.PinnedCommandIds.Contains(itemId);
|
|
|
|
// Don't add pin/unpin commands for items displayed as
|
|
// TopLevelViewModels that aren't already pinned.
|
|
//
|
|
// We can't look up if this command item is in the top level
|
|
// items in the manager, because we are being called _before_ we
|
|
// get added to the manager's list of commands.
|
|
if (!isTopLevelItem || alreadyPinnedToTopLevel)
|
|
{
|
|
var pinToTopLevelCommand = new PinToCommand(
|
|
commandId: itemId,
|
|
providerId: providerId,
|
|
pin: !alreadyPinnedToTopLevel,
|
|
PinLocation.TopLevel,
|
|
_settingsService,
|
|
_topLevelCommandManager);
|
|
|
|
var contextItem = new PinToContextItem(pinToTopLevelCommand, commandItem);
|
|
moreCommands.Add(contextItem);
|
|
}
|
|
|
|
TryAddPinToDockCommand(providerSettings, itemId, providerId, moreCommands, commandItem);
|
|
}
|
|
}
|
|
|
|
if (moreCommands.Count > 0)
|
|
{
|
|
moreCommands.Insert(0, new Separator());
|
|
var moreResults = DefaultContextMenuFactory.Instance.UnsafeBuildAndInitMoreCommands(moreCommands.ToArray(), commandItem);
|
|
results.AddRange(moreResults);
|
|
}
|
|
|
|
return results;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Called to create the context menu on TopLevelViewModels.
|
|
///
|
|
/// These are handled differently from everyone else. With
|
|
/// TopLevelViewModels, the ID isn't on the Command, it is on the
|
|
/// TopLevelViewModel itself. Basically, we can't figure out how to add
|
|
/// pin/unpin commands directly attached to the ICommandItems that we get
|
|
/// from the API.
|
|
///
|
|
/// Instead, this method is used to extend the set of IContextItems that are
|
|
/// added to the TopLevelViewModel itself. This lets us pin/unpin the
|
|
/// generated ID of the TopLevelViewModel, even if the command didn't have
|
|
/// one.
|
|
/// </summary>
|
|
public void AddMoreCommandsToTopLevel(
|
|
TopLevelViewModel topLevelItem,
|
|
ICommandProviderContext providerContext,
|
|
List<IContextItem?> contextItems)
|
|
{
|
|
var itemId = topLevelItem.Id;
|
|
var supportsPinning = providerContext.SupportsPinning;
|
|
List<IContextItem> moreCommands = [];
|
|
var commandItem = topLevelItem.ItemViewModel;
|
|
|
|
// Add pin/unpin commands for pinning items to the top-level or to
|
|
// the dock.
|
|
var providerId = providerContext.ProviderId;
|
|
if (_topLevelCommandManager.LookupProvider(providerId) is CommandProviderWrapper provider)
|
|
{
|
|
var providerSettings = _settingsService.Settings.GetProviderSettings(provider);
|
|
|
|
var isPinnedSubCommand = providerSettings.PinnedCommandIds.Contains(itemId);
|
|
if (isPinnedSubCommand)
|
|
{
|
|
var pinToTopLevelCommand = new PinToCommand(
|
|
commandId: itemId,
|
|
providerId: providerId,
|
|
pin: !isPinnedSubCommand,
|
|
PinLocation.TopLevel,
|
|
_settingsService,
|
|
_topLevelCommandManager);
|
|
|
|
var contextItem = new PinToContextItem(pinToTopLevelCommand, commandItem);
|
|
moreCommands.Add(contextItem);
|
|
}
|
|
|
|
TryAddPinToDockCommand(providerSettings, itemId, providerId, moreCommands, commandItem);
|
|
}
|
|
|
|
if (moreCommands.Count > 0)
|
|
{
|
|
moreCommands.Insert(0, new Separator());
|
|
|
|
// var moreResults = DefaultContextMenuFactory.Instance.UnsafeBuildAndInitMoreCommands(moreCommands.ToArray(), commandItem);
|
|
contextItems.AddRange(moreCommands);
|
|
}
|
|
}
|
|
|
|
private void TryAddPinToDockCommand(
|
|
ProviderSettings providerSettings,
|
|
string itemId,
|
|
string providerId,
|
|
List<IContextItem> moreCommands,
|
|
CommandItemViewModel commandItem)
|
|
{
|
|
if (!_settingsService.Settings.EnableDock)
|
|
{
|
|
return;
|
|
}
|
|
|
|
var inStartBands = _settingsService.Settings.DockSettings.StartBands.Any(band => MatchesBand(band, itemId, providerId));
|
|
var inCenterBands = _settingsService.Settings.DockSettings.CenterBands.Any(band => MatchesBand(band, itemId, providerId));
|
|
var inEndBands = _settingsService.Settings.DockSettings.EndBands.Any(band => MatchesBand(band, itemId, providerId));
|
|
var alreadyPinned = inStartBands || inCenterBands || inEndBands; /** &&
|
|
_settingsService.Settings.DockSettings.PinnedCommands.Contains(this.Id)**/
|
|
var pinToTopLevelCommand = new PinToCommand(
|
|
commandId: itemId,
|
|
providerId: providerId,
|
|
pin: !alreadyPinned,
|
|
PinLocation.Dock,
|
|
_settingsService,
|
|
_topLevelCommandManager);
|
|
|
|
var contextItem = new PinToContextItem(pinToTopLevelCommand, commandItem);
|
|
moreCommands.Add(contextItem);
|
|
}
|
|
|
|
internal static bool MatchesBand(DockBandSettings bandSettings, string commandId, string providerId)
|
|
{
|
|
return bandSettings.CommandId == commandId &&
|
|
bandSettings.ProviderId == providerId;
|
|
}
|
|
|
|
internal enum PinLocation
|
|
{
|
|
TopLevel,
|
|
Dock,
|
|
}
|
|
|
|
private sealed partial class PinToContextItem : CommandContextItem
|
|
{
|
|
private readonly PinToCommand _command;
|
|
private readonly CommandItemViewModel _commandItem;
|
|
|
|
public PinToContextItem(PinToCommand command, CommandItemViewModel commandItem)
|
|
: base(command)
|
|
{
|
|
_command = command;
|
|
_commandItem = commandItem;
|
|
command.PinStateChanged += this.OnPinStateChanged;
|
|
}
|
|
|
|
private void OnPinStateChanged(object? sender, EventArgs e)
|
|
{
|
|
// update our MoreCommands
|
|
_commandItem.RefreshMoreCommands();
|
|
}
|
|
|
|
~PinToContextItem()
|
|
{
|
|
_command.PinStateChanged -= this.OnPinStateChanged;
|
|
}
|
|
}
|
|
|
|
private sealed partial class PinToCommand : InvokableCommand
|
|
{
|
|
private readonly string _commandId;
|
|
private readonly string _providerId;
|
|
private readonly ISettingsService _settingsService;
|
|
private readonly TopLevelCommandManager _topLevelCommandManager;
|
|
private readonly bool _pin;
|
|
private readonly PinLocation _pinLocation;
|
|
|
|
private bool IsPinToDock => _pinLocation == PinLocation.Dock;
|
|
|
|
public override IconInfo Icon => _pin ? Icons.PinIcon : Icons.UnpinIcon;
|
|
|
|
public override string Name => _pin ?
|
|
(IsPinToDock ? RS_.GetString("dock_pin_command_name") : RS_.GetString("top_level_pin_command_name")) :
|
|
(IsPinToDock ? RS_.GetString("dock_unpin_command_name") : RS_.GetString("top_level_unpin_command_name"));
|
|
|
|
internal event EventHandler? PinStateChanged;
|
|
|
|
public PinToCommand(
|
|
string commandId,
|
|
string providerId,
|
|
bool pin,
|
|
PinLocation pinLocation,
|
|
ISettingsService settingsService,
|
|
TopLevelCommandManager topLevelCommandManager)
|
|
{
|
|
_commandId = commandId;
|
|
_providerId = providerId;
|
|
_pinLocation = pinLocation;
|
|
_settingsService = settingsService;
|
|
_topLevelCommandManager = topLevelCommandManager;
|
|
_pin = pin;
|
|
}
|
|
|
|
public override CommandResult Invoke()
|
|
{
|
|
Logger.LogDebug($"PinTo{_pinLocation}Command.Invoke({_pin}): {_providerId}/{_commandId}");
|
|
if (_pin)
|
|
{
|
|
switch (_pinLocation)
|
|
{
|
|
case PinLocation.TopLevel:
|
|
PinToTopLevel();
|
|
break;
|
|
|
|
case PinLocation.Dock:
|
|
PinToDock();
|
|
break;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
switch (_pinLocation)
|
|
{
|
|
case PinLocation.TopLevel:
|
|
UnpinFromTopLevel();
|
|
break;
|
|
|
|
case PinLocation.Dock:
|
|
UnpinFromDock();
|
|
break;
|
|
}
|
|
}
|
|
|
|
PinStateChanged?.Invoke(this, EventArgs.Empty);
|
|
|
|
return CommandResult.KeepOpen();
|
|
}
|
|
|
|
private void PinToTopLevel()
|
|
{
|
|
PinCommandItemMessage message = new(_providerId, _commandId);
|
|
WeakReferenceMessenger.Default.Send(message);
|
|
}
|
|
|
|
private void UnpinFromTopLevel()
|
|
{
|
|
UnpinCommandItemMessage message = new(_providerId, _commandId);
|
|
WeakReferenceMessenger.Default.Send(message);
|
|
}
|
|
|
|
private void PinToDock()
|
|
{
|
|
PinToDockMessage message = new(_providerId, _commandId, true);
|
|
WeakReferenceMessenger.Default.Send(message);
|
|
}
|
|
|
|
private void UnpinFromDock()
|
|
{
|
|
PinToDockMessage message = new(_providerId, _commandId, false);
|
|
WeakReferenceMessenger.Default.Send(message);
|
|
}
|
|
}
|
|
}
|