Use database to store layout preferences

src/Files.Shared/FileTagsDb.cs

@@ -31,13 +31,15 @@ public void SetTags(string filePath, ulong? frn, string[]? tags)
                 if (tags != null && tags.Any())
                 {
                     // Insert new tagged file (Id will be auto-incremented)
-                    var newTag = new TaggedFile
+                    var newTag = new TaggedFile()
                     {
                         FilePath = filePath,
                         Frn = frn,
                         Tags = tags
                     };
                     col.Insert(newTag);
+                    col.EnsureIndex(x => x.Frn);
+                    col.EnsureIndex(x => x.FilePath);
                 }
             }
             else
@@ -60,6 +62,7 @@ public void SetTags(string filePath, ulong? frn, string[]? tags)
         {
             // Get a collection (or create, if doesn't exist)
             var col = db.GetCollection<TaggedFile>(TaggedFiles);
+
             if (filePath != null)
             {
                 var tmp = col.FindOne(x => x.FilePath == filePath);
@@ -189,8 +192,8 @@ public class TaggedFile
         {
             [BsonId] public int Id { get; set; }
             public ulong? Frn { get; set; }
-            public string FilePath { get; set; } = null!;
-            public string[] Tags { get; set; } = null!;
+            public string FilePath { get; set; } = string.Empty;
+            public string[] Tags { get; set; } = Array.Empty<string>();
         }
     }
 }

src/Files.Uwp/BaseLayout.cs

@@ -380,11 +380,10 @@ protected virtual void BaseFolderSettings_LayoutModeChangeRequested(object sende
         {
             if (ParentShellPageInstance.SlimContentPage != null)
             {
-                var layoutType = FolderSettings.GetLayoutType(ParentShellPageInstance.FilesystemViewModel.WorkingDirectory, false);
+                var layoutType = FolderSettings.GetLayoutType(ParentShellPageInstance.FilesystemViewModel.WorkingDirectory);
 
                 if (layoutType != ParentShellPageInstance.CurrentPageType)
                 {
-                    FolderSettings.IsLayoutModeChanging = true;
                     ParentShellPageInstance.NavigateWithArguments(layoutType, new NavigationArguments()
                     {
                         NavPathParam = navigationArguments.NavPathParam,

src/Files.Uwp/EventArguments/LayoutPreferenceEventArgs.cs

@@ -1,4 +1,4 @@
-using static Files.Uwp.ViewModels.FolderSettingsViewModel;
+using Files.Uwp.Helpers.LayoutPreferences;
 
 namespace Files.Uwp.EventArguments
 {

src/Files.Uwp/Files.Uwp.csproj

@@ -246,6 +246,8 @@
     <Compile Include="Helpers\StorageSenseHelper.cs" />
     <Compile Include="Helpers\WindowDecorationsHelper.cs" />
     <Compile Include="Helpers\UniversalLogWriter.cs" />
+    <Compile Include="Helpers\LayoutPreferences\LayoutPreferences.cs" />
+    <Compile Include="Helpers\LayoutPreferences\LayoutPrefsDb.cs" />
     <Compile Include="Filesystem\FolderHelpers.cs" />
     <Compile Include="Filesystem\LibraryLocationItem.cs" />
     <Compile Include="Filesystem\LibraryManager.cs" />
@@ -1693,4 +1695,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/Files.Uwp/Filesystem/StorageEnumerators/UniversalStorageEnumerator.cs

@@ -20,7 +20,6 @@ public static class UniversalStorageEnumerator
         public static async Task<List<ListedItem>> ListEntries(
             BaseStorageFolder rootFolder,
             StorageFolderWithPath currentStorageFolder,
-            Type sourcePageType,
             CancellationToken cancellationToken,
             int countLimit,
             Func<List<ListedItem>, Task> intermediateAction,

src/Files.Uwp/Helpers/AdaptiveLayoutHelpers.cs

@@ -5,12 +5,14 @@
 using System;
 using System.Linq;
 using Windows.Storage;
+using System.Collections.Generic;
+using Files.Uwp.Filesystem;
 
 namespace Files.Uwp.Helpers
 {
     public static class AdaptiveLayoutHelpers
     {
-        public static bool PredictLayoutMode(FolderSettingsViewModel folderSettings, ItemViewModel filesystemViewModel)
+        public static bool PredictLayoutMode(FolderSettingsViewModel folderSettings, string path, IList<ListedItem> filesAndFolders)
         {
             IUserSettingsService userSettingsService = Ioc.Default.GetService<IUserSettingsService>();
 
@@ -24,8 +26,6 @@ public static bool PredictLayoutMode(FolderSettingsViewModel folderSettings, Ite
 
                 bool desktopIniFound = false;
 
-                string path = filesystemViewModel?.WorkingDirectory;
-
                 if (string.IsNullOrWhiteSpace(path))
                 {
                     return false;
@@ -46,39 +46,15 @@ public static bool PredictLayoutMode(FolderSettingsViewModel folderSettings, Ite
                             var folderTypeKey = viewModeSection.Keys.FirstOrDefault(s => "FolderType".Equals(s.KeyName, StringComparison.OrdinalIgnoreCase));
                             if (folderTypeKey != null)
                             {
-                                switch (folderTypeKey.Value)
+                                var setLayout = (folderTypeKey.Value) switch
                                 {
-                                    case "Documents":
-                                        {
-                                            layoutDetails();
-                                            break;
-                                        }
-
-                                    case "Pictures":
-                                        {
-                                            layoutGridView();
-                                            break;
-                                        }
-
-                                    case "Music":
-                                        {
-                                            layoutDetails();
-                                            break;
-                                        }
-
-                                    case "Videos":
-                                        {
-                                            layoutGridView();
-                                            break;
-                                        }
-
-                                    default:
-                                        {
-                                            layoutDetails();
-                                            break;
-                                        }
-                                }
-
+                                    "Documents" => layoutDetails,
+                                    "Pictures" => layoutGridView,
+                                    "Music" => layoutDetails,
+                                    "Videos" => layoutGridView,
+                                    _ => layoutDetails
+                                };
+                                setLayout();
                                 desktopIniFound = true;
                             }
                         }
@@ -89,12 +65,12 @@ public static bool PredictLayoutMode(FolderSettingsViewModel folderSettings, Ite
                 {
                     return true;
                 }
-                if (filesystemViewModel.FilesAndFolders.Count == 0)
+                if (filesAndFolders.Count == 0)
                 {
                     return false;
                 }
 
-                int allItemsCount = filesystemViewModel.FilesAndFolders.Count;
+                int allItemsCount = filesAndFolders.Count;
 
                 int mediaCount;
                 int imagesCount;
@@ -106,15 +82,15 @@ public static bool PredictLayoutMode(FolderSettingsViewModel folderSettings, Ite
                 float foldersPercentage;
                 float miscFilesPercentage;
 
-                mediaCount = filesystemViewModel.FilesAndFolders.Where((item) =>
+                mediaCount = filesAndFolders.Where((item) =>
                 {
                     return !string.IsNullOrEmpty(item.FileExtension) && MediaPreviewViewModel.ContainsExtension(item.FileExtension.ToLowerInvariant());
                 }).Count();
-                imagesCount = filesystemViewModel.FilesAndFolders.Where((item) =>
+                imagesCount = filesAndFolders.Where((item) =>
                 {
                     return !string.IsNullOrEmpty(item.FileExtension) && ImagePreviewViewModel.ContainsExtension(item.FileExtension.ToLowerInvariant());
                 }).Count();
-                foldersCount = filesystemViewModel.FilesAndFolders.Where((item) => item.PrimaryItemAttribute == StorageItemTypes.Folder).Count();
+                foldersCount = filesAndFolders.Where((item) => item.PrimaryItemAttribute == StorageItemTypes.Folder).Count();
                 miscFilesCount = allItemsCount - (mediaCount + imagesCount + foldersCount);
 
                 mediaPercentage = (float)((float)mediaCount / (float)allItemsCount) * 100.0f;

src/Files.Uwp/Helpers/LayoutPreferences/LayoutPreferences.cs

@@ -0,0 +1,79 @@
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Files.Backend.Services.Settings;
+using Files.Shared.Enums;
+using Files.Uwp.ViewModels;
+
+namespace Files.Uwp.Helpers.LayoutPreferences
+{
+    public class LayoutPreferences
+    {
+        private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetService<IUserSettingsService>();
+
+        public SortOption DirectorySortOption;
+        public SortDirection DirectorySortDirection;
+        public bool SortDirectoriesAlongsideFiles;
+        public GroupOption DirectoryGroupOption;
+        public FolderLayoutModes LayoutMode;
+        public int GridViewSize;
+        public bool IsAdaptiveLayoutOverridden;
+
+        public ColumnsViewModel ColumnsViewModel;
+
+        [LiteDB.BsonIgnore]
+        public static LayoutPreferences DefaultLayoutPreferences => new LayoutPreferences();
+
+        public LayoutPreferences()
+        {
+            this.LayoutMode = UserSettingsService.LayoutSettingsService.DefaultLayoutMode;
+            this.GridViewSize = UserSettingsService.LayoutSettingsService.DefaultGridViewSize;
+            this.DirectorySortOption = UserSettingsService.LayoutSettingsService.DefaultDirectorySortOption;
+            this.DirectoryGroupOption = UserSettingsService.LayoutSettingsService.DefaultDirectoryGroupOption;
+            this.DirectorySortDirection = UserSettingsService.LayoutSettingsService.DefaultDirectorySortDirection;
+            this.SortDirectoriesAlongsideFiles = UserSettingsService.LayoutSettingsService.DefaultSortDirectoriesAlongsideFiles;
+            this.IsAdaptiveLayoutOverridden = false;
+
+            this.ColumnsViewModel = new ColumnsViewModel();
+            this.ColumnsViewModel.DateCreatedColumn.UserCollapsed = !UserSettingsService.LayoutSettingsService.ShowDateCreatedColumn;
+            this.ColumnsViewModel.DateModifiedColumn.UserCollapsed = !UserSettingsService.LayoutSettingsService.ShowDateColumn;
+            this.ColumnsViewModel.ItemTypeColumn.UserCollapsed = !UserSettingsService.LayoutSettingsService.ShowTypeColumn;
+            this.ColumnsViewModel.SizeColumn.UserCollapsed = !UserSettingsService.LayoutSettingsService.ShowSizeColumn;
+            this.ColumnsViewModel.TagColumn.UserCollapsed = !UserSettingsService.LayoutSettingsService.ShowFileTagColumn;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+            if (obj == this)
+            {
+                return true;
+            }
+            if (obj is LayoutPreferences prefs)
+            {
+                return (
+                    prefs.LayoutMode == this.LayoutMode &&
+                    prefs.GridViewSize == this.GridViewSize &&
+                    prefs.DirectorySortOption == this.DirectorySortOption &&
+                    prefs.DirectorySortDirection == this.DirectorySortDirection &&
+                    prefs.SortDirectoriesAlongsideFiles == this.SortDirectoriesAlongsideFiles &&
+                    prefs.IsAdaptiveLayoutOverridden == this.IsAdaptiveLayoutOverridden &&
+                    prefs.ColumnsViewModel.Equals(this.ColumnsViewModel));
+            }
+            return base.Equals(obj);
+        }
+
+        public override int GetHashCode()
+        {
+            var hashCode = LayoutMode.GetHashCode();
+            hashCode = (hashCode * 397) ^ GridViewSize.GetHashCode();
+            hashCode = (hashCode * 397) ^ DirectorySortOption.GetHashCode();
+            hashCode = (hashCode * 397) ^ DirectorySortDirection.GetHashCode();
+            hashCode = (hashCode * 397) ^ SortDirectoriesAlongsideFiles.GetHashCode();
+            hashCode = (hashCode * 397) ^ IsAdaptiveLayoutOverridden.GetHashCode();
+            hashCode = (hashCode * 397) ^ ColumnsViewModel.GetHashCode();
+            return hashCode;
+        }
+    }
+}