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 multi-file CDRWin image

Browse Source
This commit is contained in:
Rebecca Wallander
2020-06-25 22:06:58 +02:00
parent 84ee971ad8
commit 30b18db206
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Aaru.Images/CDRWin/Read.cs
View File

@@ -1140,6 +1140,8 @@ namespace Aaru.DiscImages
Partitions = new List<Partition>();
ulong partitionSequence = 0;
ulong previousPartitionsSize = 0;
string previousFile = _discImage.Tracks[0].TrackFile.DataFilter.GetBasePath();
_offsetMap = new Dictionary<uint, ulong>();
@@ -1165,15 +1167,22 @@ namespace Aaru.DiscImages
partition.Type = _discImage.Tracks[i].TrackType;
partitionSequence++;
if(_discImage.Tracks[i].TrackFile.DataFilter.GetBasePath() != previousFile){
previousPartitionsSize += _discImage.Tracks[i - 1].Sectors;
previousFile = _discImage.Tracks[i].TrackFile.DataFilter.GetBasePath();
}
if(_discImage.Tracks[i].Indexes.TryGetValue(0, out int idx0))
_offsetMap.Add(_discImage.Tracks[i].Sequence, (ulong)idx0);
_offsetMap.Add(_discImage.Tracks[i].Sequence, (ulong)idx0 + previousPartitionsSize);
else if(_discImage.Tracks[i].Sequence > 1)
_offsetMap.Add(_discImage.Tracks[i].Sequence,
(ulong)(_discImage.Tracks[i].Indexes[1] - _discImage.Tracks[i].Pregap));
(ulong)(_discImage.Tracks[i].Indexes[1] - _discImage.Tracks[i].Pregap) +
previousPartitionsSize);
else
_offsetMap.Add(_discImage.Tracks[i].Sequence, (ulong)_discImage.Tracks[i].Indexes[1]);
_offsetMap.Add(_discImage.Tracks[i].Sequence, (ulong)_discImage.Tracks[i].Indexes[1] +
previousPartitionsSize);
Partitions.Add(partition);
}