From 4cbc8da22abfb06c71a617b8e7d5ec653d1e9aa2 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Tue, 26 Sep 2023 01:29:40 +0100 Subject: [PATCH] Use Humanizer to print bytes. --- Aaru.Core/Aaru.Core.csproj | 1 + Aaru.Core/Devices/Dumping/MiniDisc.cs | 39 +- .../PlayStationPortable/MemoryStick.cs | 39 +- .../Dumping/PlayStationPortable/UMD.cs | 33 +- Aaru.Core/Devices/Dumping/Sbc/Dump.cs | 39 +- Aaru.Core/Devices/Scanning/SCSI.cs | 45 +- Aaru.Gui/Aaru.Gui.csproj | 1 + .../ViewModels/Panels/MediaInfoViewModel.cs | 22 +- Aaru.Localization/Core.Designer.cs | 15505 ++++++++++------ Aaru.Localization/Core.resx | 20 +- Aaru/Aaru.csproj | 1 + Aaru/Commands/Media/Info.cs | 41 +- 12 files changed, 9507 insertions(+), 6279 deletions(-) diff --git a/Aaru.Core/Aaru.Core.csproj b/Aaru.Core/Aaru.Core.csproj index 668d32fbe..ee798d162 100644 --- a/Aaru.Core/Aaru.Core.csproj +++ b/Aaru.Core/Aaru.Core.csproj @@ -73,6 +73,7 @@ + diff --git a/Aaru.Core/Devices/Dumping/MiniDisc.cs b/Aaru.Core/Devices/Dumping/MiniDisc.cs index acf881031..7dc8d1a93 100644 --- a/Aaru.Core/Devices/Dumping/MiniDisc.cs +++ b/Aaru.Core/Devices/Dumping/MiniDisc.cs @@ -47,6 +47,7 @@ using Aaru.Core.Graphics; using Aaru.Core.Logging; using Aaru.Decoders.SCSI; using Aaru.Devices; +using Humanizer.Bytes; using Version = Aaru.CommonTypes.Interop.Version; namespace Aaru.Core.Devices.Dumping; @@ -121,41 +122,9 @@ partial class Dump { blocks++; - ulong totalSize = blocks * blockSize; - - switch(totalSize) - { - case > 1099511627776: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_TiB, - blocks, blockSize, totalSize / 1099511627776d)); - - break; - case > 1073741824: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_GiB, - blocks, blockSize, totalSize / 1073741824d)); - - break; - case > 1048576: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_MiB, - blocks, blockSize, totalSize / 1048576d)); - - break; - case > 1024: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_KiB, - blocks, blockSize, totalSize / 1024d)); - - break; - default: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_bytes, - blocks, blockSize, totalSize)); - - break; - } + UpdateStatus?.Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2, + blocks, blockSize, + ByteSize.FromBytes(blocks * blockSize).ToString("0.000"))); } // Check how many blocks to read, if error show and return diff --git a/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs b/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs index eeeb98c6c..f8e8b14e3 100644 --- a/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs +++ b/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs @@ -47,6 +47,7 @@ using Aaru.Core.Graphics; using Aaru.Core.Logging; using Aaru.Decoders.SCSI; using Aaru.Devices; +using Humanizer.Bytes; using Version = Aaru.CommonTypes.Interop.Version; namespace Aaru.Core.Devices.Dumping; @@ -90,41 +91,9 @@ public partial class Dump blocks++; - ulong totalSize = blocks * (ulong)blockSize; - - switch(totalSize) - { - case > 1099511627776: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_TiB, - blocks, blockSize, totalSize / 1099511627776d)); - - break; - case > 1073741824: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_GiB, - blocks, blockSize, totalSize / 1073741824d)); - - break; - case > 1048576: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_MiB, - blocks, blockSize, totalSize / 1048576d)); - - break; - case > 1024: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_KiB, - blocks, blockSize, totalSize / 1024d)); - - break; - default: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_bytes, - blocks, blockSize, totalSize)); - - break; - } + UpdateStatus?.Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2, + blocks, blockSize, + ByteSize.FromBytes(blocks * blockSize).ToString("0.000"))); if(blocks == 0) { diff --git a/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs b/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs index 3878353e1..6e9b3000d 100644 --- a/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs +++ b/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs @@ -45,6 +45,7 @@ using Aaru.Core.Graphics; using Aaru.Core.Logging; using Aaru.Decoders.SCSI; using Aaru.Devices; +using Humanizer.Bytes; using Track = Aaru.CommonTypes.Structs.Track; using TrackType = Aaru.CommonTypes.Enums.TrackType; using Version = Aaru.CommonTypes.Interop.Version; @@ -109,35 +110,9 @@ public partial class Dump ulong blocks = umdSizeInBytes / blockSize; string mediaPartNumber = Encoding.ASCII.GetString(readBuffer, 0, 11).Trim(); - ulong totalSize = blocks * blockSize; - - switch(totalSize) - { - case > 1073741824: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_GiB, - blocks, blockSize, totalSize / 1073741824d)); - - break; - case > 1048576: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_MiB, - blocks, blockSize, totalSize / 1048576d)); - - break; - case > 1024: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_KiB, - blocks, blockSize, totalSize / 1024d)); - - break; - default: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_bytes, - blocks, blockSize, totalSize)); - - break; - } + UpdateStatus?.Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2, + blocks, blockSize, + ByteSize.FromBytes(blocks * blockSize).ToString("0.000"))); UpdateStatus?.Invoke(string.Format(Localization.Core.Device_reports_0_blocks_1_bytes, blocks, blocks * blockSize)); diff --git a/Aaru.Core/Devices/Dumping/Sbc/Dump.cs b/Aaru.Core/Devices/Dumping/Sbc/Dump.cs index 7c925e65b..ed38a1b60 100644 --- a/Aaru.Core/Devices/Dumping/Sbc/Dump.cs +++ b/Aaru.Core/Devices/Dumping/Sbc/Dump.cs @@ -52,6 +52,7 @@ using Aaru.Decoders.DVD; using Aaru.Decoders.SCSI; using Aaru.Decoders.SCSI.MMC; using Aaru.Devices; +using Humanizer.Bytes; using DVDDecryption = Aaru.Decryption.DVD.Dump; using Track = Aaru.CommonTypes.Structs.Track; using TrackType = Aaru.CommonTypes.Enums.TrackType; @@ -223,41 +224,9 @@ partial class Dump { blocks++; - ulong totalSize = blocks * blockSize; - - switch(totalSize) - { - case > 1099511627776: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_TiB, - blocks, blockSize, totalSize / 1099511627776d)); - - break; - case > 1073741824: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_GiB, - blocks, blockSize, totalSize / 1073741824d)); - - break; - case > 1048576: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_MiB, - blocks, blockSize, totalSize / 1048576d)); - - break; - case > 1024: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_KiB, - blocks, blockSize, totalSize / 1024d)); - - break; - default: - UpdateStatus?. - Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_bytes, - blocks, blockSize, totalSize)); - - break; - } + UpdateStatus?.Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2, + blocks, blockSize, + ByteSize.FromBytes(blocks * blockSize).ToString("0.000"))); } // Check how many blocks to read, if error show and return diff --git a/Aaru.Core/Devices/Scanning/SCSI.cs b/Aaru.Core/Devices/Scanning/SCSI.cs index 451870385..1c5e86ef8 100644 --- a/Aaru.Core/Devices/Scanning/SCSI.cs +++ b/Aaru.Core/Devices/Scanning/SCSI.cs @@ -40,6 +40,7 @@ using Aaru.Decoders.CD; using Aaru.Decoders.SCSI; using Aaru.Decoders.SCSI.MMC; using Aaru.Devices; +using Humanizer.Bytes; namespace Aaru.Core.Devices.Scanning; @@ -199,46 +200,10 @@ public sealed partial class MediaScan { results.Blocks++; - ulong totalSize = results.Blocks * blockSize; - - switch(totalSize) - { - case > 1099511627776: - UpdateStatus?. - Invoke(string. - Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_TiB, - results.Blocks, blockSize, totalSize / 1099511627776d)); - - break; - case > 1073741824: - UpdateStatus?. - Invoke(string. - Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_GiB, - results.Blocks, blockSize, totalSize / 1073741824d)); - - break; - case > 1048576: - UpdateStatus?. - Invoke(string. - Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_MiB, - results.Blocks, blockSize, totalSize / 1048576d)); - - break; - case > 1024: - UpdateStatus?. - Invoke(string. - Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_KiB, - results.Blocks, blockSize, totalSize / 1024d)); - - break; - default: - UpdateStatus?. - Invoke(string. - Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2_bytes, - results.Blocks, blockSize, totalSize)); - - break; - } + UpdateStatus?. + Invoke(string.Format(Localization.Core.Media_has_0_blocks_of_1_bytes_each_for_a_total_of_2, + results.Blocks, blockSize, + ByteSize.FromBytes(results.Blocks * blockSize).ToString("0.000"))); } break; diff --git a/Aaru.Gui/Aaru.Gui.csproj b/Aaru.Gui/Aaru.Gui.csproj index b30159faf..94264fc18 100644 --- a/Aaru.Gui/Aaru.Gui.csproj +++ b/Aaru.Gui/Aaru.Gui.csproj @@ -34,6 +34,7 @@ +