aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove all carriage returns from dumpers output.

Browse Source
This commit is contained in:
Natalia Portillo
2019-04-20 23:05:49 +01:00
parent 888138e1af
commit e7a6b99b84
8 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DiscImageChef.Core/Devices/Dumping/PlayStationPortable.cs
View File

@@ -301,7 +301,7 @@ namespace DiscImageChef.Core.Devices.Dumping
if(currentSpeed < minSpeed && currentSpeed != 0) minSpeed = currentSpeed;
#pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator
UpdateProgress?.Invoke($"\rReading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
(long)blocks);
sense = dev.Read12(out readBuffer, out _, 0, false, true, false, false, (uint)(umdStart + i * 4), 512,
@@ -384,7 +384,7 @@ namespace DiscImageChef.Core.Devices.Dumping
break;
}
PulseProgress?.Invoke($"\rTrimming sector {badSector}");
PulseProgress?.Invoke($"Trimming sector {badSector}");
sense = dev.Read12(out readBuffer, out _, 0, false, true, false, false,
(uint)(umdStart + badSector * 4), 512, 0, 4, false, dev.Timeout,
@@ -503,7 +503,7 @@ namespace DiscImageChef.Core.Devices.Dumping
}
PulseProgress
?.Invoke($"\rRetrying sector {badSector}, pass {pass}, {(runningPersistent ? "recovering partial data, " : "")}{(forward ? "forward" : "reverse")}");
?.Invoke($"Retrying 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,
@@ -771,8 +771,7 @@ namespace DiscImageChef.Core.Devices.Dumping
if(currentSpeed < minSpeed && currentSpeed != 0) minSpeed = currentSpeed;
#pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator
UpdateProgress?.Invoke($"\rReading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
blocks);
UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i, blocks);
sense = dev.Read12(out readBuffer, out _, 0, false, true, false, false, (uint)i, BLOCK_SIZE, 0,
blocksToRead, false, dev.Timeout, out double cmdDuration);
@@ -856,7 +855,7 @@ namespace DiscImageChef.Core.Devices.Dumping
break;
}
PulseProgress?.Invoke($"\rTrimming sector {badSector}");
PulseProgress?.Invoke($"Trimming sector {badSector}");
sense = dev.Read12(out readBuffer, out _, 0, false, true, false, false, (uint)badSector, BLOCK_SIZE,
0, 1, false, dev.Timeout, out double cmdDuration);
@@ -989,7 +988,7 @@ namespace DiscImageChef.Core.Devices.Dumping
break;
}
PulseProgress?.Invoke(string.Format("\rRetrying sector {0}, pass {1}, {3}{2}", badSector, pass,
PulseProgress?.Invoke(string.Format("Retrying sector {0}, pass {1}, {3}{2}", badSector, pass,
forward ? "forward" : "reverse",
runningPersistent ? "recovering partial data, " : ""));