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

In Alcohol 120%, generate sessions list before checking for media type. Fixes #182

Browse Source
This commit is contained in:
Natalia Portillo
2018-06-20 22:50:50 +01:00
parent ec8b309670
commit 82f474c7e3
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
DiscImageChef.DiscImages/Alcohol120.cs
View File

@@ -404,6 +404,24 @@ namespace DiscImageChef.DiscImages
imageInfo.MediaType = AlcoholMediumTypeToMediaType(header.type);
Sessions = new List<Session>();
foreach(AlcoholSession alcSes in alcSessions.Values)
{
Session session = new Session();
if(!alcTracks.TryGetValue(alcSes.firstTrack, out AlcoholTrack startingTrack)) break;
if(!alcTracks.TryGetValue(alcSes.lastTrack, out AlcoholTrack endingTrack)) break;
if(!alcTrackExtras.TryGetValue(alcSes.lastTrack, out AlcoholTrackExtra endingTrackExtra)) break;
session.StartSector = startingTrack.startLba;
session.StartTrack = alcSes.firstTrack;
session.SessionSequence = alcSes.sessionSequence;
session.EndSector = endingTrack.startLba + endingTrackExtra.sectors - 1;
session.EndTrack = alcSes.lastTrack;
Sessions.Add(session);
}
if(isDvd)
{
// TODO: Second layer
@@ -530,24 +548,6 @@ namespace DiscImageChef.DiscImages
DicConsole.DebugWriteLine("Alcohol 120% plugin", "ImageInfo.mediaType = {0}", imageInfo.MediaType);
Sessions = new List<Session>();
foreach(AlcoholSession alcSes in alcSessions.Values)
{
Session session = new Session();
if(!alcTracks.TryGetValue(alcSes.firstTrack, out AlcoholTrack startingTrack)) break;
if(!alcTracks.TryGetValue(alcSes.lastTrack, out AlcoholTrack endingTrack)) break;
if(!alcTrackExtras.TryGetValue(alcSes.lastTrack, out AlcoholTrackExtra endingTrackExtra)) break;
session.StartSector = startingTrack.startLba;
session.StartTrack = alcSes.firstTrack;
session.SessionSequence = alcSes.sessionSequence;
session.EndSector = endingTrack.startLba + endingTrackExtra.sectors - 1;
session.EndTrack = alcSes.lastTrack;
Sessions.Add(session);
}
Partitions = new List<Partition>();
offsetmap = new Dictionary<uint, ulong>();
ulong byteOffset = 0;