From e92c1e77418bb3fc1c9971b9bc76f47f86f2f76a Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Sat, 18 Apr 2020 19:46:36 +0100 Subject: [PATCH] Fix reading CDRWin images that do not have track mode in all caps. Fixes #325 --- Aaru.Images/CDRWin/Read.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Aaru.Images/CDRWin/Read.cs b/Aaru.Images/CDRWin/Read.cs index 4ec86d13c..52a293e6e 100644 --- a/Aaru.Images/CDRWin/Read.cs +++ b/Aaru.Images/CDRWin/Read.cs @@ -158,7 +158,7 @@ namespace Aaru.DiscImages var filtersList = new FiltersList(); bool inTruripDiscHash = false; bool inTruripTrackHash = false; - + ulong gdRomSession2Offset = 45000; densitySeparationSectors = 0; @@ -355,7 +355,7 @@ namespace Aaru.DiscImages { AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM SINGLE-DENSITY AREA at line {0}", lineNumber); _discImage.IsRedumpGigadisc = true; - } + } else if(matchRedumpHdArea.Success) { AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM HIGH-DENSITY AREA at line {0}", lineNumber); @@ -763,7 +763,7 @@ namespace Aaru.DiscImages currentFile.Sequence = currentTrack.Sequence; currentTrack.Bps = CdrWinTrackTypeToBytesPerSector(matchTrack.Groups[2].Value); - currentTrack.TrackType = matchTrack.Groups[2].Value; + currentTrack.TrackType = matchTrack.Groups[2].Value.ToUpperInvariant(); currentTrack.Session = currentSession; inTrack = true; } @@ -804,13 +804,13 @@ namespace Aaru.DiscImages { firstSessionTrk = i; firstTrackRead = true; - } + } sessionSectors += cueTracks[i].Sectors; if(i > lastSessionTrack) lastSessionTrack = i; } - + if(s > 1) if(_discImage.IsRedumpGigadisc) sessions[s - 1].StartSector = gdRomSession2Offset; @@ -865,7 +865,7 @@ namespace Aaru.DiscImages } else if(_discImage.IsRedumpGigadisc) _discImage.MediaType = MediaType.GDROM; - else + else _discImage.MediaType = CdrWinIsoBusterDiscTypeToMediaType(_discImage.OriginalMediaType); if(_discImage.MediaType == MediaType.Unknown || @@ -1205,7 +1205,7 @@ namespace Aaru.DiscImages { if(_discImage.IsTrurip) _imageInfo.Application = "trurip"; - + else if(_discImage.IsRedumpGigadisc) _imageInfo.Application = "Redump.org"; // Detect ISOBuster extensions