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

🐛Fix dumping CD when RAW TOC says there are no tracks, but processed TOC says there are.

Browse Source
This commit is contained in:
Natalia Portillo
2018-02-04 18:51:04 +00:00
parent 72740566ae
commit 83bb2b5b1e
1 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,7 +119,7 @@ namespace DiscImageChef.Core.Devices.Dumping
// We discarded all discs that falsify a TOC before requesting a real TOC
// No TOC, no CD (or an empty one)
dumpLog.WriteLine("Reading full TOC");
bool tocSense = dev.ReadRawToc(out byte[] cmdBuf, out byte[] senseBuf, 1, dev.Timeout, out _);
bool tocSense = dev.ReadRawToc(out byte[] cmdBuf, out byte[] senseBuf, 0, dev.Timeout, out _);
if(!tocSense)
{
toc = FullTOC.Decode(cmdBuf);
@@ -392,6 +392,43 @@ namespace DiscImageChef.Core.Devices.Dumping
lastSector = phour * 3600 * 75 + pmin * 60 * 75 + psec * 75 + pframe - 150;
}
if(trackList.Count == 0)
{
DicConsole.WriteLine("TOC with no tracks found, trying old method...");
dumpLog.WriteLine("TOC with no tracks found, trying old method...");
dumpLog.WriteLine("Reading old TOC");
tocSense = dev.ReadToc(out cmdBuf, out senseBuf, false, 0, dev.Timeout, out _);
TOC.CDTOC? oldToc = Decoders.CD.TOC.Decode(cmdBuf);
if(tocSense ||!oldToc.HasValue)
{
DicConsole.WriteLine("Could not read TOC, cannot continue...");
dumpLog.WriteLine("Could not read TOC, cannot continue...");
return;
}
lastSector = 0;
foreach(TOC.CDTOCTrackDataDescriptor trk in oldToc.Value.TrackDescriptors.OrderBy(t=>t.TrackNumber).Where(trk => trk.ADR == 1 || trk.ADR == 4))
if(trk.TrackNumber >= 0x01 && trk.TrackNumber <= 0x63)
trackList.Add(new Track
{
TrackSequence = trk.TrackNumber,
TrackSession = 1,
TrackType =
(TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrack ||
(TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrackIncremental
? TrackType.Data
: TrackType.Audio,
TrackStartSector = trk.TrackStartAddress,
TrackBytesPerSector = (int)SECTOR_SIZE,
TrackRawBytesPerSector = (int)SECTOR_SIZE,
TrackSubchannelType = subType
});
else if(trk.TrackNumber == 0xAA)
lastSector = trk.TrackStartAddress - 1;
}
Track[] tracks = trackList.ToArray();
for(int t = 1; t < tracks.Length; t++) tracks[t - 1].TrackEndSector = tracks[t].TrackStartSector - 1;