Transitioned to Json Settings

Files/App.xaml.cs

@@ -5,10 +5,14 @@
 using Files.Filesystem.FilesystemHistory;
 using Files.Helpers;
 using Files.Models.Settings;
+using Files.Services;
+using Files.Services.Implementation;
 using Files.SettingsInterfaces;
 using Files.UserControls.MultitaskingControl;
 using Files.ViewModels;
 using Files.Views;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Toolkit.Mvvm.DependencyInjection;
 using Microsoft.Toolkit.Uwp;
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.Notifications;
@@ -59,6 +63,8 @@ sealed partial class App : Application
         public static OngoingTasksViewModel OngoingTasksViewModel { get; } = new OngoingTasksViewModel();
         public static SecondaryTileHelper SecondaryTileHelper { get; private set; } = new SecondaryTileHelper();
 
+        public IServiceProvider Services { get; private set; }
+
         public App()
         {
             // Initialize logger
@@ -69,6 +75,23 @@ public App()
             InitializeComponent();
             Suspending += OnSuspending;
             LeavingBackground += OnLeavingBackground;
+
+            this.Services = ConfigureServices();
+            Ioc.Default.ConfigureServices(Services);
+        }
+
+        private IServiceProvider ConfigureServices()
+        {
+            ServiceCollection services = new ServiceCollection();
+
+            services
+                // Base IUserSettingsService
+                .AddSingleton<IUserSettingsService, UserSettingsService>()
+
+                // Children settings (from IUserSettingsService)
+                .AddSingleton<IFilesAndFoldersSettingsService, FilesAndFoldersSettingsService>();
+
+            return services.BuildServiceProvider();
         }
 
         private static async Task EnsureSettingsAndConfigurationAreBootstrapped()

Files/Constants.cs

@@ -106,6 +106,8 @@ public static class LocalSettings
 
             public const string BundlesSettingsFileName = "bundles.json";
 
+            public const string UserSettingsFileName = "user_settings.json";
+
             public const string FileTagSettingsFileName = "filetags.json";
         }
 

Files/Files.csproj

@@ -233,6 +233,18 @@
     <Compile Include="Helpers\ZipHelpers.cs" />
     <Compile Include="Interacts\ItemManipulationModel.cs" />
     <Compile Include="ISearchBox.cs" />
+    <Compile Include="Models\JsonSettings\ISettingsSharingContext.cs" />
+    <Compile Include="Models\JsonSettings\IJsonSettingsDatabase.cs" />
+    <Compile Include="Models\JsonSettings\IJsonSettingsSerializer.cs" />
+    <Compile Include="Models\JsonSettings\Implementation\CachingJsonSettingsDatabase.cs" />
+    <Compile Include="Models\JsonSettings\Implementation\DefaultJsonSettingsDatabase.cs" />
+    <Compile Include="Models\JsonSettings\Implementation\DefaultJsonSettingsSerializer.cs" />
+    <Compile Include="Models\JsonSettings\Implementation\DefaultSettingsSerializer.cs" />
+    <Compile Include="Models\JsonSettings\ISettingsSerializer.cs" />
+    <Compile Include="Services\IFilesAndFoldersSettingsService.cs" />
+    <Compile Include="Services\Implementation\FilesAndFoldersSettingsService.cs" />
+    <Compile Include="Services\Implementation\UserSettingsService.cs" />
+    <Compile Include="Services\IUserSettingsService.cs" />
     <Compile Include="UserControls\ColoredIcon.xaml.cs">
       <DependentUpon>ColoredIcon.xaml</DependentUpon>
     </Compile>
@@ -341,7 +353,7 @@
     <Compile Include="ViewModels\SettingsViewModels\SidebarViewModel.cs" />
     <Compile Include="ViewModels\SearchBoxViewModel.cs" />
     <Compile Include="ViewModels\SidebarViewModel.cs" />
-    <Compile Include="Models\Settings\BaseJsonSettingsModel.cs" />
+    <Compile Include="Models\JsonSettings\BaseJsonSettingsModel.cs" />
     <Compile Include="ViewModels\ColumnsViewModel.cs" />
     <Compile Include="ViewModels\Pages\YourHomeViewModel.cs" />
     <Compile Include="ViewModels\StatusCenterViewModel.cs" />
@@ -1412,6 +1424,9 @@
     <PackageReference Include="Microsoft.Data.Sqlite.Core">
       <Version>5.0.9</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection">
+      <Version>5.0.2</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.12</Version>
     </PackageReference>
@@ -1503,6 +1518,7 @@
       <Name>Windows Desktop Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>
+  <ItemGroup />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '16.0' ">
     <VisualStudioVersion>16.0</VisualStudioVersion>
   </PropertyGroup>

Files/Filesystem/FileTagsHelper.cs

@@ -1,6 +1,8 @@
 using Common;
 using Files.Filesystem.StorageItems;
 using Files.Helpers;
+using Files.Models.JsonSettings;
+using Files.Models.JsonSettings.Implementation;
 using Files.Models.Settings;
 using Microsoft.Toolkit.Uwp;
 using Microsoft.Toolkit.Uwp.Helpers;
@@ -106,7 +108,7 @@ public FileTagsSettings()
 
         public IList<FileTag> FileTagList
         {
-            get => Get<IList<FileTag>>(() => new List<FileTag>()
+            get => Get<List<FileTag>>(new List<FileTag>()
             {
                 new FileTag("Blue", "#0072BD"),
                 new FileTag("Orange", "#D95319"),

Files/Filesystem/Search/FolderSearch.cs

@@ -3,6 +3,8 @@
 using Files.Extensions;
 using Files.Filesystem.StorageItems;
 using Files.Helpers;
+using Files.Services;
+using Microsoft.Toolkit.Mvvm.DependencyInjection;
 using Microsoft.Toolkit.Uwp;
 using System;
 using System.Collections.Generic;
@@ -22,6 +24,8 @@ namespace Files.Filesystem.Search
 {
     public class FolderSearch
     {
+        private IFilesAndFoldersSettingsService FilesAndFoldersSettingsService { get; } = Ioc.Default.GetService<IFilesAndFoldersSettingsService>();
+
         private const uint defaultStepSize = 500;
 
         public string Query { get; set; }
@@ -185,7 +189,8 @@ private async Task SearchTagsAsync(string folder, IList<ListedItem> results, Can
                 {
                     var isSystem = ((FileAttributes)findData.dwFileAttributes & FileAttributes.System) == FileAttributes.System;
                     var isHidden = ((FileAttributes)findData.dwFileAttributes & FileAttributes.Hidden) == FileAttributes.Hidden;
-                    bool shouldBeListed = !isHidden || (App.AppSettings.AreHiddenItemsVisible && (!isSystem || !App.AppSettings.AreSystemItemsHidden));
+
+                    bool shouldBeListed = !isHidden || (FilesAndFoldersSettingsService.AreHiddenItemsVisible && (!isSystem || !App.AppSettings.AreSystemItemsHidden));
 
                     if (shouldBeListed)
                     {
@@ -245,7 +250,7 @@ private async Task AddItemsAsync(string folder, IList<ListedItem> results, Cance
                     hiddenOnlyFromWin32 = true;
                 }
 
-                if (!hiddenOnlyFromWin32 || App.AppSettings.AreHiddenItemsVisible)
+                if (!hiddenOnlyFromWin32 || FilesAndFoldersSettingsService.AreHiddenItemsVisible)
                 {
                     await SearchWithWin32Async(folder, hiddenOnlyFromWin32, UsedMaxItemCount - (uint)results.Count, results, token);
                     //foreach (var item in)
@@ -269,6 +274,7 @@ private async Task SearchWithWin32Async(string folder, bool hiddenOnly, uint max
 
             if (hFile != IntPtr.Zero)
             {
+                IFilesAndFoldersSettingsService filesAndFoldersSettingsService = Ioc.Default.GetService<IFilesAndFoldersSettingsService>();
                 await Task.Run(() =>
                 {
                     var hasNextFile = false;
@@ -284,7 +290,7 @@ await Task.Run(() =>
                         var isHidden = ((FileAttributes)findData.dwFileAttributes & FileAttributes.Hidden) == FileAttributes.Hidden;
                         bool shouldBeListed = hiddenOnly ?
                             isHidden && (!isSystem || !App.AppSettings.AreSystemItemsHidden) :
-                            !isHidden || (App.AppSettings.AreHiddenItemsVisible && (!isSystem || !App.AppSettings.AreSystemItemsHidden));
+                            !isHidden || (filesAndFoldersSettingsService.AreHiddenItemsVisible && (!isSystem || !filesAndFoldersSettingsService.AreSystemItemsHidden));
 
                         if (shouldBeListed)
                         {

Files/Filesystem/StorageEnumerators/Win32StorageEnumerator.cs

@@ -2,6 +2,8 @@
 using Files.Extensions;
 using Files.Helpers;
 using Files.Helpers.FileListCache;
+using Files.Services;
+using Microsoft.Toolkit.Mvvm.DependencyInjection;
 using Microsoft.Toolkit.Uwp;
 using System;
 using System.Collections.Generic;
@@ -37,11 +39,13 @@ Func<List<ListedItem>, Task> intermediateAction
             var hasNextFile = false;
             var count = 0;
 
+            IFilesAndFoldersSettingsService filesAndFoldersSettingsService = Ioc.Default.GetService<IFilesAndFoldersSettingsService>();
+
             do
             {
                 var isSystem = ((FileAttributes)findData.dwFileAttributes & FileAttributes.System) == FileAttributes.System;
                 var isHidden = ((FileAttributes)findData.dwFileAttributes & FileAttributes.Hidden) == FileAttributes.Hidden;
-                if (!isHidden || (App.AppSettings.AreHiddenItemsVisible && (!isSystem || !App.AppSettings.AreSystemItemsHidden)))
+                if (!isHidden || (filesAndFoldersSettingsService.AreHiddenItemsVisible && (!isSystem || !App.AppSettings.AreSystemItemsHidden)))
                 {
                     if (((FileAttributes)findData.dwFileAttributes & FileAttributes.Directory) != FileAttributes.Directory)
                     {

Files/Models/JsonSettings/BaseJsonSettingsModel.cs

@@ -0,0 +1,170 @@
+using Files.Helpers;
+using Files.Models.JsonSettings.Implementation;
+using Newtonsoft.Json.Linq;
+using System.Runtime.CompilerServices;
+
+namespace Files.Models.JsonSettings
+{
+    /// <summary>
+    /// Clipboard Canvas
+    /// A base class to easily manage all application's settings.
+    /// </summary>
+    public abstract class BaseJsonSettingsModel : ISettingsSharingContext
+    {
+        #region Protected Members
+
+        protected int registeredMembers = 0;
+
+        protected ISettingsSharingContext settingsSharingContext;
+
+        protected readonly IJsonSettingsSerializer jsonSettingsSerializer;
+
+        protected readonly ISettingsSerializer settingsSerializer;
+
+        #endregion Protected Members
+
+        #region Properties
+
+        private string _FilePath;
+        public string FilePath
+        {
+            get => settingsSharingContext?.FilePath ?? _FilePath;
+            protected set => _FilePath = value;
+        }
+
+        private IJsonSettingsDatabase _JsonSettingsDatabase;
+        public IJsonSettingsDatabase JsonSettingsDatabase
+        {
+            get => settingsSharingContext?.JsonSettingsDatabase ?? _JsonSettingsDatabase;
+            protected set => _JsonSettingsDatabase = value;
+        }
+
+        #endregion Properties
+
+        #region Constructor
+
+        public BaseJsonSettingsModel()
+        {
+        }
+
+        public BaseJsonSettingsModel(string filePath)
+            : this (filePath, null, null, null)
+        {
+        }
+
+        public BaseJsonSettingsModel(ISettingsSharingContext settingsSharingContext)
+        {
+            RegisterSettingsContext(settingsSharingContext);
+            Initialize();
+        }
+
+        public BaseJsonSettingsModel(string filePath, bool isCachingEnabled,
+            IJsonSettingsSerializer jsonSettingsSerializer = null,
+            ISettingsSerializer settingsSerializer = null)
+        {
+            this.FilePath = filePath;
+            Initialize();
+
+            this.jsonSettingsSerializer = jsonSettingsSerializer;
+            this.settingsSerializer = settingsSerializer;
+
+            // Fallback
+            this.jsonSettingsSerializer ??= new DefaultJsonSettingsSerializer();
+            this.settingsSerializer ??= new DefaultSettingsSerializer(this.FilePath);
+
+            if (isCachingEnabled)
+            {
+                this.JsonSettingsDatabase = new CachingJsonSettingsDatabase(this.jsonSettingsSerializer, this.settingsSerializer);
+            }
+            else
+            {
+                this.JsonSettingsDatabase = new DefaultJsonSettingsDatabase(this.jsonSettingsSerializer, this.settingsSerializer);
+            }
+        }
+
+        public BaseJsonSettingsModel(string filePath,
+            IJsonSettingsSerializer jsonSettingsSerializer,
+            ISettingsSerializer settingsSerializer,
+            IJsonSettingsDatabase jsonSettingsDatabase)
+        {
+            this.FilePath = filePath;
+            Initialize();
+
+            this.jsonSettingsSerializer = jsonSettingsSerializer;
+            this.settingsSerializer = settingsSerializer;
+            this.JsonSettingsDatabase = jsonSettingsDatabase;
+
+            // Fallback
+            this.jsonSettingsSerializer ??= new DefaultJsonSettingsSerializer();
+            this.settingsSerializer ??= new DefaultSettingsSerializer(this.FilePath);
+            this.JsonSettingsDatabase ??= new DefaultJsonSettingsDatabase(this.jsonSettingsSerializer, this.settingsSerializer);
+        }
+
+        #endregion Constructor
+
+        #region Helpers
+
+        protected virtual void Initialize()
+        {
+            // Create the file
+            NativeFileOperationsHelper.CreateFileForWrite((settingsSharingContext?.FilePath ?? FilePath), false).Dispose();
+        }
+
+        public virtual object ExportSettings()
+        {
+            return (settingsSharingContext?.JsonSettingsDatabase ?? JsonSettingsDatabase)?.ExportSettings();
+        }
+
+        public virtual void ImportSettings(object import)
+        {
+            (settingsSharingContext?.JsonSettingsDatabase ?? JsonSettingsDatabase)?.ImportSettings(import);
+        }
+
+        public bool RegisterSettingsContext(ISettingsSharingContext settingsSharingContext)
+        {
+            this.settingsSharingContext = settingsSharingContext;
+            return true;
+        }
+
+        public ISettingsSharingContext GetContext()
+        {
+            registeredMembers++;
+            return settingsSharingContext ?? this;
+        }
+
+        #endregion Helpers
+
+        #region Get, Set
+
+        protected virtual TValue Get<TValue>(TValue defaultValue, [CallerMemberName] string propertyName = "")
+        {
+            if (string.IsNullOrEmpty(propertyName))
+            {
+                return defaultValue;
+            }
+
+            object value = (settingsSharingContext?.JsonSettingsDatabase ?? JsonSettingsDatabase).GetValue(propertyName, defaultValue);
+
+            if (value is JToken jTokenValue)
+            {
+                return jTokenValue.ToObject<TValue>();
+            }
+            else
+            {
+                return (TValue)value;
+            }
+        }
+
+        protected virtual bool Set<TValue>(TValue value, [CallerMemberName] string propertyName = "")
+        {
+            if (string.IsNullOrEmpty(propertyName))
+            {
+                return false;
+            }
+
+            return (settingsSharingContext?.JsonSettingsDatabase ?? JsonSettingsDatabase).UpdateKey(propertyName, value);
+        }
+
+        #endregion Get, Set
+    }
+}

Files/Models/JsonSettings/IJsonSettingsDatabase.cs

@@ -0,0 +1,17 @@
+namespace Files.Models.JsonSettings
+{
+    public interface IJsonSettingsDatabase
+    {
+        object GetValue(string key, object defaultValue = null);
+
+        bool AddKey(string key, object value);
+
+        bool RemoveKey(string key);
+
+        bool UpdateKey(string key, object newValue);
+
+        void ImportSettings(object import);
+
+        object ExportSettings();
+    }
+}