Code Quality: Improved app startup routine 2 - Checkpoint 1 (files-co…

…mmunity#13854)
hishitetsu · Nov 14, 2023 · 12391aa · 12391aa
1 parent 49deb0c
commit 12391aa
Show file tree

Hide file tree

Showing 23 changed files with 247 additions and 178 deletions.
diff --git a/src/Files.App/Actions/Start/PinToStartAction.cs b/src/Files.App/Actions/Start/PinToStartAction.cs
@@ -1,10 +1,17 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Files.Core.Storage;
+
 namespace Files.App.Actions
 {
 	internal class PinToStartAction : IAction
 	{
+		private IStorageService StorageService { get; } = Ioc.Default.GetRequiredService<IStorageService>();
+
+		private IStartMenuService StartMenuService { get; } = Ioc.Default.GetRequiredService<IStartMenuService>();
+
 		public IContentPageContext context;
 
 		public string Label
@@ -29,11 +36,17 @@ public async Task ExecuteAsync()
 			if (context.SelectedItems.Count > 0 && context.ShellPage?.SlimContentPage?.SelectedItems is not null)
 			{
 				foreach (ListedItem listedItem in context.ShellPage.SlimContentPage.SelectedItems)
-					await App.SecondaryTileHelper.TryPinFolderAsync(listedItem.ItemPath, listedItem.Name);
+				{
+					var folder = await StorageService.GetFolderAsync(listedItem.ItemPath);
+					await StartMenuService.PinAsync(folder, listedItem.Name);
+				}
 			}
 			else if (context.ShellPage?.FilesystemViewModel?.CurrentFolder is not null)
 			{
-				await App.SecondaryTileHelper.TryPinFolderAsync(context.ShellPage.FilesystemViewModel.CurrentFolder.ItemPath, context.ShellPage.FilesystemViewModel.CurrentFolder.Name);
+				var currentFolder = context.ShellPage.FilesystemViewModel.CurrentFolder;
+				var folder = await StorageService.GetFolderAsync(currentFolder.ItemPath);
+
+				await StartMenuService.PinAsync(folder, currentFolder.Name);
 			}
 		}
 	}

diff --git a/src/Files.App/Actions/Start/UnpinFromStartAction.cs b/src/Files.App/Actions/Start/UnpinFromStartAction.cs
@@ -1,10 +1,16 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Core.Storage;
+
 namespace Files.App.Actions
 {
 	internal class UnpinFromStartAction : IAction
 	{
+		private IStorageService StorageService { get; } = Ioc.Default.GetRequiredService<IStorageService>();
+
+		private IStartMenuService StartMenuService { get; } = Ioc.Default.GetRequiredService<IStartMenuService>();
+
 		public IContentPageContext context;
 
 		public string Label
@@ -26,11 +32,17 @@ public async Task ExecuteAsync()
 			if (context.SelectedItems.Count > 0)
 			{
 				foreach (ListedItem listedItem in context.ShellPage?.SlimContentPage.SelectedItems)
-					await App.SecondaryTileHelper.UnpinFromStartAsync(listedItem.ItemPath);
+				{
+					var folder = await StorageService.GetFolderAsync(listedItem.ItemPath);
+					await StartMenuService.UnpinAsync(folder);
+				}
 			}
 			else
 			{
-				await App.SecondaryTileHelper.UnpinFromStartAsync(context.ShellPage?.FilesystemViewModel.CurrentFolder.ItemPath);
+				var currentFolder = context.ShellPage.FilesystemViewModel.CurrentFolder;
+				var folder = await StorageService.GetFolderAsync(currentFolder.ItemPath);
+
+				await StartMenuService.UnpinAsync(folder);
 			}
 		}
 	}

diff --git a/src/Files.App/App.xaml.cs b/src/Files.App/App.xaml.cs
@@ -45,13 +45,10 @@ public partial class App : Application
 		public static AppModel AppModel { get; private set; }
 		public static RecentItems RecentItemsManager { get; private set; }
 		public static QuickAccessManager QuickAccessManager { get; private set; }
-		public static CloudDrivesManager CloudDrivesManager { get; private set; }
-		public static WSLDistroManager WSLDistroManager { get; private set; }
 		public static LibraryManager LibraryManager { get; private set; }
 		public static FileTagsManager FileTagsManager { get; private set; }
 
 		public static ILogger Logger { get; private set; }
-		public static SecondaryTileHelper SecondaryTileHelper { get; private set; } = new();
 
 		/// <summary>
 		/// Initializes the singleton application object. This is the first line of authored code
@@ -138,6 +135,7 @@ private IHost ConfigureHost()
 					.AddSingleton<IJumpListService, JumpListService>()
 					.AddSingleton<IRemovableDrivesService, RemovableDrivesService>()
 					.AddSingleton<INetworkDrivesService, NetworkDrivesService>()
+					.AddSingleton<IStartMenuService, StartMenuService>()
 					.AddSingleton<MainPageViewModel>()
 					.AddSingleton<PreviewPaneViewModel>()
 					.AddSingleton<SidebarViewModel>()
@@ -156,31 +154,30 @@ private static async Task InitializeAppComponentsAsync()
 			var generalSettingsService = userSettingsService.GeneralSettingsService;
 
 			// Start off a list of tasks we need to run before we can continue startup
-			await Task.Run(async () =>
-			{
-				await Task.WhenAll(
-					OptionalTaskAsync(CloudDrivesManager.UpdateDrivesAsync(), generalSettingsService.ShowCloudDrivesSection),
-					LibraryManager.UpdateLibrariesAsync(),
-					OptionalTaskAsync(WSLDistroManager.UpdateDrivesAsync(), generalSettingsService.ShowWslSection),
-					OptionalTaskAsync(FileTagsManager.UpdateFileTagsAsync(), generalSettingsService.ShowFileTagsSection),
-					QuickAccessManager.InitializeAsync()
-				);
-
-				await Task.WhenAll(
-					JumpListHelper.InitializeUpdatesAsync(),
-					addItemService.InitializeAsync(),
-					ContextMenu.WarmUpQueryContextMenuAsync()
-				);
-
-				FileTagsHelper.UpdateTagsDb();
-			});
+			await Task.WhenAll(
+				OptionalTaskAsync(CloudDrivesManager.UpdateDrivesAsync(), generalSettingsService.ShowCloudDrivesSection),
+				LibraryManager.UpdateLibrariesAsync(),
+				OptionalTaskAsync(WSLDistroManager.UpdateDrivesAsync(), generalSettingsService.ShowWslSection),
+				OptionalTaskAsync(FileTagsManager.UpdateFileTagsAsync(), generalSettingsService.ShowFileTagsSection),
+				QuickAccessManager.InitializeAsync()
+			);
+
+			await Task.WhenAll(
+				JumpListHelper.InitializeUpdatesAsync(),
+				addItemService.InitializeAsync(),
+				ContextMenu.WarmUpQueryContextMenuAsync()
+			);
+
+			FileTagsHelper.UpdateTagsDb();
 
 			await CheckForRequiredUpdatesAsync();
 
-			static async Task OptionalTaskAsync(Task task, bool condition)
+			static Task OptionalTaskAsync(Task task, bool condition)
 			{
 				if (condition)
-					await task;
+					return task;
+
+				return Task.CompletedTask;
 			}
 		}
 
@@ -238,8 +235,7 @@ async Task ActivateAsync()
 				await SplashScreenLoadingTCS!.Task.WithTimeoutAsync(TimeSpan.FromMilliseconds(500));
 				SplashScreenLoadingTCS = null;
 
-				_ = InitializeAppComponentsAsync().ContinueWith(t => Logger.LogWarning(t.Exception, "Error during InitializeAppComponentsAsync()"), TaskContinuationOptions.OnlyOnFaulted);
-
+				_ = InitializeAppComponentsAsync();
 				_ = MainWindow.Instance.InitializeApplicationAsync(appActivationArguments.Data);
 			}
 		}
@@ -251,8 +247,6 @@ private static void EnsureSettingsAndConfigurationAreBootstrapped()
 			RecentItemsManager ??= new RecentItems();
 			AppModel ??= new AppModel();
 			LibraryManager ??= new LibraryManager();
-			CloudDrivesManager ??= new CloudDrivesManager();
-			WSLDistroManager ??= new WSLDistroManager();
 			FileTagsManager ??= new FileTagsManager();
 			QuickAccessManager ??= new QuickAccessManager();
 		}
@@ -388,8 +382,7 @@ await SafetyExtensions.IgnoreExceptions(async () =>
 		/// </summary>
 		public static void SaveSessionTabs()
 		{
-			IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
-
+			var userSettingsService = Ioc.Default.GetService<IUserSettingsService>() ?? new UserSettingsService();
 			userSettingsService.GeneralSettingsService.LastSessionTabList = MainPageViewModel.AppInstances.DefaultIfEmpty().Select(tab =>
 			{
 				if (tab is not null && tab.NavigationParameter is not null)

diff --git a/src/Files.App/Data/Items/ListedItem.cs b/src/Files.App/Data/Items/ListedItem.cs
@@ -18,6 +18,8 @@ public class ListedItem : ObservableObject, IGroupableItem
 	{
 		protected static IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 
+		protected static IStartMenuService StartMenuService { get; } = Ioc.Default.GetRequiredService<IStartMenuService>();
+
 		protected static readonly IFileTagsSettingsService fileTagsSettingsService = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
 
 		protected static readonly IDateTimeFormatter dateTimeFormatter = Ioc.Default.GetRequiredService<IDateTimeFormatter>();
@@ -180,7 +182,7 @@ public BitmapImage FileImage
 			}
 		}
 
-		public bool IsItemPinnedToStart => App.SecondaryTileHelper.CheckFolderPinned(ItemPath);
+		public bool IsItemPinnedToStart => StartMenuService.IsPinned(ItemPath);
 
 		private BitmapImage iconOverlay;
 		public BitmapImage IconOverlay

diff --git a/src/Files.App/Data/Models/BitmapImageModel.cs b/src/Files.App/Data/Models/BitmapImageModel.cs
@@ -1,12 +1,13 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.Shared.Utils;
 using Microsoft.UI.Xaml.Media.Imaging;
 
 namespace Files.App.Data.Models
 {
-	/// <inheritdoc cref="IImageModel"/>
-	internal sealed class BitmapImageModel : IImageModel
+	/// <inheritdoc cref="IImage"/>
+	internal sealed class BitmapImageModel : IImage
 	{
 		public BitmapImage Image { get; }
 

diff --git a/src/Files.App/Data/Models/ItemViewModel.cs b/src/Files.App/Data/Models/ItemViewModel.cs
@@ -1494,7 +1494,7 @@ public void CloseWatcher()
 		private async Task<int> EnumerateItemsFromStandardFolderAsync(string path, CancellationToken cancellationToken, LibraryItem? library = null)
 		{
 			// Flag to use FindFirstFileExFromApp or StorageFolder enumeration - Use storage folder for Box Drive (#4629)
-			var isBoxFolder = App.CloudDrivesManager.Drives.FirstOrDefault(x => x.Text == "Box")?.Path?.TrimEnd('\\') is string boxFolder && path.StartsWith(boxFolder);
+			var isBoxFolder = CloudDrivesManager.Drives.FirstOrDefault(x => x.Text == "Box")?.Path?.TrimEnd('\\') is string boxFolder && path.StartsWith(boxFolder);
 			bool isWslDistro = path.StartsWith(@"\\wsl$\", StringComparison.OrdinalIgnoreCase) || path.StartsWith(@"\\wsl.localhost\", StringComparison.OrdinalIgnoreCase)
 				|| path.Equals(@"\\wsl$", StringComparison.OrdinalIgnoreCase) || path.Equals(@"\\wsl.localhost", StringComparison.OrdinalIgnoreCase);
 			bool isMtp = path.StartsWith(@"\\?\", StringComparison.Ordinal);

diff --git a/src/Files.App/Helpers/UI/SecondaryTileHelper.cs b/src/Files.App/Helpers/UI/SecondaryTileHelper.cs
diff --git a/src/Files.App/Services/ImagingService.cs b/src/Files.App/Services/ImagingService.cs
@@ -3,14 +3,15 @@
 
 using Files.Core.Storage;
 using Files.Core.Storage.LocatableStorage;
+using Files.Shared.Utils;
 using Windows.Storage.FileProperties;
 
 namespace Files.App.Services
 {
 	internal sealed class ImagingService : IImageService
 	{
 		/// <inheritdoc/>
-		public async Task<IImageModel?> GetIconAsync(IStorable storable, CancellationToken cancellationToken)
+		public async Task<IImage?> GetIconAsync(IStorable storable, CancellationToken cancellationToken)
 		{
 			if (storable is not ILocatableStorable locatableStorable)
 				return null;
@@ -23,12 +24,12 @@ internal sealed class ImagingService : IImageService
 			return new BitmapImageModel(bitmapImage);
 		}
 
-		public async Task<IImageModel?> GetImageModelFromDataAsync(byte[] rawData)
+		public async Task<IImage?> GetImageModelFromDataAsync(byte[] rawData)
 		{
 			return new BitmapImageModel(await BitmapHelper.ToBitmapAsync(rawData));
 		}
 
-		public async Task<IImageModel?> GetImageModelFromPathAsync(string filePath, uint thumbnailSize = 64)
+		public async Task<IImage?> GetImageModelFromPathAsync(string filePath, uint thumbnailSize = 64)
 		{
 			if (await FileThumbnailHelper.LoadIconFromPathAsync(filePath, thumbnailSize, ThumbnailMode.ListView, ThumbnailOptions.ResizeThumbnail) is byte[] imageBuffer)
 				return await GetImageModelFromDataAsync(imageBuffer);