Use humanizer to show seconds.

aaru-dps · Sep 26, 2023 · 25c5cba · 25c5cba
1 parent d44b32a
commit 25c5cba
Show file tree

Hide file tree

Showing 22 changed files with 5,227 additions and 2,172 deletions.
diff --git a/Aaru.Core/Devices/Dumping/ATA.cs b/Aaru.Core/Devices/Dumping/ATA.cs
@@ -47,6 +47,7 @@
 using Aaru.Decoders.PCMCIA;
 using Humanizer;
 using Humanizer.Bytes;
+using Humanizer.Localisation;
 using Identify = Aaru.CommonTypes.Structs.Devices.ATA.Identify;
 using Tuple = Aaru.Decoders.PCMCIA.Tuple;
 using Version = Aaru.CommonTypes.Interop.Version;
@@ -381,17 +382,19 @@ void Ata()
                     ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
                                  blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
 
-                    UpdateStatus?.Invoke(string.Format(Localization.Core.Dump_finished_in_0_seconds,
-                                                       (end - start).TotalSeconds));
+                    UpdateStatus?.Invoke(string.Format(Localization.Core.Dump_finished_in_0,
+                                                       (end - start).Humanize(minUnit: TimeUnit.Second)));
 
                     UpdateStatus?.Invoke(string.Format(Localization.Core.Average_dump_speed_0,
                                                        ByteSize.FromBytes(blockSize * (blocks + 1)).
                                                                 Per(totalDuration.Milliseconds())));
 
                     UpdateStatus?.Invoke(string.Format(Localization.Core.Average_write_speed_0,
-                                                       ByteSize.FromBytes(blockSize * (blocks + 1)).Per(imageWriteDuration.Seconds())));
+                                                       ByteSize.FromBytes(blockSize * (blocks + 1)).
+                                                                Per(imageWriteDuration.Seconds())));
 
-                    _dumpLog.WriteLine(Localization.Core.Dump_finished_in_0_seconds, (end - start).TotalSeconds);
+                    _dumpLog.WriteLine(string.Format(Localization.Core.Dump_finished_in_0,
+                                                     (end - start).Humanize(minUnit: TimeUnit.Second)));
 
                     _dumpLog.WriteLine(Localization.Core.Average_dump_speed_0,
                                        ByteSize.FromBytes(blockSize * (blocks + 1)).Per(totalDuration.Milliseconds()));
@@ -443,11 +446,11 @@ void Ata()
                         EndProgress?.Invoke();
                         end = DateTime.UtcNow;
 
-                        UpdateStatus?.Invoke(string.Format(Localization.Core.Trimming_finished_in_0_seconds,
-                                                           (end - start).TotalSeconds));
+                        UpdateStatus?.Invoke(string.Format(Localization.Core.Trimming_finished_in_0,
+                                                           (end - start).Humanize(minUnit: TimeUnit.Second)));
 
-                        _dumpLog.WriteLine(Localization.Core.Trimming_finished_in_0_seconds,
-                                           (end - start).TotalSeconds);
+                        _dumpLog.WriteLine(string.Format(Localization.Core.Trimming_finished_in_0,
+                                                         (end - start).Humanize(minUnit: TimeUnit.Second)));
                     }
                     #endregion Trimming
 
@@ -650,8 +653,8 @@ void Ata()
                     ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
                                  blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
 
-                    UpdateStatus?.Invoke(string.Format(Localization.Core.Dump_finished_in_0_seconds,
-                                                       (end - start).TotalSeconds));
+                    UpdateStatus?.Invoke(string.Format(Localization.Core.Dump_finished_in_0,
+                                                       (end - start).Humanize(minUnit: TimeUnit.Second)));
 
                     UpdateStatus?.Invoke(string.Format(Localization.Core.Average_dump_speed_0,
                                                        ByteSize.FromBytes(blockSize * (blocks + 1)).
@@ -661,7 +664,8 @@ void Ata()
                                                        ByteSize.FromBytes(blockSize * (blocks + 1)).
                                                                 Per(imageWriteDuration.Seconds())));
 
-                    _dumpLog.WriteLine(Localization.Core.Dump_finished_in_0_seconds, (end - start).TotalSeconds);
+                    _dumpLog.WriteLine(string.Format(Localization.Core.Dump_finished_in_0,
+                                                     (end - start).Humanize(minUnit: TimeUnit.Second)));
 
                     _dumpLog.WriteLine(Localization.Core.Average_dump_speed_0,
                                        ByteSize.FromBytes(blockSize * (blocks + 1)).Per(totalDuration.Milliseconds()));
@@ -695,10 +699,11 @@ void Ata()
                 outputFormat.Close();
                 DateTime closeEnd = DateTime.Now;
 
-                UpdateStatus?.Invoke(string.Format(Localization.Core.Closed_in_0_seconds,
-                                                   (closeEnd - closeStart).TotalSeconds));
+                UpdateStatus?.Invoke(string.Format(Localization.Core.Closed_in_0,
+                                                   (closeEnd - closeStart).Humanize(minUnit: TimeUnit.Second)));
 
-                _dumpLog.WriteLine(Localization.Core.Closed_in_0_seconds, (closeEnd - closeStart).TotalSeconds);
+                _dumpLog.WriteLine(Localization.Core.Closed_in_0,
+                                   (closeEnd - closeStart).Humanize(minUnit: TimeUnit.Second));
 
                 if(_aborted)
                 {
@@ -850,15 +855,15 @@ void Ata()
 
                         totalChkDuration = (chkEnd - chkStart).TotalMilliseconds;
 
-                        UpdateStatus?.Invoke(string.Format(Localization.Core.Sidecar_created_in_0_seconds,
-                                                           (chkEnd - chkStart).TotalSeconds));
+                        UpdateStatus?.Invoke(string.Format(Localization.Core.Sidecar_created_in_0,
+                                                           (chkEnd - chkStart).Humanize(minUnit: TimeUnit.Second)));
 
                         UpdateStatus?.Invoke(string.Format(Localization.Core.Average_checksum_speed_0,
                                                            ByteSize.FromBytes(blockSize * (blocks + 1)).
                                                                     Per(totalChkDuration.Milliseconds())));
 
-                        _dumpLog.WriteLine(Localization.Core.Sidecar_created_in_0_seconds,
-                                           (chkEnd - chkStart).TotalSeconds);
+                        _dumpLog.WriteLine(Localization.Core.Sidecar_created_in_0,
+                                           (chkEnd - chkStart).Humanize(minUnit: TimeUnit.Second));
 
                         _dumpLog.WriteLine(Localization.Core.Average_checksum_speed_0,
                                            ByteSize.FromBytes(blockSize * (blocks + 1)).Per(totalChkDuration.Milliseconds()));
@@ -926,9 +931,12 @@ from fileSystem in partition.FileSystems
                 UpdateStatus?.Invoke("");
 
                 UpdateStatus?.
-                    Invoke(string.Format(Localization.Core.Took_a_total_of_0_seconds_1_processing_commands_2_checksumming_3_writing_4_closing,
-                                         (end - start).TotalSeconds, totalDuration / 1000, totalChkDuration / 1000,
-                                         imageWriteDuration, (closeEnd - closeStart).TotalSeconds));
+                    Invoke(string.Format(Localization.Core.Took_a_total_of_0_1_processing_commands_2_checksumming_3_writing_4_closing,
+                                         (end - start).Humanize(minUnit: TimeUnit.Second),
+                                         totalDuration.Milliseconds().Humanize(minUnit: TimeUnit.Second),
+                                         totalChkDuration.Milliseconds().Humanize(minUnit: TimeUnit.Second),
+                                         imageWriteDuration.Seconds().Humanize(minUnit: TimeUnit.Second),
+                                         (closeEnd - closeStart).Humanize(minUnit: TimeUnit.Second)));
 
                 UpdateStatus?.Invoke(string.Format(Localization.Core.Average_speed_0,
                                                    ByteSize.FromBytes(blockSize * (blocks + 1)).

diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
@@ -52,6 +52,7 @@
 using Aaru.Devices;
 using Humanizer;
 using Humanizer.Bytes;
+using Humanizer.Localisation;
 using Track = Aaru.CommonTypes.Structs.Track;
 using TrackType = Aaru.CommonTypes.Enums.TrackType;
 using Version = Aaru.CommonTypes.Interop.Version;
@@ -1294,7 +1295,8 @@ void CompactDisc()
         ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
                      blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
 
-        UpdateStatus?.Invoke(string.Format(Localization.Core.Dump_finished_in_0_seconds, (end - start).TotalSeconds));
+        UpdateStatus?.Invoke(string.Format(Localization.Core.Dump_finished_in_0,
+                                           (end - start).Humanize(minUnit: TimeUnit.Second)));
 
         UpdateStatus?.Invoke(string.Format(Localization.Core.Average_dump_speed_0,
                                            ByteSize.FromBytes(blockSize * (blocks + 1)).
@@ -1304,7 +1306,8 @@ void CompactDisc()
                                            ByteSize.FromBytes(blockSize * (blocks + 1)).
                                                     Per(imageWriteDuration.Seconds())));
 
-        _dumpLog.WriteLine(Localization.Core.Dump_finished_in_0_seconds, (end - start).TotalSeconds);
+        _dumpLog.WriteLine(string.Format(Localization.Core.Dump_finished_in_0,
+                                         (end - start).Humanize(minUnit: TimeUnit.Second)));
 
         _dumpLog.WriteLine(string.Format(Localization.Core.Average_dump_speed_0,
                                          ByteSize.FromBytes(blockSize * (blocks + 1)).
@@ -1440,8 +1443,8 @@ void CompactDisc()
         outputOptical.Close();
         DateTime closeEnd = DateTime.Now;
 
-        UpdateStatus?.Invoke(string.Format(Localization.Core.Closed_in_0_seconds,
-                                           (closeEnd - closeStart).TotalSeconds));
+        UpdateStatus?.Invoke(string.Format(Localization.Core.Closed_in_0,
+                                           (closeEnd - closeStart).Humanize(minUnit: TimeUnit.Second)));
 
         subLog?.Close();
 
@@ -1462,9 +1465,12 @@ void CompactDisc()
         UpdateStatus?.Invoke("");
 
         UpdateStatus?.
-            Invoke(string.Format(Localization.Core.Took_a_total_of_0_seconds_1_processing_commands_2_checksumming_3_writing_4_closing,
-                                 (end - dumpStart).TotalSeconds, totalDuration / 1000, totalChkDuration / 1000,
-                                 imageWriteDuration, (closeEnd - closeStart).TotalSeconds));
+            Invoke(string.Format(Localization.Core.Took_a_total_of_0_1_processing_commands_2_checksumming_3_writing_4_closing,
+                                 (end - start).Humanize(minUnit: TimeUnit.Second),
+                                 totalDuration.Milliseconds().Humanize(minUnit: TimeUnit.Second),
+                                 totalChkDuration.Milliseconds().Humanize(minUnit: TimeUnit.Second),
+                                 imageWriteDuration.Seconds().Humanize(minUnit: TimeUnit.Second),
+                                 (closeEnd - closeStart).Humanize(minUnit: TimeUnit.Second)));
 
         UpdateStatus?.Invoke(string.Format(Localization.Core.Average_speed_0,
                                            ByteSize.FromBytes(blockSize * (blocks + 1)).

diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs
@@ -44,6 +44,8 @@
 using Aaru.Decoders.CD;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
+using Humanizer;
+using Humanizer.Localisation;
 using Track = Aaru.CommonTypes.Structs.Track;
 
 namespace Aaru.Core.Devices.Dumping;
@@ -293,9 +295,10 @@ void TrimCdUserData(ExtentsULong audioExtents, uint blockSize, DumpHardware curr
         EndProgress?.Invoke();
         end = DateTime.UtcNow;
 
-        UpdateStatus?.Invoke(string.Format(Localization.Core.Trimming_finished_in_0_seconds,
-                                           (end - start).TotalSeconds));
+        UpdateStatus?.Invoke(string.Format(Localization.Core.Trimming_finished_in_0,
+                                           (end - start).Humanize(minUnit: TimeUnit.Second)));
 
-        _dumpLog.WriteLine(Localization.Core.Trimming_finished_in_0_seconds, (end - start).TotalSeconds);
+        _dumpLog.WriteLine(string.Format(Localization.Core.Trimming_finished_in_0,
+                                         (end - start).Humanize(minUnit: TimeUnit.Second)));
     }
 }
diff --git a/Aaru.Core/Devices/Dumping/LinearMemory/Retrode.cs b/Aaru.Core/Devices/Dumping/LinearMemory/Retrode.cs
@@ -38,6 +38,7 @@
 using Aaru.Core.Graphics;
 using Humanizer;
 using Humanizer.Bytes;
+using Humanizer.Localisation;
 using Version = Aaru.CommonTypes.Interop.Version;
 
 namespace Aaru.Core.Devices.Dumping;
@@ -403,7 +404,7 @@ void Retrode()
         DateTime end = DateTime.UtcNow;
         EndProgress?.Invoke();
 
-        UpdateStatus?.Invoke(string.Format(Localization.Core.Dump_finished_in_0_seconds, (end - start).TotalSeconds));
+        UpdateStatus?.Invoke(string.Format(Localization.Core.Dump_finished_in_0, (end - start).Humanize(minUnit: TimeUnit.Second)));
 
         UpdateStatus?.Invoke(string.Format(Localization.Core.Average_dump_speed_0,
                                            ByteSize.FromBytes(512 * (romSectors + 1)).
@@ -413,7 +414,7 @@ void Retrode()
                                            ByteSize.FromBytes(512 * (romSectors + 1)).
                                                     Per(imageWriteDuration.Seconds())));
 
-        _dumpLog.WriteLine(Localization.Core.Dump_finished_in_0_seconds, (end - start).TotalSeconds);
+        _dumpLog.WriteLine(string.Format(Localization.Core.Dump_finished_in_0, (end - start).Humanize(minUnit: TimeUnit.Second)));
 
         _dumpLog.WriteLine(string.Format(Localization.Core.Average_dump_speed_0,
                                          ByteSize.FromBytes(512 * (romSectors + 1)).Per(totalDuration.Milliseconds())));
@@ -442,7 +443,7 @@ void Retrode()
         DateTime closeStart = DateTime.Now;
         outputBai.Close();
         DateTime closeEnd = DateTime.Now;
-        _dumpLog.WriteLine(Localization.Core.Closed_in_0_seconds, (closeEnd - closeStart).TotalSeconds);
+        _dumpLog.WriteLine(Localization.Core.Closed_in_0, (closeEnd - closeStart).Humanize(minUnit: TimeUnit.Second));
 
         if(_aborted)
         {
@@ -461,9 +462,12 @@ void Retrode()
         UpdateStatus?.Invoke("");
 
         UpdateStatus?.
-            Invoke(string.Format(Localization.Core.Took_a_total_of_0_seconds_1_processing_commands_2_checksumming_3_writing_4_closing,
-                                 (end - start).TotalSeconds, totalDuration / 1000, totalChkDuration / 1000,
-                                 imageWriteDuration, (closeEnd - closeStart).TotalSeconds));
+            Invoke(string.Format(Localization.Core.Took_a_total_of_0_1_processing_commands_2_checksumming_3_writing_4_closing,
+                                 (end - start).Humanize(minUnit: TimeUnit.Second),
+                                 totalDuration.Milliseconds().Humanize(minUnit: TimeUnit.Second),
+                                 totalChkDuration.Milliseconds().Humanize(minUnit: TimeUnit.Second),
+                                 imageWriteDuration.Seconds().Humanize(minUnit: TimeUnit.Second),
+                                 (closeEnd - closeStart).Humanize(minUnit: TimeUnit.Second)));
 
         UpdateStatus?.Invoke(string.Format(Localization.Core.Average_speed_0,
                                            ByteSize.FromBytes(512 * (romSectors + 1)).

diff --git a/Aaru.Core/Devices/Dumping/Metadata.cs b/Aaru.Core/Devices/Dumping/Metadata.cs
@@ -41,6 +41,7 @@
 using Aaru.CommonTypes.Interfaces;
 using Humanizer;
 using Humanizer.Bytes;
+using Humanizer.Localisation;
 
 namespace Aaru.Core.Devices.Dumping;
 
@@ -98,7 +99,7 @@ void WriteOpticalSidecar(uint blockSize, ulong blocks, MediaType mediaType, Laye
             return;
 
         totalChkDuration = (end - chkStart).TotalMilliseconds;
-        _dumpLog.WriteLine(Localization.Core.Sidecar_created_in_0_seconds, (end - chkStart).TotalSeconds);
+        _dumpLog.WriteLine(Localization.Core.Sidecar_created_in_0, (end - chkStart).Humanize(minUnit: TimeUnit.Second));
 
         _dumpLog.WriteLine(Localization.Core.Average_checksum_speed_0,
                            ByteSize.FromBytes(blockSize * (blocks + 1)).Per(totalChkDuration.Milliseconds()));