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

If track mode can be guessed, try again after pregap.

Browse Source
This commit is contained in:
Natalia Portillo
2020-04-24 13:28:49 +01:00
parent 1f6a81d513
commit ed193f47a7
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
View File

@@ -447,11 +447,10 @@ namespace Aaru.Core.Devices.Dumping
{
new Track
{
TrackSequence = 0, TrackSession = 1,
TrackType = hiddenData ? TrackType.Data : TrackType.Audio,
TrackStartSector = 0, TrackBytesPerSector = (int)sectorSize,
TrackSequence = 0, TrackSession = 1, TrackType = hiddenData ? TrackType.Data : TrackType.Audio,
TrackStartSector = 0, TrackBytesPerSector = (int)sectorSize,
TrackRawBytesPerSector = (int)sectorSize, TrackSubchannelType = subType,
TrackEndSector = tracks.First(t => t.TrackSequence == 1).TrackStartSector - 1
TrackEndSector = tracks.First(t => t.TrackSequence == 1).TrackStartSector - 1
}
};
@@ -484,16 +483,28 @@ namespace Aaru.Core.Devices.Dumping
_dumpLog.WriteLine("Checking mode for track {0}...", tracks[t].TrackSequence);
UpdateStatus?.Invoke($"Checking mode for track {tracks[t].TrackSequence}...");
sense = !_dev.ReadCd(out cmdBuf, out _, (uint)tracks[t].TrackStartSector, blockSize, 1,
MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
MmcErrorField.None, supportedSubchannel, _dev.Timeout, out _);
sense = _dev.ReadCd(out cmdBuf, out _, (uint)tracks[t].TrackStartSector, blockSize, 1,
MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
MmcErrorField.None, supportedSubchannel, _dev.Timeout, out _);
if(!sense)
if(sense)
{
_dumpLog.WriteLine("Unable to guess mode for track {0}, continuing...", tracks[t].TrackSequence);
UpdateStatus?.Invoke($"Unable to guess mode for track {tracks[t].TrackSequence}, continuing...");
if(tracks[t].TrackPregap != 0)
sense = _dev.ReadCd(out cmdBuf, out _,
(uint)(tracks[t].TrackStartSector + tracks[t].TrackPregap), blockSize, 1,
MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
true, true, MmcErrorField.None, supportedSubchannel, _dev.Timeout, out _);
continue;
if(sense)
{
_dumpLog.WriteLine("Unable to guess mode for track {0}, continuing...",
tracks[t].TrackSequence);
UpdateStatus?.
Invoke($"Unable to guess mode for track {tracks[t].TrackSequence}, continuing...");
continue;
}
}
switch(cmdBuf[15])
@@ -717,8 +728,7 @@ namespace Aaru.Core.Devices.Dumping
_dumpLog.WriteLine(_outputPlugin.ErrorMessage);
StoppingErrorMessage?.Invoke("Error sending tracks to output image, not continuing." +
Environment.NewLine +
_outputPlugin.ErrorMessage);
Environment.NewLine + _outputPlugin.ErrorMessage);
return;
}
@@ -745,14 +755,12 @@ namespace Aaru.Core.Devices.Dumping
_dumpLog.WriteLine(_outputPlugin.ErrorMessage);
ErrorMessage?.Invoke("Error writing subchannel to output image, continuing..." +
Environment.NewLine +
_outputPlugin.ErrorMessage);
Environment.NewLine + _outputPlugin.ErrorMessage);
}
else
{
StoppingErrorMessage?.Invoke("Error writing subchannel to output image, not continuing..." +
Environment.NewLine +
_outputPlugin.ErrorMessage);
Environment.NewLine + _outputPlugin.ErrorMessage);
return;
}
@@ -772,8 +780,7 @@ namespace Aaru.Core.Devices.Dumping
_dumpLog.WriteLine(_outputPlugin.ErrorMessage);
StoppingErrorMessage?.Invoke("Error sending tracks to output image, not continuing..." +
Environment.NewLine +
_outputPlugin.ErrorMessage);
Environment.NewLine + _outputPlugin.ErrorMessage);
return;
}
@@ -1007,8 +1014,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.");