Init

Author: 0x5bfa

src/Files.App/Data/Contracts/IWidgetCardItem.cs

@@ -7,6 +7,8 @@ namespace Files.App.Data.Contracts
 {
 	public interface IWidgetCardItem<T>
 	{
+		string? Path { get; }
+
 		T Item { get; }
 
 		BitmapImage Thumbnail { get; }

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

@@ -9,7 +9,5 @@ namespace Files.App.Data.Items
 	public abstract class WidgetCardItem : ObservableObject
 	{
 		public virtual string? Path { get; set; }
-
-		public virtual object? Item { get; set; }
 	}
 }

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

@@ -2,50 +2,45 @@
 // Licensed under the MIT License.
 
 using Microsoft.UI.Xaml.Media.Imaging;
+using Windows.Win32;
+using Windows.Win32.UI.Shell;
 
 namespace Files.App.Data.Items
 {
-	public sealed partial class WidgetDriveCardItem : WidgetCardItem, IWidgetCardItem<DriveItem>, IComparable<WidgetDriveCardItem>
+	public sealed partial class WidgetDriveCardItem : WidgetCardItem, IWidgetCardItem<IWindowsStorable>, IDisposable
 	{
-		private byte[] thumbnailData;
+		// Properties
 
-		public new DriveItem Item { get; private set; }
+		public required new IWindowsStorable Item { get; private set; }
 
-		private BitmapImage thumbnail;
-		public BitmapImage Thumbnail
-		{
-			get => thumbnail;
-			set => SetProperty(ref thumbnail, value);
-		}
+		public required string Path { get; set; }
+
+		public required string Text { get; set; }
+
+		private BitmapImage _Thumbnail;
+		public BitmapImage Thumbnail { get => _Thumbnail; set => SetProperty(ref _Thumbnail, value); }
+
+		// Constructor
 
-		public WidgetDriveCardItem(DriveItem item)
+		public WidgetDriveCardItem()
 		{
-			Item = item;
-			Path = item.Path;
 		}
 
 		public async Task LoadCardThumbnailAsync()
 		{
-			var result = await FileThumbnailHelper.GetIconAsync(
-				Item.Path,
-				Constants.ShellIconSizes.Large,
-				true,
-				IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);
-
-			if (result is null)
-			{
-				using var thumbnail = await DriveHelpers.GetThumbnailAsync(Item.Root);
-				result ??= await thumbnail.ToByteArrayAsync();
-			}
-
-			thumbnailData = result;
-
-			var bitmapImage = await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() => thumbnailData.ToBitmapAsync(), Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal);
-			if (bitmapImage is not null)
-				Thumbnail = bitmapImage;
+			if (string.IsNullOrEmpty(Path))
+				return;
+
+			Item.TryGetThumbnail((int)(Constants.ShellIconSizes.Large * App.AppModel.AppWindowDPI), SIIGBF.SIIGBF_ICONONLY, out var rawThumbnailData);
+			if (rawThumbnailData is null)
+				return;
+
+			Thumbnail = await rawThumbnailData.ToBitmapAsync();
 		}
 
-		public int CompareTo(WidgetDriveCardItem? other)
-			=> Item.Path.CompareTo(other?.Item?.Path);
+		public void Dispose()
+		{
+			throw new NotImplementedException();
+		}
 	}
 }

src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs

@@ -35,31 +35,31 @@ public sealed partial class DrivesWidgetViewModel : BaseWidgetViewModel, IWidget
 
 		public DrivesWidgetViewModel()
 		{
-			Drives_CollectionChanged(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-
-			DrivesViewModel.Drives.CollectionChanged += Drives_CollectionChanged;
+			Items.CollectionChanged += Items_CollectionChanged;
+			UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;
 
 			PinToSidebarCommand = new AsyncRelayCommand<WidgetCardItem>(ExecutePinToSidebarCommand);
 			UnpinFromSidebarCommand = new AsyncRelayCommand<WidgetCardItem>(ExecuteUnpinFromSidebarCommand);
 			EjectDeviceCommand = new RelayCommand<WidgetDriveCardItem>(ExecuteEjectDeviceCommand);
 			OpenPropertiesCommand = new RelayCommand<WidgetDriveCardItem>(ExecuteOpenPropertiesCommand);
 			DisconnectNetworkDriveCommand = new RelayCommand<WidgetDriveCardItem>(ExecuteDisconnectNetworkDriveCommand);
-
-			UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;
 		}
 
 		// Methods
 
-		private async void UserSettingsService_OnSettingChangedEvent(object? sender, SettingChangedEventArgs e)
+		public Task RefreshWidgetAsync()
 		{
-			if (e.SettingName == nameof(UserSettingsService.FoldersSettingsService.SizeUnitFormat))
-				await RefreshWidgetAsync();
-		}
+			return MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(async () =>
+			{
+				foreach (var item in Items)
+					item.Dispose();
 
-		public async Task RefreshWidgetAsync()
-		{
-			var updateTasks = Items.Select(item => item.Item.UpdatePropertiesAsync());
-			await Task.WhenAll(updateTasks);
+				Items.Clear();
+
+				await foreach (IWindowsStorable folder in HomePageContext.HomeFolder.GetLogicalDrivesAsync(default))
+				{
+				}
+			});
 		}
 
 		public async Task NavigateToPath(string path)
@@ -214,6 +214,12 @@ private void ExecuteDisconnectNetworkDriveCommand(WidgetDriveCardItem? item)
 
 		// Event methods
 
+		private async void UserSettingsService_OnSettingChangedEvent(object? sender, SettingChangedEventArgs e)
+		{
+			if (e.SettingName == nameof(UserSettingsService.FoldersSettingsService.SizeUnitFormat))
+				await RefreshWidgetAsync();
+		}
+
 		private async void Drives_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
 		{
 			await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(async () =>