Code Quality: Moving registry database to Files.App (#15357)

src/Files.App (Package)/Package.appxmanifest

@@ -169,13 +169,6 @@
  <Path>Files.App.Server\Files.App.Server.exe</Path>
  <Instancing>singleInstance</Instancing>
  <ActivatableClass ActivatableClassId="Files.App.Server.AppInstanceMonitor" />
- <ActivatableClass ActivatableClassId="Files.App.Server.Database.FileTagsDatabase" />
- <ActivatableClass ActivatableClassId="Files.App.Server.Database.LayoutPreferencesDatabase" />
- <ActivatableClass ActivatableClassId="Files.App.Server.Data.ColumnPreferences" />
- <ActivatableClass ActivatableClassId="Files.App.Server.Data.ColumnPreferencesItem" />
- <ActivatableClass ActivatableClassId="Files.App.Server.Data.TaggedFile" />
- <ActivatableClass ActivatableClassId="Files.App.Server.Data.LayoutPreferences" />
- <ActivatableClass ActivatableClassId="Files.App.Server.Data.LayoutPreferencesItem" />
  </OutOfProcessServer>
  </Extension>
  </Extensions>

src/Files.App.Server/Files.App.Server.csproj

@@ -39,7 +39,6 @@
  <ItemGroup>
  <Manifest Include="app.manifest" />
  <TrimmerRootAssembly Include="Files.App.Server" />
- <PackageReference Include="LiteDB" Version="5.0.19" />
  <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.7" />
  <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.1.647-beta" PrivateAssets="all" />
  </ItemGroup>

src/Files.App/Actions/Display/GroupAction.cs

@@ -1,8 +1,6 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Server.Data.Enums;
-
 namespace Files.App.Actions
 {
  internal sealed class GroupByNoneAction : GroupByAction

src/Files.App/Actions/Display/SortAction.cs

@@ -1,8 +1,6 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Server.Data.Enums;
-
 namespace Files.App.Actions
 {
  internal sealed class SortByNameAction : SortByAction

src/Files.App/Data/Contexts/DisplayPage/DisplayPageContext.cs

@@ -1,9 +1,6 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Server.Data.Enums;
-using static Files.App.Constants;
-
 namespace Files.App.Data.Contexts
 {
  internal sealed class DisplayPageContext : ObservableObject, IDisplayPageContext

src/Files.App/Data/Contexts/DisplayPage/IDisplayPageContext.cs

@@ -1,8 +1,6 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Server.Data.Enums;
-
 namespace Files.App.Data.Contexts
 {
  public interface IDisplayPageContext : INotifyPropertyChanging, INotifyPropertyChanged

src/Files.App.Server/Data/Enums/FolderLayoutModes.cs → src/Files.App/Data/Enums/FolderLayoutModes.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Server.Data.Enums
+namespace Files.App.Data.Enums
 {
  public enum FolderLayoutModes
  {

src/Files.App.Server/Data/Enums/GroupByDateUnit.cs → src/Files.App/Data/Enums/GroupByDateUnit.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Server.Data.Enums
+namespace Files.App.Data.Enums
 {
  public enum GroupByDateUnit
  {

src/Files.App.Server/Data/Enums/GroupOption.cs → src/Files.App/Data/Enums/GroupOption.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Server.Data.Enums
+namespace Files.App.Data.Enums
 {
  public enum GroupOption
  {

src/Files.App.Server/Data/Enums/SortDirection.cs → src/Files.App/Data/Enums/SortDirection.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Server.Data.Enums
+namespace Files.App.Data.Enums
 {
  /// <summary>
  /// SortDirection is used instead of the CommunityToolkit equivalent because it is tied to the model

src/Files.App.Server/Data/Enums/SortOption.cs → src/Files.App/Data/Enums/SortOption.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Server.Data.Enums
+namespace Files.App.Data.Enums
 {
  public enum SortOption
  {

src/Files.App/Data/EventArguments/LayoutModeEventArgs.cs

@@ -1,8 +1,6 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Server.Data.Enums;
-
 namespace Files.App.Data.EventArguments
 {
  public sealed class LayoutModeEventArgs

src/Files.App/Data/Items/DetailsLayoutColumnItem.cs

@@ -19,6 +19,8 @@ public double UserLengthPixels
  }
 
  private double _NormalMaxLength = 800;
+
+ [RegistryIgnore]
  public double NormalMaxLength
  {
  get => _NormalMaxLength;
@@ -36,6 +38,7 @@ public bool UserCollapsed
  }
  }
 
+ [RegistryIgnore]
  public bool IsResizable { get; set; } = true;
 
  public double MinLength
@@ -65,6 +68,7 @@ public bool IsHidden
 
  private double _NormalMinLength = 50;
 
+ [RegistryIgnore]
  public double NormalMinLength
  {
  get => _NormalMinLength;
@@ -77,6 +81,7 @@ public double NormalMinLength
 
  private GridLength _UserLength = new(200, GridUnitType.Pixel);
 
+ [RegistryIgnore]
  public GridLength UserLength
  {
  get => _UserLength;

src/Files.App/Data/Models/ColumnsViewModel.cs

@@ -13,6 +13,7 @@ public sealed class ColumnsViewModel : ObservableObject
  IsResizable = false,
  };
 
+ [RegistryIgnore]
  public DetailsLayoutColumnItem IconColumn
  {
  get => iconColumn;

src/Files.App/Data/Models/CurrentInstanceViewModel.cs

@@ -1,8 +1,6 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Server.Data.Enums;
-
 namespace Files.App.Data.Models
 {
  public sealed class CurrentInstanceViewModel : ObservableObject

src/Files.App/Data/Models/ItemViewModel.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Server.Data.Enums;
 using Files.App.Services.SizeProvider;
 using Files.Shared.Helpers;
 using LibGit2Sharp;

src/Files.App/Extensions/GroupOptionExtensions.cs

@@ -1,8 +1,6 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Server.Data.Enums;
-
 namespace Files.App.Extensions
 {
  public static class GroupOptionExtensions

src/Files.App/Files.App.csproj

@@ -74,6 +74,7 @@
  <PackageReference Include="FluentFTP" Version="43.0.1" />
  <PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
  <PackageReference Include="LibGit2Sharp" Version="0.30.0" />
+ <PackageReference Include="LiteDB" Version="5.0.19" />
  <PackageReference Include="LiveChartsCore.SkiaSharpView.WinUI" Version="2.0.0-rc1.2" />
  <PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.3" />
  <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />

src/Files.App.Server/Database/LayoutPreferencesDatabase.cs → src/Files.App/Helpers/Layout/LayoutPreferencesDatabase.cs

@@ -1,17 +1,17 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Server.Data;
 using LiteDB;
 using Microsoft.Win32;
+using System.IO;
 using System.Runtime.CompilerServices;
 using Windows.ApplicationModel;
 using Windows.Storage;
-using static Files.App.Server.Data.LayoutPreferencesRegistry;
-using static Files.App.Server.Utils.RegistryUtils;
+using static Files.App.Helpers.LayoutPreferencesDatabaseItemRegistry;
+using static Files.App.Helpers.RegistryHelpers;
 using JsonSerializer = System.Text.Json.JsonSerializer;
 
-namespace Files.App.Server.Database
+namespace Files.App.Helpers
 {
  public sealed class LayoutPreferencesDatabase
  {
@@ -30,7 +30,7 @@ static LayoutPreferencesDatabase()
  Upgrade = true
  }))
  {
- ImportCore(database.GetCollection<LayoutPreferences>(LayoutSettingsCollectionName).FindAll().ToArray());
+ ImportCore(database.GetCollection<LayoutPreferencesDatabaseItem>(LayoutSettingsCollectionName).FindAll().ToArray());
  }
 
  File.Delete(LayoutSettingsDbPath);
@@ -51,7 +51,7 @@ public void SetPreferences(string filePath, ulong? frn, LayoutPreferencesItem? p
  if (preferencesItem is not null)
  {
  // Insert new tagged file (Id will be auto-incremented)
- var newPref = new LayoutPreferences()
+ var newPref = new LayoutPreferencesDatabaseItem()
  {
  FilePath = filePath,
  Frn = frn,
@@ -77,7 +77,7 @@ public void SetPreferences(string filePath, ulong? frn, LayoutPreferencesItem? p
  }
  }
 
- void UpdateValues(LayoutPreferences? preferences)
+ void UpdateValues(LayoutPreferencesDatabaseItem? preferences)
  {
  if (filePath is not null)
  {
@@ -100,12 +100,12 @@ public void ResetAll()
 
  public void Import(string json)
  {
- var preferences = JsonSerializer.Deserialize<LayoutPreferences[]>(json);
+ var preferences = JsonSerializer.Deserialize<LayoutPreferencesDatabaseItem[]>(json);
  ImportCore(preferences);
  }
 
 
- private static void ImportCore(LayoutPreferences[]? preferences)
+ private static void ImportCore(LayoutPreferencesDatabaseItem[]? preferences)
  {
  Registry.CurrentUser.DeleteSubKeyTree(LayoutSettingsKey, false);
  if (preferences is null)
@@ -126,12 +126,12 @@ private static void ImportCore(LayoutPreferences[]? preferences)
 
  public string Export()
  {
- var list = new List<LayoutPreferences>();
+ var list = new List<LayoutPreferencesDatabaseItem>();
  IterateKeys(list, LayoutSettingsKey, 0);
  return JsonSerializer.Serialize(list);
  }
 
- private void IterateKeys(List<LayoutPreferences> list, string path, int depth)
+ private void IterateKeys(List<LayoutPreferencesDatabaseItem> list, string path, int depth)
  {
  using var key = Registry.CurrentUser.OpenSubKey(path);
  if (key is null)
@@ -141,7 +141,7 @@ private void IterateKeys(List<LayoutPreferences> list, string path, int depth)
 
  if (key.ValueCount > 0)
  {
- var preference = new LayoutPreferences();
+ var preference = new LayoutPreferencesDatabaseItem();
  BindValues(key, preference);
  list.Add(preference);
  }
@@ -158,21 +158,21 @@ private void IterateKeys(List<LayoutPreferences> list, string path, int depth)
  }
  }
 
- private LayoutPreferences? FindPreferences(string filePath, ulong? frn)
+ private LayoutPreferencesDatabaseItem? FindPreferences(string filePath, ulong? frn)
  {
  if (filePath is not null)
  {
  using var filePathKey = Registry.CurrentUser.CreateSubKey(CombineKeys(LayoutSettingsKey, filePath));
  if (filePathKey.ValueCount > 0)
  {
- var preference = new LayoutPreferences();
+ var preference = new LayoutPreferencesDatabaseItem();
  BindValues(filePathKey, preference);
  if (frn is not null)
  {
  // Keep entry updated
  preference.Frn = frn;
  var value = frn.Value;
- filePathKey.SetValue(nameof(LayoutPreferences.Frn), Unsafe.As<ulong, long>(ref value), RegistryValueKind.QWord);
+ filePathKey.SetValue(nameof(LayoutPreferencesDatabaseItem.Frn), Unsafe.As<ulong, long>(ref value), RegistryValueKind.QWord);
  }
  return preference;
  }
@@ -183,13 +183,13 @@ private void IterateKeys(List<LayoutPreferences> list, string path, int depth)
  using var frnKey = Registry.CurrentUser.CreateSubKey(CombineKeys(LayoutSettingsKey, "FRN", frn.Value.ToString()));
  if (frnKey.ValueCount > 0)
  {
- var preference = new LayoutPreferences();
+ var preference = new LayoutPreferencesDatabaseItem();
  BindValues(frnKey, preference);
  if (filePath is not null)
  {
  // Keep entry updated
  preference.FilePath = filePath;
- frnKey.SetValue(nameof(LayoutPreferences.FilePath), filePath, RegistryValueKind.String);
+ frnKey.SetValue(nameof(LayoutPreferencesDatabaseItem.FilePath), filePath, RegistryValueKind.String);
  }
  return preference;
  }