Pass storage item for preview and properties

Author: gave92

src/Files.App/Data/Enums/IconOptions.cs

@@ -19,19 +19,34 @@ public enum IconOptions
 		/// </summary>
 		UseCurrentScale = 1,
 
+		/// <summary>
+		/// Scale the thumbnail to the requested size.
+		/// </summary>
+		ResizeThumbnail = 2,
+
 		/// <summary>
 		/// Retrieve only the file icon, even a thumbnail is available. This has the best performance.
 		/// </summary>
-		ReturnIconOnly = 2,
+		ReturnIconOnly = 4,
 
 		/// <summary>
 		/// Retrieve only the thumbnail.
 		/// </summary>
-		ReturnThumbnailOnly = 4,
+		ReturnThumbnailOnly = 8,
 
 		/// <summary>
 		/// Retrieve a thumbnail only if it is cached or embedded in the file.
 		/// </summary>
-		ReturnOnlyIfCached = 8,
+		ReturnOnlyIfCached = 16,
+
+		/// <summary>
+		/// Default. Retrieve a thumbnail to display a preview of any single item (like a file, folder, or file group).
+		/// </summary>
+		SingleItem = 32,
+
+		/// <summary>
+		/// Retrieve a thumbnail to display previews of files (or other items) in a list.
+		/// </summary>
+		ListView = 64,
 	}
 }

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

@@ -108,6 +108,7 @@ public async Task<LocationItem> CreateLocationItemFromPathAsync(string path)
 				{
 					var result = await FileThumbnailHelper.GetIconAsync(
 						res.Result.Path,
+						res.Result,
 						Constants.ShellIconSizes.Small,
 						true,
 						IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);

src/Files.App/Utils/Storage/Helpers/FileThumbnailHelper.cs

@@ -8,19 +8,40 @@ namespace Files.App.Utils.Storage
 {
 	public static class FileThumbnailHelper
 	{
+		public static async Task<byte[]?> GetIconAsync(string? path, IStorageItem? item, uint requestedSize, bool isFolder, IconOptions iconOptions)
+		{
+			byte[]? result = null;
+			if (path is not null)
+				result ??= await GetIconAsync(path, requestedSize, isFolder, iconOptions);
+			if (item is not null)
+				result ??= await GetIconAsync(item, requestedSize, iconOptions);
+			return result;
+		}
+
 		/// <summary>
 		/// Returns icon or thumbnail for given file or folder
 		/// </summary>
-		public static async Task<byte[]?> GetIconAsync(string path, uint requestedSize, bool isFolder, IconOptions iconOptions)
+		public static Task<byte[]?> GetIconAsync(string path, uint requestedSize, bool isFolder, IconOptions iconOptions)
 		{
 			var size = iconOptions.HasFlag(IconOptions.UseCurrentScale) ? requestedSize * App.AppModel.AppWindowDPI : requestedSize;
 
-			return await Win32Helper.StartSTATask(() => Win32Helper.GetIcon(path, (int)size, isFolder, iconOptions));
+			return Win32Helper.StartSTATask(() => Win32Helper.GetIcon(path, (int)size, isFolder, iconOptions));
 		}
 
 		/// <summary>
 		/// Returns thumbnail for given file or folder using Storage API
 		/// </summary>
+		public static Task<byte[]?> GetIconAsync(IStorageItem item, uint requestedSize, IconOptions iconOptions)
+		{
+			var thumbnailOptions = (iconOptions.HasFlag(IconOptions.UseCurrentScale) ? ThumbnailOptions.UseCurrentScale : 0) |
+								   (iconOptions.HasFlag(IconOptions.ReturnOnlyIfCached) ? ThumbnailOptions.ReturnOnlyIfCached : 0) |
+								   (iconOptions.HasFlag(IconOptions.ResizeThumbnail) ? ThumbnailOptions.ResizeThumbnail : 0);
+
+			var thumbnailMode = iconOptions.HasFlag(IconOptions.ListView) ? ThumbnailMode.ListView : ThumbnailMode.SingleItem;
+
+			return GetIconAsync(item, requestedSize, thumbnailMode, thumbnailOptions);
+		}
+
 		public static async Task<byte[]?> GetIconAsync(IStorageItem item, uint requestedSize, ThumbnailMode thumbnailMode, ThumbnailOptions thumbnailOptions)
 		{
 			using StorageItemThumbnail thumbnail = item switch
@@ -40,14 +61,13 @@ public static class FileThumbnailHelper
 		/// <param name="path"></param>
 		/// <param name="isFolder"></param>
 		/// <returns></returns>
-		public static async Task<byte[]?> GetIconOverlayAsync(string path, bool isFolder)
-			=> await Win32Helper.StartSTATask(() => Win32Helper.GetIconOverlay(path, isFolder));
+		public static Task<byte[]?> GetIconOverlayAsync(string path, bool isFolder)
+			=> Win32Helper.StartSTATask(() => Win32Helper.GetIconOverlay(path, isFolder));
 
 		[Obsolete]
-		public static async Task<byte[]?> LoadIconFromPathAsync(string filePath, uint thumbnailSize, ThumbnailMode thumbnailMode, ThumbnailOptions thumbnailOptions, bool isFolder = false)
+		public static Task<byte[]?> LoadIconFromPathAsync(string filePath, uint thumbnailSize, ThumbnailMode thumbnailMode, ThumbnailOptions thumbnailOptions, bool isFolder = false)
 		{
-			var result = await GetIconAsync(filePath, thumbnailSize, isFolder, IconOptions.None);
-			return result;
+			return GetIconAsync(filePath, thumbnailSize, isFolder, IconOptions.None);
 		}
 	}
 }

src/Files.App/Utils/Storage/Search/FolderSearch.cs

@@ -512,6 +512,7 @@ private async Task<ListedItem> GetListedItemAsync(IStorageItem item)
 			{
 				var iconResult = await FileThumbnailHelper.GetIconAsync(
 					item.Path,
+					item,
 					Constants.ShellIconSizes.Small,
 					item.IsOfType(StorageItemTypes.Folder),
 					IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);

src/Files.App/ViewModels/Properties/Items/DriveProperties.cs

@@ -52,6 +52,7 @@ public async override Task GetSpecialPropertiesAsync()
 			{
 				var result = await FileThumbnailHelper.GetIconAsync(
 					Drive.Path,
+					diskRoot,
 					Constants.ShellIconSizes.ExtraLarge,
 					true,
 					IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);

src/Files.App/ViewModels/Properties/Items/FileProperties.cs

@@ -108,8 +108,13 @@ public override async Task GetSpecialPropertiesAsync()
 				ViewModel.ItemSizeOnDisk = Win32Helper.GetFileSizeOnDisk(Item.ItemPath)?.ToLongSizeString() ??
 				   string.Empty;
 
+			string filePath = (Item as ShortcutItem)?.TargetPath ?? Item.ItemPath;
+			BaseStorageFile? file = !string.IsNullOrWhiteSpace(filePath) ?
+				await AppInstance.ShellViewModel.GetFileFromPathAsync(filePath) : null!;
+
 			var result = await FileThumbnailHelper.GetIconAsync(
 				Item.ItemPath,
+				file,
 				Constants.ShellIconSizes.ExtraLarge,
 				false,
 				IconOptions.UseCurrentScale);
@@ -132,9 +137,6 @@ public override async Task GetSpecialPropertiesAsync()
 				}
 			}
 
-			string filePath = (Item as ShortcutItem)?.TargetPath ?? Item.ItemPath;
-			BaseStorageFile file = await AppInstance.ShellViewModel.GetFileFromPathAsync(filePath);
-
 			// Couldn't access the file and can't load any other properties
 			if (file is null)
 				return;
@@ -152,7 +154,7 @@ public override async Task GetSpecialPropertiesAsync()
 						ViewModel.UncompressedItemSizeBytes = uncompressedSize;
 					}
 
-			if (file.Properties is not null)
+			if (file?.Properties is not null)
 				GetOtherPropertiesAsync(file.Properties);
 		}
 

src/Files.App/ViewModels/Properties/Items/FolderProperties.cs

@@ -79,8 +79,13 @@ public async override Task GetSpecialPropertiesAsync()
 			ViewModel.CanCompressContent = Win32Helper.CanCompressContent(Item.ItemPath);
 			ViewModel.IsContentCompressed = Win32Helper.HasFileAttribute(Item.ItemPath, System.IO.FileAttributes.Compressed);
 
+			string folderPath = (Item as ShortcutItem)?.TargetPath ?? Item.ItemPath;
+			BaseStorageFolder? storageFolder = !string.IsNullOrWhiteSpace(folderPath) ? 
+				await AppInstance.ShellViewModel.GetFolderFromPathAsync(folderPath) : null!;
+
 			var result = await FileThumbnailHelper.GetIconAsync(
 				Item.ItemPath,
+				storageFolder,
 				Constants.ShellIconSizes.ExtraLarge,
 				true,
 				IconOptions.UseCurrentScale);
@@ -111,9 +116,6 @@ public async override Task GetSpecialPropertiesAsync()
 				}
 			}
 
-			string folderPath = (Item as ShortcutItem)?.TargetPath ?? Item.ItemPath;
-			BaseStorageFolder storageFolder = await AppInstance.ShellViewModel.GetFolderFromPathAsync(folderPath);
-
 			if (storageFolder is not null)
 			{
 				ViewModel.ItemCreatedTimestampReal = storageFolder.DateCreated;

src/Files.App/ViewModels/ShellViewModel.cs

@@ -1096,18 +1096,17 @@ private async Task<bool> LoadThumbnailAsync(ListedItem item, IStorageItem matchi
 			// SingleItem returns image thumbnails in the correct aspect ratio for the grid layouts
 			// ListView is used for the details and columns layout
 			// We use ReturnOnlyIfCached because otherwise folders thumbnails have a black background, this has the downside the folder previews don't work
-			var (thumbnailMode, thumbnailOptions) = matchingStorageItem switch
+			var iconOptions = matchingStorageItem switch
 			{
-				BaseStorageFolder => (ThumbnailMode.SingleItem, ThumbnailOptions.ReturnOnlyIfCached),
-				BaseStorageFile when thumbnailSize < 96 => (ThumbnailMode.ListView, ThumbnailOptions.ResizeThumbnail),
-				_ => (ThumbnailMode.SingleItem, ThumbnailOptions.ResizeThumbnail),
+				BaseStorageFolder => IconOptions.SingleItem | IconOptions.ReturnOnlyIfCached,
+				BaseStorageFile when thumbnailSize < 96 => IconOptions.ListView | IconOptions.ResizeThumbnail,
+				_ => IconOptions.SingleItem | IconOptions.ResizeThumbnail,
 			};
 
 			var result = await FileThumbnailHelper.GetIconAsync(
 						matchingStorageItem, 
-						thumbnailSize, 
-						thumbnailMode, 
-						thumbnailOptions);
+						thumbnailSize,
+						iconOptions);
 
 			if (result is not null)
 			{

src/Files.App/ViewModels/UserControls/Previews/BasePreviewModel.cs

@@ -86,6 +86,7 @@ public async virtual Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
 		{
 			var result = await FileThumbnailHelper.GetIconAsync(
 				Item.ItemPath,
+				Item.ItemFile,
 				Constants.ShellIconSizes.Jumbo,
 				false,
 				IconOptions.None);

src/Files.App/ViewModels/UserControls/Previews/FolderPreviewViewModel.cs

@@ -29,6 +29,7 @@ private async Task LoadPreviewAndDetailsAsync()
 
 			var result = await FileThumbnailHelper.GetIconAsync(
 				Item.ItemPath,
+				Folder,
 				Constants.ShellIconSizes.Jumbo,
 				true,
 				IconOptions.None);