attempt to adopt the new settings manager

Author: davidegiacometti

src/modules/cmdpal/Exts/CmdPal.Ext.EdgeFavorites/Properties/launchSettings.json

@@ -0,0 +1,11 @@
+{
+  "profiles": {
+    "EverythingExtension (Package)": {
+        "commandName": "MsixPackage",
+        "commandLineArgs": "-RegisterProcessAsComServer"
+    },
+    "EverythingExtension (Unpackaged)": {
+        "commandName": "Project"
+    }
+  }
+}

src/modules/cmdpal/Exts/CmdPal.Ext.EdgeFavorites/SettingsManager.cs

@@ -0,0 +1,84 @@
+// 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 System;
+using System.Collections.Generic;
+using System.IO;
+using Community.PowerToys.Run.Plugin.EdgeFavorite.Core.Models;
+using Microsoft.CmdPal.Extensions.Helpers;
+
+namespace CmdPal.Ext.EdgeFavorites;
+
+internal sealed class SettingsManager : JsonSettingsManager
+{
+    private const string _namespace = "edgeFavorites";
+
+#nullable enable
+    private static SettingsManager? _instance;
+#nullable disable
+
+    private static string Namespaced(string propertyName) => $"{_namespace}.{propertyName}";
+
+    private readonly ToggleSetting _searchTree = new(
+        Namespaced(nameof(SearchTree)),
+        "Search as tree",
+        "Navigate the folder tree when searching (requires Command Palette restart).",
+        false);
+
+    public bool SearchTree => _searchTree.Value;
+
+    private readonly TextSetting _excludedProfiles = new(
+        Namespaced(nameof(ExcludedProfiles)),
+        "Excluded profiles",
+        "Prevents favorites from the specified profiles to be loaded. Add one profile per line.",
+        string.Empty);
+
+    public IReadOnlyCollection<string> ExcludedProfiles => _excludedProfiles.Value?.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries) ?? [];
+
+    private readonly ChoiceSetSetting _channel = new(
+        Namespaced(nameof(Channel)),
+        "Channel",
+        "Select the channel to use.",
+        [
+            new("Stable", "Stable"),
+            new("Beta", "Beta"),
+            new("Dev", "Dev"),
+            new("Canary", "Canary"),
+        ]);
+
+    public Channel Channel => Enum.TryParse(_channel.ToString(), out Channel channel) ? channel : Channel.Stable;
+
+    public SettingsManager()
+    {
+        FilePath = SettingsJsonPath();
+
+        Settings.Add(_searchTree);
+        Settings.Add(_excludedProfiles);
+        Settings.Add(_channel);
+
+        // Load settings from file upon initialization
+        LoadSettings();
+    }
+
+    internal static string SettingsJsonPath()
+    {
+        // Get the path to our exe
+        var path = System.Reflection.Assembly.GetExecutingAssembly().Location;
+
+        // Get the directory of the exe
+        var directory = Path.GetDirectoryName(path) ?? string.Empty;
+
+        // now, the state is just next to the exe
+        return Path.Combine(directory, "settings.json");
+    }
+
+    internal static SettingsManager Instance
+    {
+        get
+        {
+            _instance ??= new SettingsManager();
+            return _instance;
+        }
+    }
+}

src/modules/cmdpal/exts/CmdPal.Ext.EdgeFavorites/EdgeFavoritesCommandsProvider.cs

@@ -2,7 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using CmdPal.Ext.EdgeFavorites.Pages;
 using CmdPal.Ext.EdgeFavorites.Services;
 using Community.PowerToys.Run.Plugin.EdgeFavorite.Core;
@@ -15,41 +14,34 @@ namespace CmdPal.Ext.EdgeFavorites;
 public partial class EdgeFavoritesActionsProvider : CommandProvider
 {
     private readonly ILogger _logger;
-    private readonly SettingsRepository _settingsRepository;
     private readonly EdgeManager _edgeManager;
     private readonly ProfileManager _profileManager;
     private readonly FavoriteQuery _favoriteQuery;
+    private readonly SettingsManager _settingsManager;
 
     private readonly ICommandItem[] _commands;
 
     public EdgeFavoritesActionsProvider()
     {
         _logger = new Logger();
-        _settingsRepository = new SettingsRepository();
         _edgeManager = new EdgeManager(_logger);
         _profileManager = new ProfileManager(_logger, _edgeManager);
         _favoriteQuery = new FavoriteQuery(_profileManager);
+        _settingsManager = new SettingsManager();
 
-        _settingsRepository.Initialize();
-        _settingsRepository.OnSave += OnSave;
-
-        _edgeManager.Initialize(_settingsRepository.Channel);
-        _profileManager.ReloadProfiles(_settingsRepository.ExcludedProfiles);
+        // TODO handle save event
+        // _edgeManager.Initialize(_settingsManager.Channel);
+        // _profileManager.ReloadProfiles(_settingsManager.ExcludedProfiles);
+        _edgeManager.Initialize(_settingsManager.Channel);
+        _profileManager.ReloadProfiles(_settingsManager.ExcludedProfiles);
 
         _commands =
         [
-            _settingsRepository.SearchTree
-                ? new CommandItem(new TreePage(_edgeManager, _favoriteQuery, _profileManager, _settingsRepository))
-                : new CommandItem(new SearchPage(_edgeManager, _favoriteQuery, _profileManager, _settingsRepository))
+            _settingsManager.SearchTree
+                ? new CommandItem(new TreePage(_edgeManager, _favoriteQuery, _profileManager, _settingsManager))
+                : new CommandItem(new SearchPage(_edgeManager, _favoriteQuery, _profileManager, _settingsManager))
         ];
     }
 
     public override ICommandItem[] TopLevelCommands() => _commands;
-
-    private void OnSave(object sender, EventArgs e)
-    {
-        // TODO cache
-        _edgeManager.Initialize(_settingsRepository.Channel);
-        _profileManager.ReloadProfiles(_settingsRepository.ExcludedProfiles);
-    }
 }

src/modules/cmdpal/exts/CmdPal.Ext.EdgeFavorites/FavoriteListItem.cs

@@ -5,7 +5,6 @@
 using System;
 using System.Globalization;
 using System.Linq;
-using CmdPal.Ext.EdgeFavorites.Pages;
 using CmdPal.Ext.EdgeFavorites.Services;
 using Community.PowerToys.Run.Plugin.EdgeFavorite.Core.Models;
 using Community.PowerToys.Run.Plugin.EdgeFavorite.Core.Services;
@@ -21,7 +20,7 @@ private FavoriteListItem(ICommand command)
     {
     }
 
-    public static FavoriteListItem Create(EdgeManager edgeManager, SettingsRepository settingsRepository, FavoriteItem favorite, bool showProfileName, bool searchTree)
+    public static FavoriteListItem Create(EdgeManager edgeManager, SettingsManager settingsManager, FavoriteItem favorite, bool showProfileName, bool searchTree)
     {
         if (favorite.Type == FavoriteType.Folder)
         {
@@ -34,7 +33,7 @@ public static FavoriteListItem Create(EdgeManager edgeManager, SettingsRepositor
                 Icon = new("\uE8B7"),
                 TextToSuggest = $"{favorite.Path}/",
                 Tags = [new Tag() { Text = ResourceLoaderInstance.ResourceLoader.GetString("Folder_Tag") }],
-                MoreCommands = GetFolderMoreCommands(edgeManager, favorite, settingsRepository),
+                MoreCommands = GetFolderMoreCommands(edgeManager, favorite, settingsManager),
             };
         }
         else if (favorite.Type == FavoriteType.Url)
@@ -53,7 +52,6 @@ public static FavoriteListItem Create(EdgeManager edgeManager, SettingsRepositor
                     new CommandContextItem(new CopyTextCommand(favorite.Url) { Name = ResourceLoaderInstance.ResourceLoader.GetString("Command_CopyUrl") }),
                     new CommandContextItem(new OpenEdgeCommand(edgeManager, favorite, false, true) { Name = ResourceLoaderInstance.ResourceLoader.GetString("Command_OpenWindow"), Icon = new("\uE8A7") }),
                     new CommandContextItem(new OpenEdgeCommand(edgeManager, favorite, true, false) { Name = ResourceLoaderInstance.ResourceLoader.GetString("Command_OpenPrivate"), Icon = new("\uE727") }),
-                    GetSettingsCommand(settingsRepository),
                 ],
             };
         }
@@ -65,7 +63,7 @@ public static FavoriteListItem Create(EdgeManager edgeManager, SettingsRepositor
         }
     }
 
-    private static IContextItem[] GetFolderMoreCommands(EdgeManager edgeManager, FavoriteItem favorite, SettingsRepository settingsRepository)
+    private static IContextItem[] GetFolderMoreCommands(EdgeManager edgeManager, FavoriteItem favorite, SettingsManager settingsManager)
     {
         var childFav = favorite.Children.Where(c => c.Type == FavoriteType.Url).ToArray();
         var childFavCount = childFav.Length;
@@ -77,17 +75,11 @@ private static IContextItem[] GetFolderMoreCommands(EdgeManager edgeManager, Fav
                 new CommandContextItem(new OpenEdgeCommand(edgeManager, childFav, false, false) { Name = string.Format(CultureInfo.CurrentCulture, ResourceLoaderInstance.ResourceLoader.GetString("Command_OpenAll"), childFavCount), Icon = new("\uE737") }),
                 new CommandContextItem(new OpenEdgeCommand(edgeManager, childFav, false, true) { Name = string.Format(CultureInfo.CurrentCulture, ResourceLoaderInstance.ResourceLoader.GetString("Command_OpenAllWindow"), childFavCount), Icon = new("\uE8A7") }),
                 new CommandContextItem(new OpenEdgeCommand(edgeManager, childFav, true, false) { Name = string.Format(CultureInfo.CurrentCulture, ResourceLoaderInstance.ResourceLoader.GetString("Command_OpenAllPrivate"), childFavCount), Icon = new("\uE727") }),
-                GetSettingsCommand(settingsRepository),
             ];
         }
         else
         {
-            return [GetSettingsCommand(settingsRepository)];
+            return [];
         }
     }
-
-    private static CommandContextItem GetSettingsCommand(SettingsRepository settingsRepository)
-    {
-        return new CommandContextItem(new SettingsPage(settingsRepository));
-    }
 }

src/modules/cmdpal/exts/CmdPal.Ext.EdgeFavorites/Pages/SearchPage.cs

@@ -16,14 +16,14 @@ internal sealed partial class SearchPage : ListPage
     private readonly EdgeManager _edgeManager;
     private readonly FavoriteQuery _favoriteQuery;
     private readonly ProfileManager _profileManager;
-    private readonly SettingsRepository _settingsRepository;
+    private readonly SettingsManager _settingsManager;
 
-    public SearchPage(EdgeManager edgeManager, FavoriteQuery favoriteQuery, ProfileManager profileManager, SettingsRepository settingsRepository)
+    public SearchPage(EdgeManager edgeManager, FavoriteQuery favoriteQuery, ProfileManager profileManager, SettingsManager settingsManager)
     {
         _edgeManager = edgeManager;
         _favoriteQuery = favoriteQuery;
         _profileManager = profileManager;
-        _settingsRepository = settingsRepository;
+        _settingsManager = settingsManager;
 
         Name = ResourceLoaderInstance.ResourceLoader.GetString("Edge_Favorites");
         Icon = new("\uE728");
@@ -51,7 +51,7 @@ private IEnumerable<FavoriteListItem> Search()
 
             if (emptyQuery || score.Score > 0)
             {
-                yield return FavoriteListItem.Create(_edgeManager, _settingsRepository, favorite, _profileManager.FavoriteProviders.Count > 1, _settingsRepository.SearchTree);
+                yield return FavoriteListItem.Create(_edgeManager, _settingsManager, favorite, _profileManager.FavoriteProviders.Count > 1, _settingsManager.SearchTree);
             }
         }
     }

src/modules/cmdpal/exts/CmdPal.Ext.EdgeFavorites/Pages/SettingsPage.cs

@@ -15,14 +15,14 @@ internal sealed partial class TreePage : DynamicListPage
     private readonly EdgeManager _edgeManager;
     private readonly FavoriteQuery _favoriteQuery;
     private readonly ProfileManager _profileManager;
-    private readonly SettingsRepository _settingsRepository;
+    private readonly SettingsManager _settingsManager;
 
-    public TreePage(EdgeManager edgeManager, FavoriteQuery favoriteQuery, ProfileManager profileManager, SettingsRepository settingsRepository)
+    public TreePage(EdgeManager edgeManager, FavoriteQuery favoriteQuery, ProfileManager profileManager, SettingsManager settingsManager)
     {
         _edgeManager = edgeManager;
         _favoriteQuery = favoriteQuery;
         _profileManager = profileManager;
-        _settingsRepository = settingsRepository;
+        _settingsManager = settingsManager;
 
         Name = ResourceLoaderInstance.ResourceLoader.GetString("Edge_Favorites");
         Icon = new("\uE728");
@@ -39,7 +39,7 @@ public override IListItem[] GetItems()
                 .OrderBy(f => f.Type)
                 .ThenBy(f => f.Name)
                 .Where(f => !f.IsEmptySpecialFolder)
-                .Select(f => FavoriteListItem.Create(_edgeManager, _settingsRepository, f, _profileManager.FavoriteProviders.Count > 1, _settingsRepository.SearchTree))
+                .Select(f => FavoriteListItem.Create(_edgeManager, _settingsManager, f, _profileManager.FavoriteProviders.Count > 1, _settingsManager.SearchTree))
                 .ToArray();
         }
         else