From 7fa2a872d21f92d17dba49ccfd0dcbd9ab29966e Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 20 Apr 2019 01:45:28 +0100 Subject: [PATCH] In ATA, CD and PSP dumpers show status of correctly retried sectors. --- DiscImageChef.Core/Devices/Dumping/ATA.cs | 1 + DiscImageChef.Core/Devices/Dumping/CompactDisc.cs | 1 + DiscImageChef.Core/Devices/Dumping/PlayStationPortable.cs | 8 +++++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/DiscImageChef.Core/Devices/Dumping/ATA.cs b/DiscImageChef.Core/Devices/Dumping/ATA.cs index 64c47f575..63953b508 100644 --- a/DiscImageChef.Core/Devices/Dumping/ATA.cs +++ b/DiscImageChef.Core/Devices/Dumping/ATA.cs @@ -405,6 +405,7 @@ namespace DiscImageChef.Core.Devices.Dumping resume.BadBlocks.Remove(badSector); extents.Add(badSector); outputPlugin.WriteSector(cmdBuf, badSector); + UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}."); dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass); } else if(persistent) outputPlugin.WriteSector(cmdBuf, badSector); diff --git a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs index 27f2a5a33..8dadbba11 100644 --- a/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs +++ b/DiscImageChef.Core/Devices/Dumping/CompactDisc.cs @@ -1604,6 +1604,7 @@ namespace DiscImageChef.Core.Devices.Dumping { resume.BadBlocks.Remove(badSector); extents.Add(badSector); + UpdateStatus?.Invoke($"Correctly retried sector {badSector} in pass {pass}."); dumpLog.WriteLine("Correctly retried sector {0} in pass {1}.", badSector, pass); sectorsNotEvenPartial.Remove(badSector); } diff --git a/DiscImageChef.Core/Devices/Dumping/PlayStationPortable.cs b/DiscImageChef.Core/Devices/Dumping/PlayStationPortable.cs index 8703220ed..b4a558ba0 100644 --- a/DiscImageChef.Core/Devices/Dumping/PlayStationPortable.cs +++ b/DiscImageChef.Core/Devices/Dumping/PlayStationPortable.cs @@ -553,9 +553,8 @@ namespace DiscImageChef.Core.Devices.Dumping break; } - PulseProgress?.Invoke(string.Format("\rRetrying sector {0}, pass {1}, {3}{2}", badSector, pass, - forward ? "forward" : "reverse", - runningPersistent ? "recovering partial data, " : "")); + PulseProgress + ?.Invoke($"\rRetrying sector {badSector}, pass {pass}, {(runningPersistent ? "recovering partial data, " : "")}{(forward ? "forward" : "reverse")}"); sense = dev.Read12(out readBuffer, out _, 0, false, true, false, false, (uint)(umdStart + badSector * 4), 512, 0, 4, false, dev.Timeout, @@ -567,6 +566,8 @@ namespace DiscImageChef.Core.Devices.Dumping resume.BadBlocks.Remove(badSector); extents.Add(badSector); outputPlugin.WriteSector(readBuffer, badSector); + UpdateStatus?.Invoke(string.Format("Correctly retried block {0} in pass {1}.", badSector, + pass)); dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass); } else if(runningPersistent) outputPlugin.WriteSector(readBuffer, badSector); @@ -1045,6 +1046,7 @@ namespace DiscImageChef.Core.Devices.Dumping resume.BadBlocks.Remove(badSector); extents.Add(badSector); outputPlugin.WriteSector(readBuffer, badSector); + UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}."); dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass); } else if(runningPersistent) outputPlugin.WriteSector(readBuffer, badSector);