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

Get back tracks, indexes, MCN and ISRCs from resumed file. Fixes #376

Browse Source
This commit is contained in:
Natalia Portillo
2020-11-05 01:21:54 +00:00
parent 254bb304ea
commit c94530e685
1 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -820,6 +820,47 @@ namespace Aaru.Core.Devices.Dumping
return;
}
try
{
byte[] mcnBytes = _outputPlugin.ReadDiskTag(MediaTagType.CD_MCN);
if(mcnBytes != null)
mcn = Encoding.ASCII.GetString(mcnBytes);
}
catch(Exception)
{
// TODO: Replace for error number
}
foreach(Track imgTrack in (_outputPlugin as IWritableOpticalImage).Tracks)
{
try
{
byte[] isrcBytes =
(_outputPlugin as IWritableOpticalImage).ReadSectorTag(imgTrack.TrackSequence,
SectorTagType.CdTrackIsrc);
if(isrcBytes != null)
isrcs[(byte)imgTrack.TrackSequence] = Encoding.ASCII.GetString(isrcBytes);
}
catch(Exception)
{
// TODO: Replace for error number
}
Track trk = tracks.FirstOrDefault(t => t.TrackSequence == imgTrack.TrackSequence);
if(trk != null)
{
trk.TrackPregap = imgTrack.TrackPregap;
trk.TrackStartSector = imgTrack.TrackStartSector;
trk.TrackEndSector = imgTrack.TrackEndSector;
foreach(KeyValuePair<ushort, int> imgIdx in imgTrack.Indexes)
trk.Indexes[imgIdx.Key] = imgIdx.Value;
}
}
// Send track list to output plugin. This may fail if subchannel is set but unsupported.
ret = (_outputPlugin as IWritableOpticalImage).SetTracks(tracks.ToList());
@@ -904,8 +945,8 @@ namespace Aaru.Core.Devices.Dumping
isrcs[(byte)trk.TrackSequence] = isrc;
UpdateStatus?.Invoke($"Found ISRC for track {trk.TrackSequence}: {mcn}");
_dumpLog.WriteLine($"Found ISRC for track {trk.TrackSequence}: {mcn}");
UpdateStatus?.Invoke($"Found ISRC for track {trk.TrackSequence}: {isrc}");
_dumpLog.WriteLine($"Found ISRC for track {trk.TrackSequence}: {isrc}");
}
if(supportedSubchannel != MmcSubchannel.None &&
@@ -1304,6 +1345,16 @@ namespace Aaru.Core.Devices.Dumping
_dumpLog.WriteLine("Setting disc Media Catalogue Number to {0}", mcn);
}
foreach(Track trk in tracks)
{
if(trk.Indexes.TryGetValue(0, out int idx0) &&
trk.Indexes.TryGetValue(1, out int idx1) &&
idx0 == idx1)
trk.Indexes.Remove(0);
}
(_outputPlugin as IWritableOpticalImage).SetTracks(tracks.ToList());
_dumpLog.WriteLine("Closing output file.");
UpdateStatus?.Invoke("Closing output file.");
DateTime closeStart = DateTime.Now;