diff --git a/Aaru.Core/Devices/Dumping/ATA.cs b/Aaru.Core/Devices/Dumping/ATA.cs index 529ed3cdb..a11fc943c 100644 --- a/Aaru.Core/Devices/Dumping/ATA.cs +++ b/Aaru.Core/Devices/Dumping/ATA.cs @@ -819,8 +819,13 @@ namespace Aaru.Core.Devices.Dumping UpdateStatus?. Invoke($"Average speed: {((double)blockSize * (double)(blocks + 1)) / 1048576 / (totalDuration / 1000):F3} MiB/sec."); - UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); - UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + if(maxSpeed > 0) + UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); + + if(minSpeed > 0 && + minSpeed < double.MaxValue) + UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read."); if(_resume.BadBlocks.Count > 0) diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs index 33c2379ee..cf8724af5 100644 --- a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs +++ b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs @@ -1282,8 +1282,13 @@ namespace Aaru.Core.Devices.Dumping UpdateStatus?. Invoke($"Average speed: {((double)blockSize * (double)(blocks + 1)) / 1048576 / (totalDuration / 1000):F3} MiB/sec."); - UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); - UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + if(maxSpeed > 0) + UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); + + if(minSpeed > 0 && + minSpeed < double.MaxValue) + UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read."); UpdateStatus?.Invoke($"{_resume.BadSubchannels.Count} subchannels could not be read."); UpdateStatus?.Invoke(""); diff --git a/Aaru.Core/Devices/Dumping/MiniDisc.cs b/Aaru.Core/Devices/Dumping/MiniDisc.cs index ce025fbc8..40318f038 100644 --- a/Aaru.Core/Devices/Dumping/MiniDisc.cs +++ b/Aaru.Core/Devices/Dumping/MiniDisc.cs @@ -764,8 +764,13 @@ namespace Aaru.Core.Devices.Dumping UpdateStatus?. Invoke($"Average speed: {((double)blockSize * (double)(blocks + 1)) / 1048576 / (totalDuration / 1000):F3} MiB/sec."); - UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); - UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + if(maxSpeed > 0) + UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); + + if(minSpeed > 0 && + minSpeed < double.MaxValue) + UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read."); UpdateStatus?.Invoke(""); diff --git a/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs b/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs index e622fc789..a9123257b 100644 --- a/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs +++ b/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs @@ -605,8 +605,13 @@ namespace Aaru.Core.Devices.Dumping UpdateStatus?. Invoke($"Average speed: {((double)BLOCK_SIZE * (double)(blocks + 1)) / 1048576 / (totalDuration / 1000):F3} MiB/sec."); - UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); - UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + if(maxSpeed > 0) + UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); + + if(minSpeed > 0 && + minSpeed < double.MaxValue) + UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read."); UpdateStatus?.Invoke(""); diff --git a/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs b/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs index fe51bb24e..d7dd68e19 100644 --- a/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs +++ b/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs @@ -520,8 +520,13 @@ namespace Aaru.Core.Devices.Dumping UpdateStatus?. Invoke($"Average speed: {((double)BLOCK_SIZE * (double)(blocks + 1)) / 1048576 / (totalDuration / 1000):F3} MiB/sec."); - UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); - UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + if(maxSpeed > 0) + UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); + + if(minSpeed > 0 && + minSpeed < double.MaxValue) + UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read."); UpdateStatus?.Invoke(""); diff --git a/Aaru.Core/Devices/Dumping/SBC.cs b/Aaru.Core/Devices/Dumping/SBC.cs index bf812837f..e790706f9 100644 --- a/Aaru.Core/Devices/Dumping/SBC.cs +++ b/Aaru.Core/Devices/Dumping/SBC.cs @@ -1412,8 +1412,13 @@ namespace Aaru.Core.Devices.Dumping UpdateStatus?. Invoke($"Average speed: {((double)blockSize * (double)(blocks + 1)) / 1048576 / (totalDuration / 1000):F3} MiB/sec."); - UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); - UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + if(maxSpeed > 0) + UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); + + if(minSpeed > 0 && + minSpeed < double.MaxValue) + UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read."); UpdateStatus?.Invoke(""); diff --git a/Aaru.Core/Devices/Dumping/SSC.cs b/Aaru.Core/Devices/Dumping/SSC.cs index 45b591657..35e4f5412 100644 --- a/Aaru.Core/Devices/Dumping/SSC.cs +++ b/Aaru.Core/Devices/Dumping/SSC.cs @@ -1364,8 +1364,13 @@ namespace Aaru.Core.Devices.Dumping UpdateStatus?. Invoke($"Average speed: {((double)blockSize * (double)(blocks + 1)) / 1048576 / (totalDuration / 1000):F3} MiB/sec."); - UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); - UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + if(maxSpeed > 0) + UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); + + if(minSpeed > 0 && + minSpeed < double.MaxValue) + UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read."); UpdateStatus?.Invoke(""); diff --git a/Aaru.Core/Devices/Dumping/SecureDigital.cs b/Aaru.Core/Devices/Dumping/SecureDigital.cs index 343453419..c6c299f3c 100644 --- a/Aaru.Core/Devices/Dumping/SecureDigital.cs +++ b/Aaru.Core/Devices/Dumping/SecureDigital.cs @@ -818,8 +818,13 @@ namespace Aaru.Core.Devices.Dumping UpdateStatus?. Invoke($"Average speed: {((double)blockSize * (double)(blocks + 1)) / 1048576 / (totalDuration / 1000):F3} MiB/sec."); - UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); - UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + if(maxSpeed > 0) + UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); + + if(minSpeed > 0 && + minSpeed < double.MaxValue) + UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read."); UpdateStatus?.Invoke(""); diff --git a/Aaru.Core/Devices/Dumping/XGD.cs b/Aaru.Core/Devices/Dumping/XGD.cs index 0c1ad1153..0065a651f 100644 --- a/Aaru.Core/Devices/Dumping/XGD.cs +++ b/Aaru.Core/Devices/Dumping/XGD.cs @@ -1202,8 +1202,13 @@ namespace Aaru.Core.Devices.Dumping UpdateStatus?. Invoke($"Average speed: {((double)BLOCK_SIZE * (double)(blocks + 1)) / 1048576 / (totalDuration / 1000):F3} MiB/sec."); - UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); - UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + if(maxSpeed > 0) + UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); + + if(minSpeed > 0 && + minSpeed < double.MaxValue) + UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); + UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read."); UpdateStatus?.Invoke("");