Uppdate

Author: 0x5bfa

src/Files.App.CsWin32/NativeMethods.txt

@@ -226,3 +226,4 @@ _SICHINTF
 RoGetAgileReference
 IQueryInfo
 QITIPF_FLAGS
+GetDiskFreeSpaceEx

src/Files.App.Storage/Storables/WindowsStorage/WindowsStorableHelpers.Storage.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using OwlCore.Storage;
 using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.Storage.FileSystem;
@@ -85,11 +86,24 @@ public static bool TryShowFormatDriveDialog(HWND hWnd, uint driveLetterIndex, SH
 			return result is 0xFFFF;
 		}
 
-		public static bool TryGetDriveInfo(this IWindowsStorable storable)
+		public static bool TryGetDriveTotalSpace(this IWindowsStorable storable, out ulong totalSize)
 		{
+			ulong ulTotalSize = 0UL;
+			bool res = PInvoke.GetDiskFreeSpaceEx(storable.GetDisplayName(), null, &ulTotalSize, null);
 
+			totalSize = ulTotalSize;
 
-			return true;
+			return res;
+		}
+
+		public static bool TryGetDriveFreeSpace(this IWindowsStorable storable, out ulong freeSize)
+		{
+			ulong ulFreeSize = 0UL;
+			bool res = PInvoke.GetDiskFreeSpaceEx(storable.GetDisplayName(), null, null, &ulFreeSize);
+
+			freeSize = ulFreeSize;
+
+			return res;
 		}
 	}
 }

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

@@ -17,15 +17,17 @@ public sealed partial class WidgetDriveCardItem : WidgetCardItem, IWidgetCardIte
 
 		public required string Text { get; set; }
 
-		public bool ShowStorageSense { get; set; }
+		public bool ShowStorageSense => UsedSize.GigaBytes / TotalSize.GigaBytes >= Constants.Widgets.Drives.LowStorageSpacePercentageThreshold;
 
-		public bool ShowDriveUsage { get; set; } = true;
+		public bool ShowDriveUsage => TotalSize.GigaBytes > 0D;
 
-		public string? UsageText { get; set; }
+		public ByteSizeLib.ByteSize TotalSize { get; set; } = default;
 
-		public ByteSizeLib.ByteSize TotalSpace { get; set; }
+		public ByteSizeLib.ByteSize FreeSize { get; set; } = default;
 
-		public ByteSizeLib.ByteSize SpaceUsed { get; set; }
+		public ByteSizeLib.ByteSize UsedSize => ByteSizeLib.ByteSize.FromBytes(TotalSize.Bytes - FreeSize.Bytes);
+
+		public string? UsageText => string.Format(Strings.DriveFreeSpaceAndCapacity.GetLocalizedResource(), FreeSize.ToSizeString(), TotalSize.ToSizeString());
 
 		private BitmapImage? _Thumbnail;
 		public BitmapImage? Thumbnail { get => _Thumbnail; set => SetProperty(ref _Thumbnail, value); }

src/Files.App/UserControls/Widgets/DrivesWidget.xaml

@@ -87,8 +87,8 @@
 								VerticalContentAlignment="Stretch"
 								x:Load="{x:Bind ShowDriveUsage, Mode=OneWay}"
 								AutomationProperties.AccessibilityView="Raw"
-								Maximum="{x:Bind TotalSpace.GigaBytes, Mode=OneWay}"
-								Value="{x:Bind SpaceUsed.GigaBytes, Mode=OneWay}" />
+								Maximum="{x:Bind TotalSize.GigaBytes, Mode=OneWay}"
+								Value="{x:Bind UsedSize.GigaBytes, Mode=OneWay}" />
 
 							<Button
 								x:Name="GoToStorageSense"

src/Files.App/UserControls/Widgets/NetworkLocationsWidget.xaml

@@ -113,8 +113,8 @@
 								VerticalContentAlignment="Stretch"
 								x:Load="{x:Bind ShowDriveUsage, Mode=OneWay}"
 								AutomationProperties.AccessibilityView="Raw"
-								Maximum="{x:Bind TotalSpace.GigaBytes, Mode=OneWay}"
-								Value="{x:Bind SpaceUsed.GigaBytes, Mode=OneWay}" />
+								Maximum="{x:Bind TotalSize.GigaBytes, Mode=OneWay}"
+								Value="{x:Bind UsedSize.GigaBytes, Mode=OneWay}" />
 
 							<TextBlock
 								x:Name="DriveSpaceTextBlock"

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

@@ -63,13 +63,18 @@ public Task RefreshWidgetAsync()
 
 				await foreach (IWindowsStorable folder in HomePageContext.HomeFolder.GetLogicalDrivesAsync(default))
 				{
+					folder.TryGetDriveTotalSpace(out var totalSize);
+					folder.TryGetDriveFreeSpace(out var freeSize);
+
 					Items.Insert(
 						Items.Count,
 						new()
 						{
 							Item = (IFolder)folder,
 							Text = folder.GetDisplayName(SIGDN.SIGDN_PARENTRELATIVEFORUI),
 							Path = folder.GetDisplayName(SIGDN.SIGDN_FILESYSPATH),
+							TotalSize = ByteSizeLib.ByteSize.FromBytes(totalSize),
+							FreeSize = ByteSizeLib.ByteSize.FromBytes(freeSize),
 						});
 				}
 			});