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 reverse list of bad blocks if we're retrying backwards. Fixes #328

Browse Source
This commit is contained in:
Natalia Portillo
2020-06-14 19:08:12 +01:00
parent 1f52389048
commit a7fa072271
9 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Aaru.Core/Devices/Dumping/ATA.cs
View File

@@ -228,8 +228,7 @@ namespace Aaru.Core.Devices.Dumping
_dumpLog.WriteLine(_outputPlugin.ErrorMessage);
StoppingErrorMessage?.Invoke("Error creating output image, not continuing." +
Environment.NewLine +
_outputPlugin.ErrorMessage);
Environment.NewLine + _outputPlugin.ErrorMessage);
return;
}
@@ -337,8 +336,7 @@ namespace Aaru.Core.Devices.Dumping
mhddLog.Close();
ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
(blockSize * (double)(blocks + 1)) / 1024 /
(totalDuration / 1000), _devicePath);
(blockSize * (double)(blocks + 1)) / 1024 / (totalDuration / 1000), _devicePath);
UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
@@ -451,7 +449,9 @@ namespace Aaru.Core.Devices.Dumping
pass++;
forward = !forward;
_resume.BadBlocks.Sort();
_resume.BadBlocks.Reverse();
if(!forward)
_resume.BadBlocks.Reverse();
goto repeatRetryLba;
}
@@ -557,8 +557,7 @@ namespace Aaru.Core.Devices.Dumping
mhddLog.Close();
ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
(blockSize * (double)(blocks + 1)) / 1024 /
(totalDuration / 1000), _devicePath);
(blockSize * (double)(blocks + 1)) / 1024 / (totalDuration / 1000), _devicePath);
UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");

4
Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
View File

@@ -312,7 +312,9 @@ namespace Aaru.Core.Devices.Dumping
pass++;
forward = !forward;
_resume.BadBlocks.Sort();
_resume.BadBlocks.Reverse();
if(!forward)
_resume.BadBlocks.Reverse();
goto cdRepeatRetry;
}

4
Aaru.Core/Devices/Dumping/MiniDisc.cs
View File

@@ -589,7 +589,9 @@ namespace Aaru.Core.Devices.Dumping
pass++;
forward = !forward;
_resume.BadBlocks.Sort();
_resume.BadBlocks.Reverse();
if(!forward)
_resume.BadBlocks.Reverse();
goto repeatRetry;
}

7
Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs
View File

@@ -238,8 +238,7 @@ namespace Aaru.Core.Devices.Dumping
mhddLog.Close();
ibgLog.Close(_dev, blocks, BLOCK_SIZE, (end - start).TotalSeconds, currentSpeed * 1024,
(BLOCK_SIZE * (double)(blocks + 1)) / 1024 / (totalDuration / 1000),
_devicePath);
(BLOCK_SIZE * (double)(blocks + 1)) / 1024 / (totalDuration / 1000), _devicePath);
UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
@@ -442,7 +441,9 @@ namespace Aaru.Core.Devices.Dumping
pass++;
forward = !forward;
_resume.BadBlocks.Sort();
_resume.BadBlocks.Reverse();
if(!forward)
_resume.BadBlocks.Reverse();
goto repeatRetry;
}

7
Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs
View File

@@ -255,8 +255,7 @@ namespace Aaru.Core.Devices.Dumping
mhddLog.Close();
ibgLog.Close(_dev, blocks, BLOCK_SIZE, (end - start).TotalSeconds, currentSpeed * 1024,
(BLOCK_SIZE * (double)(blocks + 1)) / 1024 / (totalDuration / 1000),
_devicePath);
(BLOCK_SIZE * (double)(blocks + 1)) / 1024 / (totalDuration / 1000), _devicePath);
UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
@@ -444,7 +443,9 @@ namespace Aaru.Core.Devices.Dumping
pass++;
forward = !forward;
_resume.BadBlocks.Sort();
_resume.BadBlocks.Reverse();
if(!forward)
_resume.BadBlocks.Reverse();
goto repeatRetry;
}

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

@@ -800,7 +800,9 @@ namespace Aaru.Core.Devices.Dumping
pass++;
forward = !forward;
_resume.BadBlocks.Sort();
_resume.BadBlocks.Reverse();
if(!forward)
_resume.BadBlocks.Reverse();
goto repeatRetry;
}

31
Aaru.Core/Devices/Dumping/SSC.cs
View File

@@ -168,8 +168,7 @@ namespace Aaru.Core.Devices.Dumping
if(sense)
{
StoppingErrorMessage?.Invoke("Drive could not rewind, please correct. Sense follows..." +
Environment.NewLine +
strSense);
Environment.NewLine + strSense);
_dumpLog.WriteLine("Drive could not rewind, please correct. Sense follows...");
@@ -197,8 +196,7 @@ namespace Aaru.Core.Devices.Dumping
fxSense?.ASC != 0x00))
{
StoppingErrorMessage?.Invoke("Drive could not rewind, please correct. Sense follows..." +
Environment.NewLine +
strSense);
Environment.NewLine + strSense);
_dumpLog.WriteLine("Drive could not rewind, please correct. Sense follows...");
@@ -216,8 +214,7 @@ namespace Aaru.Core.Devices.Dumping
fxSense = Sense.DecodeFixed(senseBuf, out strSense);
StoppingErrorMessage?.Invoke("Drive could not rewind, please correct. Sense follows..." +
Environment.NewLine +
strSense);
Environment.NewLine + strSense);
_dumpLog.WriteLine("Drive could not rewind, please correct. Sense follows...");
@@ -356,8 +353,7 @@ namespace Aaru.Core.Devices.Dumping
!fxSense?.EOM == true)
{
StoppingErrorMessage?.Invoke("Drive could not return back. Sense follows..." +
Environment.NewLine +
strSense);
Environment.NewLine + strSense);
_dumpLog.WriteLine("Drive could not return back. Sense follows...");
@@ -411,8 +407,7 @@ namespace Aaru.Core.Devices.Dumping
fxSense = Sense.DecodeFixed(senseBuf, out strSense);
StoppingErrorMessage?.Invoke("Drive could not go back one block. Sense follows..." +
Environment.NewLine +
strSense);
Environment.NewLine + strSense);
_dumpLog.WriteLine("Drive could not go back one block. Sense follows...");
@@ -744,8 +739,7 @@ namespace Aaru.Core.Devices.Dumping
_dumpLog.WriteLine(_outputPlugin.ErrorMessage);
StoppingErrorMessage?.Invoke("Error setting output image in tape mode, not continuing." +
Environment.NewLine +
_outputPlugin.ErrorMessage);
Environment.NewLine + _outputPlugin.ErrorMessage);
return;
}
@@ -902,8 +896,7 @@ namespace Aaru.Core.Devices.Dumping
fxSense = Sense.DecodeFixed(senseBuf, out strSense);
StoppingErrorMessage?.Invoke("Drive could not go back one block. Sense follows..." +
Environment.NewLine +
strSense);
Environment.NewLine + strSense);
_outputPlugin.Close();
_dumpLog.WriteLine("Drive could not go back one block. Sense follows...");
@@ -944,8 +937,7 @@ namespace Aaru.Core.Devices.Dumping
continue;
}
if((fxSense?.SenseKey == SenseKeys.NoSense ||
fxSense?.SenseKey == SenseKeys.RecoveredError) &&
if((fxSense?.SenseKey == SenseKeys.NoSense || fxSense?.SenseKey == SenseKeys.RecoveredError) &&
(fxSense?.ASCQ == 0x02 || fxSense?.ASCQ == 0x05 || fxSense?.EOM == true))
{
// TODO: Detect end of partition
@@ -1048,8 +1040,7 @@ namespace Aaru.Core.Devices.Dumping
mhddLog.Close();
ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
(blockSize * (double)(blocks + 1)) / 1024 / (totalDuration / 1000),
_devicePath);
(blockSize * (double)(blocks + 1)) / 1024 / (totalDuration / 1000), _devicePath);
UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
@@ -1200,7 +1191,9 @@ namespace Aaru.Core.Devices.Dumping
pass++;
forward = !forward;
_resume.BadBlocks.Sort();
_resume.BadBlocks.Reverse();
if(!forward)
_resume.BadBlocks.Reverse();
goto repeatRetry;
}

10
Aaru.Core/Devices/Dumping/SecureDigital.cs
View File

@@ -394,8 +394,7 @@ namespace Aaru.Core.Devices.Dumping
mhddLog.Close();
ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
(blockSize * (double)(blocks + 1)) / 1024 / (totalDuration / 1000),
_devicePath);
(blockSize * (double)(blocks + 1)) / 1024 / (totalDuration / 1000), _devicePath);
UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
@@ -511,7 +510,9 @@ namespace Aaru.Core.Devices.Dumping
pass++;
forward = !forward;
_resume.BadBlocks.Sort();
_resume.BadBlocks.Reverse();
if(!forward)
_resume.BadBlocks.Reverse();
goto repeatRetryLba;
}
@@ -686,8 +687,7 @@ namespace Aaru.Core.Devices.Dumping
_dumpLog.WriteLine("Cannot write Extended CSD to output image.");
StoppingErrorMessage?.Invoke("Cannot write Extended CSD to output image." +
Environment.NewLine +
_outputPlugin.ErrorMessage);
Environment.NewLine + _outputPlugin.ErrorMessage);
return;
}

7
Aaru.Core/Devices/Dumping/XGD.cs
View File

@@ -864,8 +864,7 @@ namespace Aaru.Core.Devices.Dumping
mhddLog.Close();
ibgLog.Close(_dev, blocks, BLOCK_SIZE, (end - start).TotalSeconds, currentSpeed * 1024,
(BLOCK_SIZE * (double)(blocks + 1)) / 1024 / (totalDuration / 1000),
_devicePath);
(BLOCK_SIZE * (double)(blocks + 1)) / 1024 / (totalDuration / 1000), _devicePath);
UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
@@ -1083,7 +1082,9 @@ namespace Aaru.Core.Devices.Dumping
pass++;
forward = !forward;
_resume.BadBlocks.Sort();
_resume.BadBlocks.Reverse();
if(!forward)
_resume.BadBlocks.Reverse();
goto repeatRetry;
}