Code Quality: Introduced App.Utils.Storage namespace for storage functionalities

src/Files.App/App.xaml.cs

@@ -9,7 +9,6 @@
 using Files.App.Extensions;
 using Files.App.Utils;
 using Files.App.Utils.Cloud;
-using Files.App.Utils.FilesystemHistory;
 using Files.App.Helpers;
 using Files.App.Services;
 using Files.App.Services.DateTimeFormatter;

src/Files.App/Data/Factories/SecurityAdvancedAccessControlItemFactory.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.Extensions;
-using Files.App.Utils.Security;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 

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

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.Utils.Cloud;
-using Files.App.Utils.StorageItems;
 using Files.App.ViewModels.Properties;
 using Files.Core.Helpers;
 using Files.Core.ViewModels.FileTags;

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

@@ -1,7 +1,9 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Helpers.StorageCache;
+using Files.App.Utils.Cloud;
+using Files.App.Utils.Shell;
+using Files.App.Storage.FtpStorage;
 using Files.App.ViewModels.Previews;
 using Files.Core.Services.SizeProvider;
 using FluentFTP;
@@ -37,7 +39,7 @@ public sealed class ItemViewModel : ObservableObject, IDisposable
 		private readonly AsyncManualResetEvent gitChangedEvent;
 		private readonly DispatcherQueue dispatcherQueue;
 		private readonly JsonElement defaultJson = JsonSerializer.SerializeToElement("{}");
-		private readonly IFileListCache fileListCache = FileListCacheController.GetInstance();
+		private readonly IStorageCacheController fileListCache = StorageCacheController.GetInstance();
 		private readonly string folderTypeTextLocalized = "Folder".GetLocalizedResource();
 
 		private Task? aProcessQueueAction;

src/Files.App/Extensions/ShellNewEntryExtensions.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.Utils;
-using Files.App.Utils.StorageItems;
 using Files.App.Helpers;
 using Files.App.Utils.Shell;
 using Files.Shared;

src/Files.App/GlobalUsings.cs

@@ -27,18 +27,14 @@
 global using global::Files.App.Utils;
 global using global::Files.App.Utils.Archives;
 global using global::Files.App.Utils.Cloud;
-global using global::Files.App.Utils.FilesystemHistory;
 global using global::Files.App.Utils.FileTags;
 global using global::Files.App.Utils.Git;
 global using global::Files.App.Utils.Library;
 global using global::Files.App.Utils.RecentItem;
 global using global::Files.App.Utils.RecycleBin;
-global using global::Files.App.Utils.Search;
-global using global::Files.App.Utils.Security;
 global using global::Files.App.Utils.Serialization;
 global using global::Files.App.Utils.Shell;
-global using global::Files.App.Utils.StorageEnumerators;
-global using global::Files.App.Utils.StorageItems;
+global using global::Files.App.Utils.Storage;
 global using global::Files.App.Data.EventArguments;
 global using global::Files.App.Data.Factories;
 global using global::Files.App.Data.Items;

src/Files.App/Helpers/BitmapHelper.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Utils.StorageItems;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System.IO;
 using Windows.Graphics.Imaging;

src/Files.App/Helpers/Navigation/NavigationHelpers.cs

@@ -4,7 +4,6 @@
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Files.App.Extensions;
 using Files.App.Utils;
-using Files.App.Utils.StorageItems;
 using Files.App.Utils.Shell;
 using Files.App.ViewModels;
 using Files.App.Views;

src/Files.App/Helpers/ShareItemHelpers.cs

@@ -3,7 +3,6 @@
 
 using Files.App.Extensions;
 using Files.App.Utils;
-using Files.App.Utils.StorageItems;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/Files.App/Helpers/UI/UIFilesystemHelpers.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.Dialogs;
-using Files.App.Utils.StorageItems;
 using Files.App.Storage.FtpStorage;
 using Files.App.ViewModels.Dialogs;
 using Microsoft.Extensions.Logging;

src/Files.App/Services/QuickAccessService.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Utils.StorageItems;
 using Files.App.Utils.Shell;
 using Files.App.UserControls.Widgets;
 

src/Files.App/UserControls/SidebarControl.xaml.cs

@@ -8,7 +8,6 @@
 using Files.App.Data.Items;
 using Files.App.Data.Models;
 using Files.App.Extensions;
-using Files.App.Utils.StorageItems;
 using Files.App.Helpers.ContextFlyouts;
 using Files.App.Services;
 using Files.App.Utils.Shell;
@@ -787,7 +786,7 @@ private async void NavigationViewFileTagItem_DragOver(object sender, DragEventAr
 			var deferral = e.GetDeferral();
 			e.Handled = true;
 
-			var storageItems = await Utils.FilesystemHelpers.GetDraggedStorageItems(e.DataView);
+			var storageItems = await FilesystemHelpers.GetDraggedStorageItems(e.DataView);
 
 			if (!storageItems.Any())
 			{
@@ -820,7 +819,7 @@ private async void NavigationViewFileTag_Drop(object sender, DragEventArgs e)
 
 			var deferral = e.GetDeferral();
 
-			var storageItems = await Utils.FilesystemHelpers.GetDraggedStorageItems(e.DataView);
+			var storageItems = await FilesystemHelpers.GetDraggedStorageItems(e.DataView);
 			foreach (var item in storageItems.Where(x => !string.IsNullOrEmpty(x.Path)))
 			{
 				var listedItem = new ListedItem(null)

src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs

@@ -5,8 +5,6 @@
 using CommunityToolkit.WinUI;
 using Files.App.Extensions;
 using Files.App.Utils;
-using Files.App.Utils.StorageEnumerators;
-using Files.App.Utils.StorageItems;
 using Files.App.Helpers;
 using Files.App.Helpers.ContextFlyouts;
 using Files.App.ViewModels;

src/Files.App/Utils/Archives/ArchiveHelpers.cs

@@ -3,7 +3,6 @@
 
 using Files.App.Dialogs;
 using Files.App.Utils.Archives;
-using Files.App.Utils.StorageItems;
 using Files.App.ViewModels.Dialogs;
 using Microsoft.UI.Xaml.Controls;
 using System.IO;

src/Files.App/Utils/Archives/ZipHelpers.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Utils.StorageItems;
 using Microsoft.Extensions.Logging;
 using SevenZip;
 using System.IO;

src/Files.App/Utils/Cloud/CloudDrivesDetector.cs

@@ -10,7 +10,7 @@
 using System.Runtime.Versioning;
 using System.Threading.Tasks;
 
-namespace Files.App.Helpers
+namespace Files.App.Utils.Cloud
 {
 	[SupportedOSPlatform("Windows10.0.10240")]
 	public class CloudDrivesDetector

src/Files.App/Utils/WallpaperHelpers.cs → src/Files.App/Utils/Global/WallpaperHelpers.cs

@@ -8,7 +8,7 @@
 using Windows.Storage;
 using Windows.System.UserProfile;
 
-namespace Files.App.Helpers
+namespace Files.App.Utils
 {
 	public static class WallpaperHelpers
 	{

src/Files.App/Utils/RecentItem/RecentItem.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Utils.StorageItems;
 using Files.App.UserControls.Widgets;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Windows.Storage;

src/Files.App/Helpers/StorageCache/IFileListCache.cs → src/Files.App/Utils/Storage/Cache/IStorageCacheController.cs

@@ -1,15 +1,12 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Files.App.Helpers.StorageCache
+namespace Files.App.Utils.Storage
 {
-	internal interface IFileListCache
+	internal interface IStorageCacheController
 	{
 		public ValueTask<string> ReadFileDisplayNameFromCache(string path, CancellationToken cancellationToken);
 
 		public ValueTask SaveFileDisplayNameToCache(string path, string displayName);
 	}
-}
+}

src/Files.App/Helpers/StorageCache/FileListCacheController.cs → src/Files.App/Utils/Storage/Cache/StorageCacheController.cs

@@ -2,26 +2,24 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using System.Collections.Concurrent;
-using System.Threading;
-using System.Threading.Tasks;
 
-namespace Files.App.Helpers.StorageCache
+namespace Files.App.Utils.Storage
 {
-	internal class FileListCacheController : IFileListCache
+	internal class StorageCacheController : IStorageCacheController
 	{
-		private static FileListCacheController instance;
+		private static StorageCacheController instance;
 
-		public static FileListCacheController GetInstance()
+		private readonly ConcurrentDictionary<string, string> fileNamesCache = new();
+
+		private StorageCacheController()
 		{
-			return instance ??= new FileListCacheController();
 		}
 
-		private FileListCacheController()
+		public static StorageCacheController GetInstance()
 		{
+			return instance ??= new StorageCacheController();
 		}
 
-		private readonly ConcurrentDictionary<string, string> fileNamesCache = new();
-
 		public ValueTask<string> ReadFileDisplayNameFromCache(string path, CancellationToken cancellationToken)
 		{
 			return fileNamesCache.TryGetValue(path, out var displayName) ? ValueTask.FromResult(displayName) : ValueTask.FromResult(string.Empty);
@@ -38,4 +36,4 @@ public ValueTask SaveFileDisplayNameToCache(string path, string displayName)
 			return ValueTask.CompletedTask;
 		}
 	}
-}
+}

src/Files.App/Helpers/StorageItemCollection/BlockingListEnumerator.cs → src/Files.App/Utils/Storage/Collection/BlockingListEnumerator.cs

@@ -1,37 +1,36 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Files.App.Helpers
+namespace Files.App.Utils.Storage
 {
 	public class BlockingListEnumerator<T> : IEnumerator<T>
 	{
 		private readonly IList<T> m_Inner;
+
 		private readonly object m_Lock;
+
 		private T m_Current;
-		private int m_Pos;
 
-		public BlockingListEnumerator(IList<T> inner, object @lock)
-		{
-			m_Inner = inner;
-			m_Lock = @lock;
-			m_Pos = -1;
-		}
+		private int m_Pos;
 
 		public T Current
 		{
 			get
 			{
 				lock (m_Lock)
-				{
 					return m_Current;
-				}
 			}
 		}
 
-		object IEnumerator.Current => Current;
+		object IEnumerator.Current
+			=> Current;
+
+		public BlockingListEnumerator(IList<T> inner, object @lock)
+		{
+			m_Inner = inner;
+			m_Lock = @lock;
+			m_Pos = -1;
+		}
 
 		public void Dispose()
 		{

src/Files.App/Helpers/StorageItemCollection/BulkConcurrentObservableCollection.cs → src/Files.App/Utils/Storage/Collection/BulkConcurrentObservableCollection.cs

@@ -1,17 +1,9 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Shared.Extensions;
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
 
-namespace Files.App.Helpers
+namespace Files.App.Utils.Storage
 {
 	[DebuggerTypeProxy(typeof(CollectionDebugView<>))]
 	[DebuggerDisplay("Count = {Count}")]

src/Files.App/Utils/Storage/Collection/GroupedCollection.cs

@@ -0,0 +1,77 @@
+// Copyright (c) 2023 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+namespace Files.App.Utils.Storage
+{
+	public class GroupedCollection<T> : BulkConcurrentObservableCollection<T>, IGroupedCollectionHeader
+	{
+		public GroupedHeaderViewModel Model { get; set; }
+
+		public GroupedCollection(IEnumerable<T> items) : base(items)
+		{
+			AddEvents();
+		}
+
+		public GroupedCollection(string key) : base()
+		{
+			AddEvents();
+			Model = new GroupedHeaderViewModel()
+			{
+				Key = key,
+				Text = key,
+			};
+		}
+
+		public GroupedCollection(string key, string text) : base()
+		{
+			AddEvents();
+			Model = new GroupedHeaderViewModel()
+			{
+				Key = key,
+				Text = text,
+			};
+		}
+
+		private void AddEvents()
+		{
+			PropertyChanged += GroupedCollection_PropertyChanged;
+		}
+
+		private void GroupedCollection_PropertyChanged(object sender, PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName == nameof(Count))
+			{
+				Model.CountText = string.Format(Count > 1 ? "GroupItemsCount_Plural".GetLocalizedResource() : "GroupItemsCount_Singular".GetLocalizedResource(), Count);
+			}
+		}
+
+		public void InitializeExtendedGroupHeaderInfoAsync()
+		{
+			if (GetExtendedGroupHeaderInfo is null)
+			{
+				return;
+			}
+
+			Model.ResumePropertyChangedNotifications(false);
+
+			GetExtendedGroupHeaderInfo.Invoke(this);
+			Model.Initialized = true;
+			if (isBulkOperationStarted)
+			{
+				Model.PausePropertyChangedNotifications();
+			}
+		}
+
+		public override void BeginBulkOperation()
+		{
+			base.BeginBulkOperation();
+			Model.PausePropertyChangedNotifications();
+		}
+
+		public override void EndBulkOperation()
+		{
+			base.EndBulkOperation();
+			Model.ResumePropertyChangedNotifications();
+		}
+	}
+}