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

🐛Only retry as many times as requested.

Browse Source
This commit is contained in:
Natalia Portillo
2018-04-10 02:47:08 +01:00
parent 07f0dfe935
commit 27f5204e35
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DiscImageChef.Core/Devices/Dumping/ATA.cs
View File

@@ -343,7 +343,7 @@ namespace DiscImageChef.Core.Devices.Dumping
#region Error handling #region Error handling
if(resume.BadBlocks.Count > 0 && !aborted && retryPasses > 0) if(resume.BadBlocks.Count > 0 && !aborted && retryPasses > 0)
{ {
int pass = 0; int pass = 1;
bool forward = true; bool forward = true;
repeatRetryLba: repeatRetryLba:
@@ -357,7 +357,7 @@ namespace DiscImageChef.Core.Devices.Dumping
break; break;
} }
DicConsole.Write("\rRetrying sector {0}, pass {1}, {3}{2}", badSector, pass + 1, DicConsole.Write("\rRetrying sector {0}, pass {1}, {3}{2}", badSector, pass,
forward ? "forward" : "reverse", forward ? "forward" : "reverse",
persistent ? "recovering partial data, " : ""); persistent ? "recovering partial data, " : "");

6
DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
View File

@@ -951,11 +951,9 @@ namespace DiscImageChef.Core.Devices.Dumping
#endregion Compact Disc Error trimming #endregion Compact Disc Error trimming
#region Compact Disc Error handling #region Compact Disc Error handling
// TODO: Pass 0 should be called differently, splitting, or something like that, because we are just
// separating skipped good sectors from really bad sectors and it's getting too chatty on log there...
if(resume.BadBlocks.Count > 0 && !aborted && retryPasses > 0) if(resume.BadBlocks.Count > 0 && !aborted && retryPasses > 0)
{ {
int pass = 0; int pass = 1;
bool forward = true; bool forward = true;
bool runningPersistent = false; bool runningPersistent = false;
@@ -1009,7 +1007,7 @@ namespace DiscImageChef.Core.Devices.Dumping
break; break;
} }
DicConsole.Write("\rRetrying sector {0}, pass {1}, {3}{2}", badSector, pass + 1, DicConsole.Write("\rRetrying sector {0}, pass {1}, {3}{2}", badSector, pass,
forward ? "forward" : "reverse", forward ? "forward" : "reverse",
runningPersistent ? "recovering partial data, " : ""); runningPersistent ? "recovering partial data, " : "");

4
DiscImageChef.Core/Devices/Dumping/SBC.cs
View File

@@ -455,7 +455,7 @@ namespace DiscImageChef.Core.Devices.Dumping
#region Error handling #region Error handling
if(resume.BadBlocks.Count > 0 && !aborted && retryPasses > 0) if(resume.BadBlocks.Count > 0 && !aborted && retryPasses > 0)
{ {
int pass = 0; int pass = 1;
bool forward = true; bool forward = true;
bool runningPersistent = false; bool runningPersistent = false;
@@ -542,7 +542,7 @@ namespace DiscImageChef.Core.Devices.Dumping
break; break;
} }
DicConsole.Write("\rRetrying sector {0}, pass {1}, {3}{2}", badSector, pass + 1, DicConsole.Write("\rRetrying sector {0}, pass {1}, {3}{2}", badSector, pass,
forward ? "forward" : "reverse", forward ? "forward" : "reverse",
runningPersistent ? "recovering partial data, " : ""); runningPersistent ? "recovering partial data, " : "");

4
DiscImageChef.Core/Devices/Dumping/SecureDigital.cs
View File

@@ -386,7 +386,7 @@ namespace DiscImageChef.Core.Devices.Dumping
#region Error handling #region Error handling
if(resume.BadBlocks.Count > 0 && !aborted && retryPasses > 0) if(resume.BadBlocks.Count > 0 && !aborted && retryPasses > 0)
{ {
int pass = 0; int pass = 1;
bool forward = true; bool forward = true;
bool runningPersistent = false; bool runningPersistent = false;
@@ -401,7 +401,7 @@ namespace DiscImageChef.Core.Devices.Dumping
break; break;
} }
DicConsole.Write("\rRetrying sector {0}, pass {1}, {3}{2}", badSector, pass + 1, DicConsole.Write("\rRetrying sector {0}, pass {1}, {3}{2}", badSector, pass,
forward ? "forward" : "reverse", forward ? "forward" : "reverse",
runningPersistent ? "recovering partial data, " : ""); runningPersistent ? "recovering partial data, " : "");

4
DiscImageChef.Core/Devices/Dumping/XGD.cs
View File

@@ -697,7 +697,7 @@ namespace DiscImageChef.Core.Devices.Dumping
tmpList.Sort(); tmpList.Sort();
int pass = 0; int pass = 1;
bool forward = true; bool forward = true;
bool runningPersistent = false; bool runningPersistent = false;
@@ -714,7 +714,7 @@ namespace DiscImageChef.Core.Devices.Dumping
break; break;
} }
DicConsole.Write("\rRetrying sector {0}, pass {1}, {3}{2}", badSector, pass + 1, DicConsole.Write("\rRetrying sector {0}, pass {1}, {3}{2}", badSector, pass,
forward ? "forward" : "reverse", forward ? "forward" : "reverse",
runningPersistent ? "recovering partial data, " : ""); runningPersistent ? "recovering partial data, " : "");