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

Dump without depending on tracks.

Browse Source
This commit is contained in:
Natalia Portillo
2019-12-14 22:13:27 +00:00
parent fbcf566068
commit 5f5f7678eb
1 changed files with 145 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1316,14 +1316,7 @@ namespace DiscImageChef.Core.Devices.Dumping
timeSpeedStart = DateTime.UtcNow;
InitProgress?.Invoke();
for(int t = 0; t < tracks.Length; t++)
{
dumpLog.WriteLine("Reading track {0}", tracks[t].TrackSequence);
if(resume.NextBlock < tracks[t].TrackStartSector)
resume.NextBlock = tracks[t].TrackStartSector;
for(ulong i = resume.NextBlock; i <= tracks[t].TrackEndSector; i += blocksToRead)
for(long i = (long)resume.NextBlock; i <= lastSector; i += blocksToRead)
{
if(aborted)
{
@@ -1334,10 +1327,11 @@ namespace DiscImageChef.Core.Devices.Dumping
break;
}
ulong ui = (ulong)i;
double cmdDuration = 0;
if((tracks[t].TrackEndSector + 1) - i < blocksToRead)
blocksToRead = (uint)((tracks[t].TrackEndSector + 1) - i);
if((lastSector + 1) - i < blocksToRead)
blocksToRead = (uint)((lastSector + 1) - i);
#pragma warning disable RECS0018 // Comparison of floating point numbers with equality operator
if(currentSpeed > maxSpeed &&
@@ -1350,8 +1344,8 @@ namespace DiscImageChef.Core.Devices.Dumping
#pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator
UpdateProgress?.
Invoke(string.Format("Reading sector {0} of {1} at track {3} ({2:F3} MiB/sec.)", i, blocks, currentSpeed, tracks[t].TrackSequence),
(long)i, (long)blocks);
Invoke(string.Format("Reading sector {0} of {1} ({2:F3} MiB/sec.)", i, blocks, currentSpeed), i,
(long)blocks);
if(readcd)
{
@@ -1363,18 +1357,18 @@ namespace DiscImageChef.Core.Devices.Dumping
}
else if(read16)
{
sense = dev.Read16(out cmdBuf, out senseBuf, 0, false, true, false, i, blockSize, 0,
blocksToRead, false, dev.Timeout, out cmdDuration);
sense = dev.Read16(out cmdBuf, out senseBuf, 0, false, true, false, ui, blockSize, 0, blocksToRead,
false, dev.Timeout, out cmdDuration);
}
else if(read12)
{
sense = dev.Read12(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)i, blockSize,
0, blocksToRead, false, dev.Timeout, out cmdDuration);
sense = dev.Read12(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)i, blockSize, 0,
blocksToRead, false, dev.Timeout, out cmdDuration);
}
else if(read10)
{
sense = dev.Read10(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)i, blockSize,
0, (ushort)blocksToRead, dev.Timeout, out cmdDuration);
sense = dev.Read10(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)i, blockSize, 0,
(ushort)blocksToRead, dev.Timeout, out cmdDuration);
}
else if(read6)
{
@@ -1385,9 +1379,9 @@ namespace DiscImageChef.Core.Devices.Dumping
if(!sense &&
!dev.Error)
{
mhddLog.Write(i, cmdDuration);
ibgLog.Write(i, currentSpeed * 1024);
extents.Add(i, blocksToRead, true);
mhddLog.Write(ui, cmdDuration);
ibgLog.Write(ui, currentSpeed * 1024);
extents.Add(ui, blocksToRead, true);
DateTime writeStart = DateTime.Now;
if(supportedSubchannel != MmcSubchannel.None)
@@ -1402,14 +1396,14 @@ namespace DiscImageChef.Core.Devices.Dumping
Array.Copy(cmdBuf, (int)(SECTOR_SIZE + (b * blockSize)), sub, subSize * b, subSize);
}
outputPlugin.WriteSectorsLong(data, i, blocksToRead);
outputPlugin.WriteSectorsTag(sub, i, blocksToRead, SectorTagType.CdSectorSubchannel);
outputPlugin.WriteSectorsLong(data, ui, blocksToRead);
outputPlugin.WriteSectorsTag(sub, ui, blocksToRead, SectorTagType.CdSectorSubchannel);
}
else
{
if(supportsLongSectors)
{
outputPlugin.WriteSectorsLong(cmdBuf, i, blocksToRead);
outputPlugin.WriteSectorsLong(cmdBuf, ui, blocksToRead);
}
else
{
@@ -1420,11 +1414,11 @@ namespace DiscImageChef.Core.Devices.Dumping
for(int b = 0; b < blocksToRead; b++)
Array.Copy(cmdBuf, (int)(16 + (b * blockSize)), data, 2048 * b, 2048);
outputPlugin.WriteSectors(data, i, blocksToRead);
outputPlugin.WriteSectors(data, ui, blocksToRead);
}
else
{
outputPlugin.WriteSectorsLong(cmdBuf, i, blocksToRead);
outputPlugin.WriteSectorsLong(cmdBuf, ui, blocksToRead);
}
}
}
@@ -1437,43 +1431,43 @@ namespace DiscImageChef.Core.Devices.Dumping
if(stopOnError)
return; // TODO: Return more cleanly
if(i + skip > blocks)
skip = (uint)(blocks - i);
if(ui + skip > blocks)
skip = (uint)(blocks - ui);
// Write empty data
DateTime writeStart = DateTime.Now;
if(supportedSubchannel != MmcSubchannel.None)
{
outputPlugin.WriteSectorsLong(new byte[SECTOR_SIZE * skip], i, skip);
outputPlugin.WriteSectorsLong(new byte[SECTOR_SIZE * skip], ui, skip);
outputPlugin.WriteSectorsTag(new byte[subSize * skip], i, skip,
outputPlugin.WriteSectorsTag(new byte[subSize * skip], ui, skip,
SectorTagType.CdSectorSubchannel);
}
else
{
if(supportsLongSectors)
{
outputPlugin.WriteSectorsLong(new byte[blockSize * skip], i, skip);
outputPlugin.WriteSectorsLong(new byte[blockSize * skip], ui, skip);
}
else
{
if(cmdBuf.Length % 2352 == 0)
outputPlugin.WriteSectors(new byte[2048 * skip], i, skip);
outputPlugin.WriteSectors(new byte[2048 * skip], ui, skip);
else
outputPlugin.WriteSectorsLong(new byte[blockSize * skip], i, skip);
outputPlugin.WriteSectorsLong(new byte[blockSize * skip], ui, skip);
}
}
imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
for(ulong b = i; b < i + skip; b++)
for(ulong b = ui; b < ui + skip; b++)
resume.BadBlocks.Add(b);
DicConsole.DebugWriteLine("Dump-Media", "READ error:\n{0}", Sense.PrettifySense(senseBuf));
mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
mhddLog.Write(ui, cmdDuration < 500 ? 65535 : cmdDuration);
ibgLog.Write(i, 0);
ibgLog.Write(ui, 0);
dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", skip, i);
i += skip - blocksToRead;
newTrim = true;
@@ -1481,7 +1475,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sectorSpeedStart += blocksToRead;
resume.NextBlock = i + blocksToRead;
resume.NextBlock = ui + blocksToRead;
double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
@@ -1492,7 +1486,6 @@ namespace DiscImageChef.Core.Devices.Dumping
sectorSpeedStart = 0;
timeSpeedStart = DateTime.UtcNow;
}
}
EndProgress?.Invoke();
}