Use Humanizer for media size.

aaru-dps · Sep 26, 2023 · d44b32a · d44b32a
1 parent 3d1b058
commit d44b32a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml b/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
diff --git a/Aaru.Core/ImageInfo.cs b/Aaru.Core/ImageInfo.cs
@@ -50,6 +50,7 @@
 using Aaru.Decoders.SCSI;
 using Aaru.Decoders.Xbox;
 using Aaru.Helpers;
+using Humanizer.Bytes;
 using Spectre.Console;
 using DDS = Aaru.Decoders.DVD.DDS;
 using DMI = Aaru.Decoders.Xbox.DMI;
@@ -94,7 +95,7 @@ public static void PrintImageInfo(IBaseImage imageFormat)
 
         AaruConsole.WriteLine(Localization.Core.Contains_a_media_of_0_sectors_with_a_maximum_sector_size_of_1_bytes_etc,
                               imageFormat.Info.Sectors, imageFormat.Info.SectorSize,
-                              imageFormat.Info.Sectors * imageFormat.Info.SectorSize);
+                              ByteSize.FromBytes(imageFormat.Info.Sectors * imageFormat.Info.SectorSize));
 
         if(!string.IsNullOrWhiteSpace(imageFormat.Info.Creator))
             AaruConsole.WriteLine(Localization.Core.Created_by_0_WithMarkup, Markup.Escape(imageFormat.Info.Creator));

diff --git a/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs
@@ -54,6 +54,7 @@
 using Avalonia.Controls;
 using Avalonia.Media.Imaging;
 using Avalonia.Platform;
+using Humanizer.Bytes;
 using ReactiveUI;
 using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
 using Session = Aaru.CommonTypes.Structs.Session;
@@ -126,7 +127,7 @@ public ImageInfoViewModel(string imagePath, IFilter filter, IMediaImage imageFor
         SectorsText =
             string.Format(Localization.Core.Contains_a_media_of_0_sectors_with_a_maximum_sector_size_of_1_bytes_etc,
                           imageFormat.Info.Sectors, imageFormat.Info.SectorSize,
-                          imageFormat.Info.Sectors * imageFormat.Info.SectorSize);
+                          ByteSize.FromBytes(imageFormat.Info.Sectors * imageFormat.Info.SectorSize));
 
         MediaTypeText = string.Format(Localization.Core.Contains_a_media_of_type_0_and_XML_type_1,
                                       imageFormat.Info.MediaType, imageFormat.Info.MetadataMediaType);

diff --git a/Aaru.Localization/Core.Designer.cs b/Aaru.Localization/Core.Designer.cs
diff --git a/Aaru.Localization/Core.resx b/Aaru.Localization/Core.resx
@@ -517,7 +517,7 @@
     <value>Image without headers is {0} bytes long</value>
   </data>
   <data name="Contains_a_media_of_0_sectors_with_a_maximum_sector_size_of_1_bytes_etc" xml:space="preserve">
-    <value>Contains a media of {0} sectors with a maximum sector size of {1} bytes (if all sectors are of the same size this would be {2} bytes)</value>
+    <value>Contains a media of {0} sectors with a maximum sector size of {1} bytes (if all sectors are of the same size this would be {2})</value>
   </data>
   <data name="Contains_a_media_of_type_0_and_XML_type_1" xml:space="preserve">
     <value>Contains a media of type {0} and XML type {1}</value>