Skip to content

Fix: Fixed an issue where drive capacity was reported incorrectly #16960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yaira2 merged 1 commit into from
Mar 20, 2025
Merged

Fix: Fixed an issue where drive capacity was reported incorrectly #16960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Files.App/Data/Models/ByteSize.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ public struct ByteSize : IEquatable<ByteSize>, IComparable<ByteSize>
{
private static readonly FrozenDictionary<string, string> units = new Dictionary<string, string>
{
[ByteSizeLib.ByteSize.BitSymbol] = "ByteSymbol".ToLocalized(),
[ByteSizeLib.ByteSize.ByteSymbol] = "ByteSymbol".ToLocalized(),
[ByteSizeLib.ByteSize.KibiByteSymbol] = "KiloByteSymbol".ToLocalized(),
[ByteSizeLib.ByteSize.MebiByteSymbol] = "MegaByteSymbol".ToLocalized(),
[ByteSizeLib.ByteSize.GibiByteSymbol] = "GigaByteSymbol".ToLocalized(),
[ByteSizeLib.ByteSize.TebiByteSymbol] = "TeraByteSymbol".ToLocalized(),
[ByteSizeLib.ByteSize.PebiByteSymbol] = "PetaByteSymbol".ToLocalized(),
[ByteSizeLib.ByteSize.BitSymbol] = Strings.ByteSymbol.ToLocalized(),
[ByteSizeLib.ByteSize.ByteSymbol] = Strings.ByteSymbol.ToLocalized(),
[ByteSizeLib.ByteSize.KiloByteSymbol] = Strings.KiloByteSymbol.ToLocalized(),
[ByteSizeLib.ByteSize.MegaByteSymbol] = Strings.MegaByteSymbol.ToLocalized(),
[ByteSizeLib.ByteSize.GigaByteSymbol] = Strings.GigaByteSymbol.ToLocalized(),
[ByteSizeLib.ByteSize.TeraByteSymbol] = Strings.TeraByteSymbol.ToLocalized(),
[ByteSizeLib.ByteSize.PetaByteSymbol] = Strings.PetaByteSymbol.ToLocalized(),
}.ToFrozenDictionary();

private readonly ByteSizeLib.ByteSize size;
Expand All @@ -28,7 +28,7 @@ public ulong Bytes
=> (ulong)size.Bytes;

public string ShortString
=> $"{size.LargestWholeNumberBinaryValue:0.##} {units[size.LargestWholeNumberBinarySymbol]}";
=> $"{size.LargestWholeNumberDecimalValue:0.##} {units[size.LargestWholeNumberDecimalSymbol]}";

public string LongString
=> $"{ShortString} ({size.Bytes:#,##0} {units[ByteSizeLib.ByteSize.ByteSymbol]})";
Expand Down
16 changes: 8 additions & 8 deletions src/Files.App/Extensions/StringExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ public static string WithEnding(this string str, string ending)

private static readonly Dictionary<string, string> abbreviations = new()
{
{ "KiB", "KiloByteSymbol".GetLocalizedResource() },
{ "MiB", "MegaByteSymbol".GetLocalizedResource() },
{ "GiB", "GigaByteSymbol".GetLocalizedResource() },
{ "TiB", "TeraByteSymbol".GetLocalizedResource() },
{ "PiB", "PetaByteSymbol".GetLocalizedResource() },
{ "B", "ByteSymbol".GetLocalizedResource() },
{ "b", "ByteSymbol".GetLocalizedResource() }
{ ByteSize.KiloByteSymbol, Strings.KiloByteSymbol.GetLocalizedResource() },
{ ByteSize.MegaByteSymbol, Strings.MegaByteSymbol.GetLocalizedResource() },
{ ByteSize.GigaByteSymbol, Strings.GigaByteSymbol.GetLocalizedResource() },
{ ByteSize.TeraByteSymbol, Strings.TeraByteSymbol.GetLocalizedResource() },
{ ByteSize.PetaByteSymbol, Strings.PetaByteSymbol.GetLocalizedResource() },
{ ByteSize.BitSymbol, Strings.ByteSymbol.GetLocalizedResource() },
{ ByteSize.ByteSymbol, Strings.ByteSymbol.GetLocalizedResource() }
};

public static string ConvertSizeAbbreviation(this string value)
Expand All @@ -83,7 +83,7 @@ public static string ConvertSizeAbbreviation(this string value)
public static string ToSizeString(this long size) => ByteSize.FromBytes(size).ToSizeString();
public static string ToSizeString(this ulong size) => ByteSize.FromBytes(size).ToSizeString();
public static string ToSizeString(this decimal size) => ByteSize.FromBytes((double)size).ToSizeString();
public static string ToSizeString(this ByteSize size) => size.ToBinaryString().ConvertSizeAbbreviation();
public static string ToSizeString(this ByteSize size) => size.ToString().ConvertSizeAbbreviation();

public static string ToLongSizeString(this long size) => ByteSize.FromBytes(size).ToLongSizeString();
public static string ToLongSizeString(this ulong size) => ByteSize.FromBytes(size).ToLongSizeString();
Expand Down
Loading