diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml index b4442615b..1c4194183 100644 --- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml +++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml @@ -3,14 +3,13 @@ - - + diff --git a/.idea/.idea.DiscImageChef/.idea/vcs.xml b/.idea/.idea.DiscImageChef/.idea/vcs.xml index b000a2ed1..6585fa317 100644 --- a/.idea/.idea.DiscImageChef/.idea/vcs.xml +++ b/.idea/.idea.DiscImageChef/.idea/vcs.xml @@ -8,6 +8,7 @@ + diff --git a/DiscImageChef.DiscImages/Alcohol120/Read.cs b/DiscImageChef.DiscImages/Alcohol120/Read.cs index 120f9addb..e28ed5106 100644 --- a/DiscImageChef.DiscImages/Alcohol120/Read.cs +++ b/DiscImageChef.DiscImages/Alcohol120/Read.cs @@ -808,6 +808,10 @@ namespace DiscImageChef.DiscImages } case AlcoholTrackMode.Mode2: + case AlcoholTrackMode.Mode2F1: + case AlcoholTrackMode.Mode2F1Alt: + case AlcoholTrackMode.Mode2F2: + case AlcoholTrackMode.Mode2F2Alt: { mode2 = true; sectorOffset = 0; @@ -817,26 +821,6 @@ namespace DiscImageChef.DiscImages break; } - case AlcoholTrackMode.Mode2F1: - case AlcoholTrackMode.Mode2F1Alt: - { - sectorOffset = 24; - sectorSize = 2048; - sectorSkip = 280; - - break; - } - - case AlcoholTrackMode.Mode2F2: - case AlcoholTrackMode.Mode2F2Alt: - { - sectorOffset = 24; - sectorSize = 2324; - sectorSkip = 4; - - break; - } - case AlcoholTrackMode.Audio: { sectorOffset = 0; @@ -884,12 +868,12 @@ namespace DiscImageChef.DiscImages { var mode2Ms = new MemoryStream((int)(sectorSize * length)); - buffer = br.ReadBytes((int)(sectorSize * length)); + buffer = br.ReadBytes((int)((sectorSize + sectorSkip) * length)); for(int i = 0; i < length; i++) { byte[] sector = new byte[sectorSize]; - Array.Copy(buffer, sectorSize * i, sector, 0, sectorSize); + Array.Copy(buffer, (sectorSize + sectorSkip) * i, sector, 0, sectorSize); sector = Sector.GetUserDataFromMode2(sector); mode2Ms.Write(sector, 0, sector.Length); } diff --git a/DiscImageChef.DiscImages/BlindWrite5/Read.cs b/DiscImageChef.DiscImages/BlindWrite5/Read.cs index 05f3c2947..118cfeac4 100644 --- a/DiscImageChef.DiscImages/BlindWrite5/Read.cs +++ b/DiscImageChef.DiscImages/BlindWrite5/Read.cs @@ -1348,12 +1348,12 @@ namespace DiscImageChef.DiscImages { var mode2Ms = new MemoryStream((int)(sectorSize * length)); - buffer = br.ReadBytes((int)(sectorSize * length)); + buffer = br.ReadBytes((int)((sectorSize + sectorSkip) * length)); for(int i = 0; i < length; i++) { byte[] sector = new byte[sectorSize]; - Array.Copy(buffer, sectorSize * i, sector, 0, sectorSize); + Array.Copy(buffer, (sectorSize + sectorSkip) * i, sector, 0, sectorSize); sector = Sector.GetUserDataFromMode2(sector); mode2Ms.Write(sector, 0, sector.Length); } diff --git a/DiscImageChef.DiscImages/CDRDAO/Read.cs b/DiscImageChef.DiscImages/CDRDAO/Read.cs index be90aae3b..db84bdc1f 100644 --- a/DiscImageChef.DiscImages/CDRDAO/Read.cs +++ b/DiscImageChef.DiscImages/CDRDAO/Read.cs @@ -51,7 +51,8 @@ namespace DiscImageChef.DiscImages { public bool Open(IFilter imageFilter) { - if(imageFilter == null) return false; + if(imageFilter == null) + return false; cdrdaoFilter = imageFilter; @@ -62,49 +63,52 @@ namespace DiscImageChef.DiscImages bool intrack = false; // Initialize all RegExs - Regex regexComment = new Regex(REGEX_COMMENT); - Regex regexDiskType = new Regex(REGEX_DISCTYPE); - Regex regexMcn = new Regex(REGEX_MCN); - Regex regexTrack = new Regex(REGEX_TRACK); - Regex regexCopy = new Regex(REGEX_COPY); - Regex regexEmphasis = new Regex(REGEX_EMPHASIS); - Regex regexStereo = new Regex(REGEX_STEREO); - Regex regexIsrc = new Regex(REGEX_ISRC); - Regex regexIndex = new Regex(REGEX_INDEX); - Regex regexPregap = new Regex(REGEX_PREGAP); - Regex regexZeroPregap = new Regex(REGEX_ZERO_PREGAP); - Regex regexZeroData = new Regex(REGEX_ZERO_DATA); - Regex regexZeroAudio = new Regex(REGEX_ZERO_AUDIO); - Regex regexAudioFile = new Regex(REGEX_FILE_AUDIO); - Regex regexFile = new Regex(REGEX_FILE_DATA); - Regex regexTitle = new Regex(REGEX_TITLE); - Regex regexPerformer = new Regex(REGEX_PERFORMER); - Regex regexSongwriter = new Regex(REGEX_SONGWRITER); - Regex regexComposer = new Regex(REGEX_COMPOSER); - Regex regexArranger = new Regex(REGEX_ARRANGER); - Regex regexMessage = new Regex(REGEX_MESSAGE); - Regex regexDiscId = new Regex(REGEX_DISC_ID); - Regex regexUpc = new Regex(REGEX_UPC); - Regex regexCdText = new Regex(REGEX_CD_TEXT); - Regex regexLanguage = new Regex(REGEX_LANGUAGE); - Regex regexClosure = new Regex(REGEX_CLOSURE); - Regex regexLanguageMap = new Regex(REGEX_LANGUAGE_MAP); - Regex regexLanguageMapping = new Regex(REGEX_LANGUAGE_MAPPING); + var regexComment = new Regex(REGEX_COMMENT); + var regexDiskType = new Regex(REGEX_DISCTYPE); + var regexMcn = new Regex(REGEX_MCN); + var regexTrack = new Regex(REGEX_TRACK); + var regexCopy = new Regex(REGEX_COPY); + var regexEmphasis = new Regex(REGEX_EMPHASIS); + var regexStereo = new Regex(REGEX_STEREO); + var regexIsrc = new Regex(REGEX_ISRC); + var regexIndex = new Regex(REGEX_INDEX); + var regexPregap = new Regex(REGEX_PREGAP); + var regexZeroPregap = new Regex(REGEX_ZERO_PREGAP); + var regexZeroData = new Regex(REGEX_ZERO_DATA); + var regexZeroAudio = new Regex(REGEX_ZERO_AUDIO); + var regexAudioFile = new Regex(REGEX_FILE_AUDIO); + var regexFile = new Regex(REGEX_FILE_DATA); + var regexTitle = new Regex(REGEX_TITLE); + var regexPerformer = new Regex(REGEX_PERFORMER); + var regexSongwriter = new Regex(REGEX_SONGWRITER); + var regexComposer = new Regex(REGEX_COMPOSER); + var regexArranger = new Regex(REGEX_ARRANGER); + var regexMessage = new Regex(REGEX_MESSAGE); + var regexDiscId = new Regex(REGEX_DISC_ID); + var regexUpc = new Regex(REGEX_UPC); + var regexCdText = new Regex(REGEX_CD_TEXT); + var regexLanguage = new Regex(REGEX_LANGUAGE); + var regexClosure = new Regex(REGEX_CLOSURE); + var regexLanguageMap = new Regex(REGEX_LANGUAGE_MAP); + var regexLanguageMapping = new Regex(REGEX_LANGUAGE_MAPPING); // Initialize all RegEx matches Match matchComment; Match matchDiskType; // Initialize disc - discimage = new CdrdaoDisc {Tracks = new List(), Comment = ""}; + discimage = new CdrdaoDisc + { + Tracks = new List(), Comment = "" + }; - CdrdaoTrack currenttrack = new CdrdaoTrack(); - uint currentTrackNumber = 0; + var currenttrack = new CdrdaoTrack(); + uint currentTrackNumber = 0; currenttrack.Indexes = new Dictionary(); currenttrack.Pregap = 0; - ulong currentSector = 0; - int nextindex = 2; - StringBuilder commentBuilder = new StringBuilder(); + ulong currentSector = 0; + int nextindex = 2; + var commentBuilder = new StringBuilder(); tocStream = new StreamReader(cdrdaoFilter.GetDataForkStream()); string line; @@ -119,12 +123,14 @@ namespace DiscImageChef.DiscImages matchComment = regexComment.Match(line); // Skip comments at start of file - if(matchComment.Success) continue; + if(matchComment.Success) + continue; if(!matchDiskType.Success) { DicConsole.DebugWriteLine("CDRDAO plugin", "Not a CDRDAO TOC or TOC type not in line {0}.", lineNumber); + return false; } @@ -135,6 +141,7 @@ namespace DiscImageChef.DiscImages lineNumber = 0; tocStream.BaseStream.Position = 0; + while(tocStream.Peek() >= 0) { lineNumber++; @@ -177,29 +184,37 @@ namespace DiscImageChef.DiscImages DicConsole.DebugWriteLine("CDRDAO plugin", "Found comment \"{1}\" at line {0}", lineNumber, matchComment.Groups["comment"].Value.Trim()); + commentBuilder.AppendLine(matchComment.Groups["comment"].Value.Trim()); } else if(matchDiskType.Success) { DicConsole.DebugWriteLine("CDRDAO plugin", "Found {1} at line {0}", lineNumber, matchDiskType.Groups["type"].Value); + discimage.Disktypestr = matchDiskType.Groups["type"].Value; + switch(matchDiskType.Groups["type"].Value) { - case "CD_DA": + case"CD_DA": discimage.Disktype = MediaType.CDDA; + break; - case "CD_ROM": + case"CD_ROM": discimage.Disktype = MediaType.CDROM; + break; - case "CD_ROM_XA": + case"CD_ROM_XA": discimage.Disktype = MediaType.CDROMXA; + break; - case "CD_I": + case"CD_I": discimage.Disktype = MediaType.CDI; + break; default: discimage.Disktype = MediaType.CD; + break; } } @@ -207,6 +222,7 @@ namespace DiscImageChef.DiscImages { DicConsole.DebugWriteLine("CDRDAO plugin", "Found CATALOG \"{1}\" at line {0}", lineNumber, matchMcn.Groups["catalog"].Value); + discimage.Mcn = matchMcn.Groups["catalog"].Value; } else if(matchTrack.Success) @@ -224,11 +240,19 @@ namespace DiscImageChef.DiscImages if(intrack) { currentSector += currenttrack.Sectors; - if(currenttrack.Pregap != currenttrack.Sectors && !currenttrack.Indexes.ContainsKey(1)) + + if(currenttrack.Pregap != currenttrack.Sectors && + !currenttrack.Indexes.ContainsKey(1)) currenttrack.Indexes.Add(1, currenttrack.StartSector + currenttrack.Pregap); + discimage.Tracks.Add(currenttrack); - currenttrack = new CdrdaoTrack {Indexes = new Dictionary(), Pregap = 0}; - nextindex = 2; + + currenttrack = new CdrdaoTrack + { + Indexes = new Dictionary(), Pregap = 0 + }; + + nextindex = 2; } currentTrackNumber++; @@ -236,21 +260,25 @@ namespace DiscImageChef.DiscImages switch(matchTrack.Groups["type"].Value) { - case "AUDIO": - case "MODE1_RAW": - case "MODE2_RAW": + case"AUDIO": + case"MODE1_RAW": + case"MODE2_RAW": currenttrack.Bps = 2352; + break; - case "MODE1": - case "MODE2_FORM1": + case"MODE1": + case"MODE2_FORM1": currenttrack.Bps = 2048; + break; - case "MODE2_FORM2": + case"MODE2_FORM2": currenttrack.Bps = 2324; + break; - case "MODE2": - case "MODE2_FORM_MIX": + case"MODE2": + case"MODE2_FORM_MIX": currenttrack.Bps = 2336; + break; default: throw new @@ -259,12 +287,13 @@ namespace DiscImageChef.DiscImages switch(matchTrack.Groups["subchan"].Value) { - case "": break; - case "RW": + case"": break; + case"RW": currenttrack.Packedsubchannel = true; - goto case "RW_RAW"; - case "RW_RAW": + goto case"RW_RAW"; + case"RW_RAW": currenttrack.Subchannel = true; + break; default: throw new @@ -280,25 +309,30 @@ namespace DiscImageChef.DiscImages { DicConsole.DebugWriteLine("CDRDAO plugin", "Found {1} COPY at line {0}", lineNumber, matchCopy.Groups["no"].Value); + currenttrack.FlagDcp |= intrack && matchCopy.Groups["no"].Value == ""; } else if(matchEmphasis.Success) { DicConsole.DebugWriteLine("CDRDAO plugin", "Found {1} PRE_EMPHASIS at line {0}", lineNumber, matchEmphasis.Groups["no"].Value); + currenttrack.FlagPre |= intrack && matchEmphasis.Groups["no"].Value == ""; } else if(matchStereo.Success) { DicConsole.DebugWriteLine("CDRDAO plugin", "Found {1}_CHANNEL_AUDIO at line {0}", lineNumber, matchStereo.Groups["num"].Value); + currenttrack.Flag_4Ch |= intrack && matchStereo.Groups["num"].Value == "FOUR"; } else if(matchIsrc.Success) { DicConsole.DebugWriteLine("CDRDAO plugin", "Found ISRC \"{1}\" at line {0}", lineNumber, matchIsrc.Groups["isrc"].Value); - if(intrack) currenttrack.Isrc = matchIsrc.Groups["isrc"].Value; + + if(intrack) + currenttrack.Isrc = matchIsrc.Groups["isrc"].Value; } else if(matchIndex.Success) { @@ -306,8 +340,10 @@ namespace DiscImageChef.DiscImages matchIndex.Groups["address"].Value); string[] lengthString = matchFile.Groups["length"].Value.Split(':'); - ulong nextIndexPos = ulong.Parse(lengthString[0]) * 60 * 75 + - ulong.Parse(lengthString[1]) * 75 + ulong.Parse(lengthString[2]); + + ulong nextIndexPos = (ulong.Parse(lengthString[0]) * 60 * 75) + + (ulong.Parse(lengthString[1]) * 75) + ulong.Parse(lengthString[2]); + currenttrack.Indexes.Add(nextindex, nextIndexPos + currenttrack.Pregap + currenttrack.StartSector); } @@ -317,22 +353,28 @@ namespace DiscImageChef.DiscImages matchPregap.Groups["address"].Value); currenttrack.Indexes.Add(0, currenttrack.StartSector); + if(matchPregap.Groups["address"].Value != "") { string[] lengthString = matchPregap.Groups["address"].Value.Split(':'); - currenttrack.Pregap = ulong.Parse(lengthString[0]) * 60 * 75 + - ulong.Parse(lengthString[1]) * 75 + ulong.Parse(lengthString[2]); + + currenttrack.Pregap = (ulong.Parse(lengthString[0]) * 60 * 75) + + (ulong.Parse(lengthString[1]) * 75) + + ulong.Parse(lengthString[2]); } - else currenttrack.Pregap = currenttrack.Sectors; + else + currenttrack.Pregap = currenttrack.Sectors; } else if(matchZeroPregap.Success) { DicConsole.DebugWriteLine("CDRDAO plugin", "Found PREGAP \"{1}\" at line {0}", lineNumber, matchZeroPregap.Groups["length"].Value); + currenttrack.Indexes.Add(0, currenttrack.StartSector); string[] lengthString = matchZeroPregap.Groups["length"].Value.Split(':'); - currenttrack.Pregap = ulong.Parse(lengthString[0]) * 60 * 75 + - ulong.Parse(lengthString[1]) * 75 + ulong.Parse(lengthString[2]); + + currenttrack.Pregap = (ulong.Parse(lengthString[0]) * 60 * 75) + + (ulong.Parse(lengthString[1]) * 75) + ulong.Parse(lengthString[2]); } else if(matchZeroData.Success) DicConsole.DebugWriteLine("CDRDAO plugin", "Found ZERO \"{1}\" at line {0}", lineNumber, @@ -343,12 +385,14 @@ namespace DiscImageChef.DiscImages else { FiltersList filtersList; + if(matchAudioFile.Success) { DicConsole.DebugWriteLine("CDRDAO plugin", "Found AUDIOFILE \"{1}\" at line {0}", lineNumber, matchAudioFile.Groups["filename"].Value); filtersList = new FiltersList(); + currenttrack.Trackfile = new CdrdaoTrackFile { Datafilter = @@ -356,10 +400,8 @@ namespace DiscImageChef.DiscImages matchAudioFile.Groups["filename"].Value)), Datafile = matchAudioFile.Groups["filename"].Value, Offset = matchAudioFile.Groups["base_offset"].Value != "" - ? ulong.Parse(matchAudioFile.Groups["base_offset"].Value) - : 0, - Filetype = "BINARY", - Sequence = currentTrackNumber + ? ulong.Parse(matchAudioFile.Groups["base_offset"].Value) : 0, + Filetype = "BINARY", Sequence = currentTrackNumber }; ulong startSectors = 0; @@ -367,8 +409,9 @@ namespace DiscImageChef.DiscImages if(matchAudioFile.Groups["start"].Value != "") { string[] startString = matchAudioFile.Groups["start"].Value.Split(':'); - startSectors = ulong.Parse(startString[0]) * 60 * 75 + - ulong.Parse(startString[1]) * 75 + ulong.Parse(startString[2]); + + startSectors = (ulong.Parse(startString[0]) * 60 * 75) + + (ulong.Parse(startString[1]) * 75) + ulong.Parse(startString[2]); } currenttrack.Trackfile.Offset += startSectors * currenttrack.Bps; @@ -376,8 +419,9 @@ namespace DiscImageChef.DiscImages if(matchAudioFile.Groups["length"].Value != "") { string[] lengthString = matchAudioFile.Groups["length"].Value.Split(':'); - currenttrack.Sectors = ulong.Parse(lengthString[0]) * 60 * 75 + - ulong.Parse(lengthString[1]) * 75 + + + currenttrack.Sectors = (ulong.Parse(lengthString[0]) * 60 * 75) + + (ulong.Parse(lengthString[1]) * 75) + ulong.Parse(lengthString[2]); } else @@ -391,6 +435,7 @@ namespace DiscImageChef.DiscImages matchFile.Groups["filename"].Value); filtersList = new FiltersList(); + currenttrack.Trackfile = new CdrdaoTrackFile { Datafilter = @@ -398,17 +443,16 @@ namespace DiscImageChef.DiscImages matchFile.Groups["filename"].Value)), Datafile = matchAudioFile.Groups["filename"].Value, Offset = matchFile.Groups["base_offset"].Value != "" - ? ulong.Parse(matchFile.Groups["base_offset"].Value) - : 0, - Filetype = "BINARY", - Sequence = currentTrackNumber + ? ulong.Parse(matchFile.Groups["base_offset"].Value) : 0, + Filetype = "BINARY", Sequence = currentTrackNumber }; if(matchFile.Groups["length"].Value != "") { string[] lengthString = matchFile.Groups["length"].Value.Split(':'); - currenttrack.Sectors = ulong.Parse(lengthString[0]) * 60 * 75 + - ulong.Parse(lengthString[1]) * 75 + + + currenttrack.Sectors = (ulong.Parse(lengthString[0]) * 60 * 75) + + (ulong.Parse(lengthString[1]) * 75) + ulong.Parse(lengthString[2]); } else @@ -420,59 +464,85 @@ namespace DiscImageChef.DiscImages { DicConsole.DebugWriteLine("CDRDAO plugin", "Found TITLE \"{1}\" at line {0}", lineNumber, matchTitle.Groups["title"].Value); - if(intrack) currenttrack.Title = matchTitle.Groups["title"].Value; - else discimage.Title = matchTitle.Groups["title"].Value; + + if(intrack) + currenttrack.Title = matchTitle.Groups["title"].Value; + else + discimage.Title = matchTitle.Groups["title"].Value; } else if(matchPerformer.Success) { DicConsole.DebugWriteLine("CDRDAO plugin", "Found PERFORMER \"{1}\" at line {0}", lineNumber, matchPerformer.Groups["performer"].Value); - if(intrack) currenttrack.Performer = matchPerformer.Groups["performer"].Value; - else discimage.Performer = matchPerformer.Groups["performer"].Value; + + if(intrack) + currenttrack.Performer = matchPerformer.Groups["performer"].Value; + else + discimage.Performer = matchPerformer.Groups["performer"].Value; } else if(matchSongwriter.Success) { DicConsole.DebugWriteLine("CDRDAO plugin", "Found SONGWRITER \"{1}\" at line {0}", lineNumber, matchSongwriter.Groups["songwriter"].Value); - if(intrack) currenttrack.Songwriter = matchSongwriter.Groups["songwriter"].Value; - else discimage.Songwriter = matchSongwriter.Groups["songwriter"].Value; + + if(intrack) + currenttrack.Songwriter = matchSongwriter.Groups["songwriter"].Value; + else + discimage.Songwriter = matchSongwriter.Groups["songwriter"].Value; } else if(matchComposer.Success) { DicConsole.DebugWriteLine("CDRDAO plugin", "Found COMPOSER \"{1}\" at line {0}", lineNumber, matchComposer.Groups["composer"].Value); - if(intrack) currenttrack.Composer = matchComposer.Groups["composer"].Value; - else discimage.Composer = matchComposer.Groups["composer"].Value; + + if(intrack) + currenttrack.Composer = matchComposer.Groups["composer"].Value; + else + discimage.Composer = matchComposer.Groups["composer"].Value; } else if(matchArranger.Success) { DicConsole.DebugWriteLine("CDRDAO plugin", "Found ARRANGER \"{1}\" at line {0}", lineNumber, matchArranger.Groups["arranger"].Value); - if(intrack) currenttrack.Arranger = matchArranger.Groups["arranger"].Value; - else discimage.Arranger = matchArranger.Groups["arranger"].Value; + + if(intrack) + currenttrack.Arranger = matchArranger.Groups["arranger"].Value; + else + discimage.Arranger = matchArranger.Groups["arranger"].Value; } else if(matchMessage.Success) { DicConsole.DebugWriteLine("CDRDAO plugin", "Found MESSAGE \"{1}\" at line {0}", lineNumber, matchMessage.Groups["message"].Value); - if(intrack) currenttrack.Message = matchMessage.Groups["message"].Value; - else discimage.Message = matchMessage.Groups["message"].Value; + + if(intrack) + currenttrack.Message = matchMessage.Groups["message"].Value; + else + discimage.Message = matchMessage.Groups["message"].Value; } else if(matchDiscId.Success) { DicConsole.DebugWriteLine("CDRDAO plugin", "Found DISC_ID \"{1}\" at line {0}", lineNumber, matchDiscId.Groups["discid"].Value); - if(!intrack) discimage.DiskId = matchDiscId.Groups["discid"].Value; + + if(!intrack) + discimage.DiskId = matchDiscId.Groups["discid"].Value; } else if(matchUpc.Success) { DicConsole.DebugWriteLine("CDRDAO plugin", "Found UPC_EAN \"{1}\" at line {0}", lineNumber, matchUpc.Groups["catalog"].Value); - if(!intrack) discimage.Barcode = matchUpc.Groups["catalog"].Value; + + if(!intrack) + discimage.Barcode = matchUpc.Groups["catalog"].Value; } + // Ignored fields - else if(matchCdText.Success || matchLanguage.Success || matchClosure.Success || - matchLanguageMap.Success || matchLanguageMapping.Success) { } + else if(matchCdText.Success || + matchLanguage.Success || + matchClosure.Success || + matchLanguageMap.Success || + matchLanguageMapping.Success) { } else if(line == "") // Empty line, ignore it { } } @@ -488,7 +558,8 @@ namespace DiscImageChef.DiscImages if(currenttrack.Sequence != 0) { - if(currenttrack.Pregap != currenttrack.Sectors && !currenttrack.Indexes.ContainsKey(1)) + if(currenttrack.Pregap != currenttrack.Sectors && + !currenttrack.Indexes.ContainsKey(1)) currenttrack.Indexes.Add(1, currenttrack.StartSector + currenttrack.Pregap); discimage.Tracks.Add(currenttrack); @@ -499,57 +570,77 @@ namespace DiscImageChef.DiscImages // DEBUG information DicConsole.DebugWriteLine("CDRDAO plugin", "Disc image parsing results"); DicConsole.DebugWriteLine("CDRDAO plugin", "Disc CD-TEXT:"); - if(discimage.Arranger == null) DicConsole.DebugWriteLine("CDRDAO plugin", "\tArranger is not set."); + + if(discimage.Arranger == null) + DicConsole.DebugWriteLine("CDRDAO plugin", "\tArranger is not set."); else - DicConsole.DebugWriteLine("CDRDAO plugin", "\tArranger: {0}", - discimage.Arranger); - if(discimage.Composer == null) DicConsole.DebugWriteLine("CDRDAO plugin", "\tComposer is not set."); + DicConsole.DebugWriteLine("CDRDAO plugin", "\tArranger: {0}", discimage.Arranger); + + if(discimage.Composer == null) + DicConsole.DebugWriteLine("CDRDAO plugin", "\tComposer is not set."); else - DicConsole.DebugWriteLine("CDRDAO plugin", "\tComposer: {0}", - discimage.Composer); - if(discimage.Performer == null) DicConsole.DebugWriteLine("CDRDAO plugin", "\tPerformer is not set."); + DicConsole.DebugWriteLine("CDRDAO plugin", "\tComposer: {0}", discimage.Composer); + + if(discimage.Performer == null) + DicConsole.DebugWriteLine("CDRDAO plugin", "\tPerformer is not set."); else - DicConsole.DebugWriteLine("CDRDAO plugin", "\tPerformer: {0}", - discimage.Performer); - if(discimage.Songwriter == null) DicConsole.DebugWriteLine("CDRDAO plugin", "\tSongwriter is not set."); + DicConsole.DebugWriteLine("CDRDAO plugin", "\tPerformer: {0}", discimage.Performer); + + if(discimage.Songwriter == null) + DicConsole.DebugWriteLine("CDRDAO plugin", "\tSongwriter is not set."); else - DicConsole.DebugWriteLine("CDRDAO plugin", "\tSongwriter: {0}", - discimage.Songwriter); - if(discimage.Title == null) DicConsole.DebugWriteLine("CDRDAO plugin", "\tTitle is not set."); - else DicConsole.DebugWriteLine("CDRDAO plugin", "\tTitle: {0}", discimage.Title); + DicConsole.DebugWriteLine("CDRDAO plugin", "\tSongwriter: {0}", discimage.Songwriter); + + if(discimage.Title == null) + DicConsole.DebugWriteLine("CDRDAO plugin", "\tTitle is not set."); + else + DicConsole.DebugWriteLine("CDRDAO plugin", "\tTitle: {0}", discimage.Title); + DicConsole.DebugWriteLine("CDRDAO plugin", "Disc information:"); DicConsole.DebugWriteLine("CDRDAO plugin", "\tGuessed disk type: {0}", discimage.Disktype); - if(discimage.Barcode == null) DicConsole.DebugWriteLine("CDRDAO plugin", "\tBarcode not set."); + + if(discimage.Barcode == null) + DicConsole.DebugWriteLine("CDRDAO plugin", "\tBarcode not set."); else - DicConsole.DebugWriteLine("CDRDAO plugin", "\tBarcode: {0}", - discimage.Barcode); - if(discimage.DiskId == null) DicConsole.DebugWriteLine("CDRDAO plugin", "\tDisc ID not set."); + DicConsole.DebugWriteLine("CDRDAO plugin", "\tBarcode: {0}", discimage.Barcode); + + if(discimage.DiskId == null) + DicConsole.DebugWriteLine("CDRDAO plugin", "\tDisc ID not set."); else - DicConsole.DebugWriteLine("CDRDAO plugin", "\tDisc ID: {0}", - discimage.DiskId); - if(discimage.Mcn == null) DicConsole.DebugWriteLine("CDRDAO plugin", "\tMCN not set."); - else DicConsole.DebugWriteLine("CDRDAO plugin", "\tMCN: {0}", discimage.Mcn); + DicConsole.DebugWriteLine("CDRDAO plugin", "\tDisc ID: {0}", discimage.DiskId); + + if(discimage.Mcn == null) + DicConsole.DebugWriteLine("CDRDAO plugin", "\tMCN not set."); + else + DicConsole.DebugWriteLine("CDRDAO plugin", "\tMCN: {0}", discimage.Mcn); + if(string.IsNullOrEmpty(discimage.Comment)) - DicConsole.DebugWriteLine("CDRDAO plugin", "\tComment not set."); - else DicConsole.DebugWriteLine("CDRDAO plugin", "\tComment: \"{0}\"", discimage.Comment); + DicConsole.DebugWriteLine("CDRDAO plugin", "\tComment not set."); + else + DicConsole.DebugWriteLine("CDRDAO plugin", "\tComment: \"{0}\"", discimage.Comment); DicConsole.DebugWriteLine("CDRDAO plugin", "Track information:"); DicConsole.DebugWriteLine("CDRDAO plugin", "\tDisc contains {0} tracks", discimage.Tracks.Count); + for(int i = 0; i < discimage.Tracks.Count; i++) { DicConsole.DebugWriteLine("CDRDAO plugin", "\tTrack {0} information:", discimage.Tracks[i].Sequence); DicConsole.DebugWriteLine("CDRDAO plugin", "\t\t{0} bytes per sector", discimage.Tracks[i].Bps); - DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tPregap: {0} sectors", discimage.Tracks[i].Pregap); + DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tPregap: {0} sectors", discimage.Tracks[i].Pregap); + DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tData: {0} sectors starting at sector {1}", discimage.Tracks[i].Sectors, discimage.Tracks[i].StartSector); + DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tPostgap: {0} sectors", discimage.Tracks[i].Postgap); if(discimage.Tracks[i].Flag_4Ch) DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tTrack is flagged as quadraphonic"); + if(discimage.Tracks[i].FlagDcp) DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tTrack allows digital copy"); + if(discimage.Tracks[i].FlagPre) DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tTrack has pre-emphasis applied"); @@ -560,32 +651,41 @@ namespace DiscImageChef.DiscImages discimage.Tracks[i].Trackfile.Offset); DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tIndexes:"); + foreach(KeyValuePair kvp in discimage.Tracks[i].Indexes) DicConsole.DebugWriteLine("CDRDAO plugin", "\t\t\tIndex {0} starts at sector {1}", kvp.Key, kvp.Value); if(discimage.Tracks[i].Isrc == null) - DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tISRC is not set."); - else DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tISRC: {0}", discimage.Tracks[i].Isrc); + DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tISRC is not set."); + else + DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tISRC: {0}", discimage.Tracks[i].Isrc); if(discimage.Tracks[i].Arranger == null) - DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tArranger is not set."); - else DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tArranger: {0}", discimage.Tracks[i].Arranger); + DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tArranger is not set."); + else + DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tArranger: {0}", discimage.Tracks[i].Arranger); + if(discimage.Tracks[i].Composer == null) - DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tComposer is not set."); - else DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tComposer: {0}", discimage.Tracks[i].Composer); + DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tComposer is not set."); + else + DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tComposer: {0}", discimage.Tracks[i].Composer); + if(discimage.Tracks[i].Performer == null) DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tPerformer is not set."); else DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tPerformer: {0}", discimage.Tracks[i].Performer); + if(discimage.Tracks[i].Songwriter == null) DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tSongwriter is not set."); else DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tSongwriter: {0}", discimage.Tracks[i].Songwriter); + if(discimage.Tracks[i].Title == null) - DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tTitle is not set."); - else DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tTitle: {0}", discimage.Tracks[i].Title); + DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tTitle is not set."); + else + DicConsole.DebugWriteLine("CDRDAO plugin", "\t\tTitle: {0}", discimage.Tracks[i].Title); } DicConsole.DebugWriteLine("CDRDAO plugin", "Building offset map"); @@ -595,24 +695,23 @@ namespace DiscImageChef.DiscImages ulong byteOffset = 0; ulong partitionSequence = 0; + for(int i = 0; i < discimage.Tracks.Count; i++) { ulong index0Len = 0; - if(discimage.Tracks[i].Sequence == 1 && i != 0) + if(discimage.Tracks[i].Sequence == 1 && + i != 0) throw new ImageNotSupportedException("Unordered tracks"); // Index 01 - Partition partition = new Partition + var partition = new Partition { - Description = $"Track {discimage.Tracks[i].Sequence}.", - Name = discimage.Tracks[i].Title, + Description = $"Track {discimage.Tracks[i].Sequence}.", Name = discimage.Tracks[i].Title, Start = discimage.Tracks[i].StartSector, Size = (discimage.Tracks[i].Sectors - index0Len) * discimage.Tracks[i].Bps, - Length = discimage.Tracks[i].Sectors - index0Len, - Sequence = partitionSequence, - Offset = byteOffset, - Type = discimage.Tracks[i].Tracktype + Length = discimage.Tracks[i].Sectors - index0Len, Sequence = partitionSequence, + Offset = byteOffset, Type = discimage.Tracks[i].Tracktype }; byteOffset += partition.Size; @@ -636,17 +735,17 @@ namespace DiscImageChef.DiscImages // Print partition map DicConsole.DebugWriteLine("CDRDAO plugin", "printing partition map"); + foreach(Partition partition in Partitions) { DicConsole.DebugWriteLine("CDRDAO plugin", "Partition sequence: {0}", partition.Sequence); - DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition name: {0}", partition.Name); - DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition description: {0}", - partition.Description); - DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition type: {0}", partition.Type); + DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition name: {0}", partition.Name); + DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition description: {0}", partition.Description); + DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition type: {0}", partition.Type); DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition starting sector: {0}", partition.Start); - DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition sectors: {0}", partition.Length); + DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition sectors: {0}", partition.Length); DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition starting offset: {0}", partition.Offset); - DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition size in bytes: {0}", partition.Size); + DicConsole.DebugWriteLine("CDRDAO plugin", "\tPartition size in bytes: {0}", partition.Size); } foreach(CdrdaoTrack track in discimage.Tracks) @@ -655,13 +754,19 @@ namespace DiscImageChef.DiscImages imageInfo.Sectors += track.Sectors; } - if(discimage.Disktype != MediaType.CDG && discimage.Disktype != MediaType.CDEG && - discimage.Disktype != MediaType.CDMIDI && discimage.Disktype != MediaType.CDROMXA && - discimage.Disktype != MediaType.CDDA && discimage.Disktype != MediaType.CDI && - discimage.Disktype != MediaType.CDPLUS) imageInfo.SectorSize = 2048; // Only data tracks - else imageInfo.SectorSize = 2352; // All others + if(discimage.Disktype != MediaType.CDG && + discimage.Disktype != MediaType.CDEG && + discimage.Disktype != MediaType.CDMIDI && + discimage.Disktype != MediaType.CDROMXA && + discimage.Disktype != MediaType.CDDA && + discimage.Disktype != MediaType.CDI && + discimage.Disktype != MediaType.CDPLUS) + imageInfo.SectorSize = 2048; // Only data tracks + else + imageInfo.SectorSize = 2352; // All others - if(discimage.Mcn != null) imageInfo.ReadableMediaTags.Add(MediaTagType.CD_MCN); + if(discimage.Mcn != null) + imageInfo.ReadableMediaTags.Add(MediaTagType.CD_MCN); imageInfo.Application = "CDRDAO"; @@ -687,6 +792,7 @@ namespace DiscImageChef.DiscImages { if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackIsrc)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackIsrc); + break; } case CDRDAO_TRACK_TYPE_MODE2: @@ -694,38 +800,51 @@ namespace DiscImageChef.DiscImages { if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader); + if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc); + break; } case CDRDAO_TRACK_TYPE_MODE2_RAW: { if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync); + if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader); + if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader); + if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc); + break; } case CDRDAO_TRACK_TYPE_MODE1_RAW: { if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync); + if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader); + if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader); + if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc); + if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP); + if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ); + if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc); + break; } } @@ -734,6 +853,7 @@ namespace DiscImageChef.DiscImages imageInfo.XmlMediaType = XmlMediaType.OpticalDisc; DicConsole.VerboseWriteLine("CDRDAO image describes a disc of type {0}", imageInfo.MediaType); + if(!string.IsNullOrEmpty(imageInfo.Comments)) DicConsole.VerboseWriteLine("CDRDAO comments: {0}", imageInfo.Comments); @@ -742,8 +862,9 @@ namespace DiscImageChef.DiscImages catch(Exception ex) { DicConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter); - DicConsole.ErrorWriteLine("Exception: {0}", ex.Message); - DicConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace); + DicConsole.ErrorWriteLine("Exception: {0}", ex.Message); + DicConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace); + return false; } } @@ -754,7 +875,8 @@ namespace DiscImageChef.DiscImages { case MediaTagType.CD_MCN: { - if(discimage.Mcn != null) return Encoding.ASCII.GetBytes(discimage.Mcn); + if(discimage.Mcn != null) + return Encoding.ASCII.GetBytes(discimage.Mcn); throw new FeatureNotPresentImageException("Image does not contain MCN information."); } @@ -774,12 +896,10 @@ namespace DiscImageChef.DiscImages public byte[] ReadSectors(ulong sectorAddress, uint length) { - foreach(KeyValuePair kvp in from kvp in offsetmap - where sectorAddress >= kvp.Value + foreach(KeyValuePair kvp in from kvp in offsetmap where sectorAddress >= kvp.Value from cdrdaoTrack in discimage.Tracks where cdrdaoTrack.Sequence == kvp.Key - where sectorAddress - kvp.Value < cdrdaoTrack.Sectors - select kvp) + where sectorAddress - kvp.Value < cdrdaoTrack.Sectors select kvp) return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key); throw new ArgumentOutOfRangeException(nameof(sectorAddress), $"Sector address {sectorAddress} not found"); @@ -787,12 +907,10 @@ namespace DiscImageChef.DiscImages public byte[] ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag) { - foreach(KeyValuePair kvp in from kvp in offsetmap - where sectorAddress >= kvp.Value + foreach(KeyValuePair kvp in from kvp in offsetmap where sectorAddress >= kvp.Value from cdrdaoTrack in discimage.Tracks where cdrdaoTrack.Sequence == kvp.Key - where sectorAddress - kvp.Value < cdrdaoTrack.Sectors - select kvp) + where sectorAddress - kvp.Value < cdrdaoTrack.Sectors select kvp) return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag); throw new ArgumentOutOfRangeException(nameof(sectorAddress), $"Sector address {sectorAddress} not found"); @@ -800,11 +918,15 @@ namespace DiscImageChef.DiscImages public byte[] ReadSectors(ulong sectorAddress, uint length, uint track) { - CdrdaoTrack dicTrack = new CdrdaoTrack {Sequence = 0}; + var dicTrack = new CdrdaoTrack + { + Sequence = 0 + }; foreach(CdrdaoTrack cdrdaoTrack in discimage.Tracks.Where(cdrdaoTrack => cdrdaoTrack.Sequence == track)) { dicTrack = cdrdaoTrack; + break; } @@ -828,6 +950,7 @@ namespace DiscImageChef.DiscImages sectorOffset = 0; sectorSize = 2048; sectorSkip = 0; + break; } case CDRDAO_TRACK_TYPE_MODE2_FORM2: @@ -835,15 +958,17 @@ namespace DiscImageChef.DiscImages sectorOffset = 0; sectorSize = 2324; sectorSkip = 0; + break; } case CDRDAO_TRACK_TYPE_MODE2: case CDRDAO_TRACK_TYPE_MODE2_MIX: { - mode2 = true; + mode2 = true; sectorOffset = 0; sectorSize = 2336; sectorSkip = 0; + break; } case CDRDAO_TRACK_TYPE_AUDIO: @@ -851,6 +976,7 @@ namespace DiscImageChef.DiscImages sectorOffset = 0; sectorSize = 2352; sectorSkip = 0; + break; } case CDRDAO_TRACK_TYPE_MODE1_RAW: @@ -858,45 +984,52 @@ namespace DiscImageChef.DiscImages sectorOffset = 16; sectorSize = 2048; sectorSkip = 288; + break; } case CDRDAO_TRACK_TYPE_MODE2_RAW: { - mode2 = true; + mode2 = true; sectorOffset = 0; sectorSize = 2352; sectorSkip = 0; + break; } default: throw new FeatureSupportedButNotImplementedImageException("Unsupported track type"); } - if(dicTrack.Subchannel) sectorSkip += 96; + if(dicTrack.Subchannel) + sectorSkip += 96; byte[] buffer = new byte[sectorSize * length]; imageStream = dicTrack.Trackfile.Datafilter.GetDataForkStream(); - BinaryReader br = new BinaryReader(imageStream); - br.BaseStream - .Seek((long)dicTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + var br = new BinaryReader(imageStream); + + br.BaseStream. + Seek((long)dicTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); + if(mode2) { var mode2Ms = new MemoryStream((int)(sectorSize * length)); - buffer = br.ReadBytes((int)(sectorSize * length)); + buffer = br.ReadBytes((int)((sectorSize + sectorSkip) * length)); for(int i = 0; i < length; i++) { byte[] sector = new byte[sectorSize]; - Array.Copy(buffer, sectorSize * i, sector, 0, sectorSize); + Array.Copy(buffer, (sectorSize + sectorSkip) * i, sector, 0, sectorSize); sector = Sector.GetUserDataFromMode2(sector); mode2Ms.Write(sector, 0, sector.Length); } buffer = mode2Ms.ToArray(); } -else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes((int)(sectorSize * length)); + else if(sectorOffset == 0 && + sectorSkip == 0) + buffer = br.ReadBytes((int)(sectorSize * length)); else for(int i = 0; i < length; i++) { @@ -907,9 +1040,11 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( } // cdrdao audio tracks are endian swapped corresponding to DiscImageChef - if(dicTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO) return buffer; + if(dicTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO) + return buffer; byte[] swapped = new byte[buffer.Length]; + for(long i = 0; i < buffer.Length; i += 2) { swapped[i] = buffer[i + 1]; @@ -921,11 +1056,15 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( public byte[] ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag) { - CdrdaoTrack dicTrack = new CdrdaoTrack {Sequence = 0}; + var dicTrack = new CdrdaoTrack + { + Sequence = 0 + }; foreach(CdrdaoTrack cdrdaoTrack in discimage.Tracks.Where(cdrdaoTrack => cdrdaoTrack.Sequence == track)) { dicTrack = cdrdaoTrack; + break; } @@ -940,7 +1079,8 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( uint sectorSize; uint sectorSkip = 0; - if(!dicTrack.Subchannel && tag == SectorTagType.CdSectorSubchannel) + if(!dicTrack.Subchannel && + tag == SectorTagType.CdSectorSubchannel) throw new ArgumentException("No tags in image for requested track", nameof(tag)); switch(tag) @@ -957,18 +1097,26 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( { CdFlags flags = 0; - if(dicTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO) flags |= CdFlags.DataTrack; + if(dicTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO) + flags |= CdFlags.DataTrack; - if(dicTrack.FlagDcp) flags |= CdFlags.CopyPermitted; + if(dicTrack.FlagDcp) + flags |= CdFlags.CopyPermitted; - if(dicTrack.FlagPre) flags |= CdFlags.PreEmphasis; + if(dicTrack.FlagPre) + flags |= CdFlags.PreEmphasis; - if(dicTrack.Flag_4Ch) flags |= CdFlags.FourChannel; + if(dicTrack.Flag_4Ch) + flags |= CdFlags.FourChannel; - return new[] {(byte)flags}; + return new[] + { + (byte)flags + }; } case SectorTagType.CdTrackIsrc: - if(dicTrack.Isrc == null) return null; + if(dicTrack.Isrc == null) + return null; return Encoding.UTF8.GetBytes(dicTrack.Isrc); default: throw new ArgumentException("Unsupported tag requested", nameof(tag)); @@ -983,6 +1131,7 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( sectorOffset = 2048; sectorSize = 96; + break; case CDRDAO_TRACK_TYPE_MODE2_FORM2: case CDRDAO_TRACK_TYPE_MODE2_MIX: @@ -991,6 +1140,7 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( sectorOffset = 2336; sectorSize = 96; + break; case CDRDAO_TRACK_TYPE_AUDIO: if(tag != SectorTagType.CdSectorSubchannel) @@ -998,6 +1148,7 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( sectorOffset = 2352; sectorSize = 96; + break; case CDRDAO_TRACK_TYPE_MODE1_RAW: { @@ -1008,6 +1159,7 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( sectorOffset = 0; sectorSize = 12; sectorSkip = 2340; + break; } case SectorTagType.CdSectorHeader: @@ -1015,12 +1167,14 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( sectorOffset = 12; sectorSize = 4; sectorSkip = 2336; + break; } case SectorTagType.CdSectorSubchannel: { sectorOffset = 2352; sectorSize = 96; + break; } case SectorTagType.CdSectorSubHeader: @@ -1030,6 +1184,7 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( sectorOffset = 2076; sectorSize = 276; sectorSkip = 0; + break; } case SectorTagType.CdSectorEccP: @@ -1037,6 +1192,7 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( sectorOffset = 2076; sectorSize = 172; sectorSkip = 104; + break; } case SectorTagType.CdSectorEccQ: @@ -1044,6 +1200,7 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( sectorOffset = 2248; sectorSize = 104; sectorSkip = 0; + break; } case SectorTagType.CdSectorEdc: @@ -1051,6 +1208,7 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( sectorOffset = 2064; sectorSize = 4; sectorSkip = 284; + break; } default: throw new ArgumentException("Unsupported tag requested", nameof(tag)); @@ -1064,6 +1222,7 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( sectorOffset = 2352; sectorSize = 96; + break; default: throw new FeatureSupportedButNotImplementedImageException("Unsupported track type"); } @@ -1071,11 +1230,15 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( byte[] buffer = new byte[sectorSize * length]; imageStream = dicTrack.Trackfile.Datafilter.GetDataForkStream(); - BinaryReader br = new BinaryReader(imageStream); - br.BaseStream - .Seek((long)dicTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + var br = new BinaryReader(imageStream); + + br.BaseStream. + Seek((long)dicTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); - if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes((int)(sectorSize * length)); + + if(sectorOffset == 0 && + sectorSkip == 0) + buffer = br.ReadBytes((int)(sectorSize * length)); else for(int i = 0; i < length; i++) { @@ -1094,12 +1257,10 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( public byte[] ReadSectorsLong(ulong sectorAddress, uint length) { - foreach(KeyValuePair kvp in from kvp in offsetmap - where sectorAddress >= kvp.Value + foreach(KeyValuePair kvp in from kvp in offsetmap where sectorAddress >= kvp.Value from cdrdaoTrack in discimage.Tracks where cdrdaoTrack.Sequence == kvp.Key - where sectorAddress - kvp.Value < cdrdaoTrack.Sectors - select kvp) + where sectorAddress - kvp.Value < cdrdaoTrack.Sectors select kvp) return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key); throw new ArgumentOutOfRangeException(nameof(sectorAddress), "Sector address not found"); @@ -1107,11 +1268,15 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( public byte[] ReadSectorsLong(ulong sectorAddress, uint length, uint track) { - CdrdaoTrack dicTrack = new CdrdaoTrack {Sequence = 0}; + var dicTrack = new CdrdaoTrack + { + Sequence = 0 + }; foreach(CdrdaoTrack cdrdaoTrack in discimage.Tracks.Where(cdrdaoTrack => cdrdaoTrack.Sequence == track)) { dicTrack = cdrdaoTrack; + break; } @@ -1134,6 +1299,7 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( sectorOffset = 0; sectorSize = 2048; sectorSkip = 0; + break; } case CDRDAO_TRACK_TYPE_MODE2_FORM2: @@ -1141,6 +1307,7 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( sectorOffset = 0; sectorSize = 2324; sectorSkip = 0; + break; } case CDRDAO_TRACK_TYPE_MODE2: @@ -1149,6 +1316,7 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( sectorOffset = 0; sectorSize = 2336; sectorSkip = 0; + break; } case CDRDAO_TRACK_TYPE_MODE1_RAW: @@ -1158,23 +1326,27 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( sectorOffset = 0; sectorSize = 2352; sectorSkip = 0; + break; } default: throw new FeatureSupportedButNotImplementedImageException("Unsupported track type"); } - if(dicTrack.Subchannel) sectorSkip += 96; + if(dicTrack.Subchannel) + sectorSkip += 96; byte[] buffer = new byte[sectorSize * length]; imageStream = dicTrack.Trackfile.Datafilter.GetDataForkStream(); - BinaryReader br = new BinaryReader(imageStream); + var br = new BinaryReader(imageStream); - br.BaseStream - .Seek((long)dicTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), + br.BaseStream. + Seek((long)dicTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin); - if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes((int)(sectorSize * length)); + if(sectorOffset == 0 && + sectorSkip == 0) + buffer = br.ReadBytes((int)(sectorSize * length)); else for(int i = 0; i < length; i++) { @@ -1186,9 +1358,11 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( } // cdrdao audio tracks are endian swapped corresponding to DiscImageChef - if(dicTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO) return buffer; + if(dicTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO) + return buffer; byte[] swapped = new byte[buffer.Length]; + for(long i = 0; i < buffer.Length; i += 2) { swapped[i] = buffer[i + 1]; @@ -1202,7 +1376,8 @@ else if(sectorOffset == 0 && sectorSkip == 0) buffer = br.ReadBytes(( public List GetSessionTracks(ushort session) { - if(session == 1) return Tracks; + if(session == 1) + return Tracks; throw new ImageNotSupportedException("Session does not exist in disc image"); } diff --git a/DiscImageChef.DiscImages/DiscJuggler/Read.cs b/DiscImageChef.DiscImages/DiscJuggler/Read.cs index 5658837ff..31b90f85d 100644 --- a/DiscImageChef.DiscImages/DiscJuggler/Read.cs +++ b/DiscImageChef.DiscImages/DiscJuggler/Read.cs @@ -304,8 +304,7 @@ namespace DiscImageChef.DiscImages track.TrackSubchannelOffset = currentOffset; track.TrackSubchannelType = TrackSubchannelType.Q16Interleaved; - currentOffset += - trackLen * (ulong)(track.TrackRawBytesPerSector + 16); + currentOffset += trackLen * (ulong)(track.TrackRawBytesPerSector + 16); break; case 4: @@ -317,8 +316,7 @@ namespace DiscImageChef.DiscImages track.TrackSubchannelOffset = currentOffset; track.TrackSubchannelType = TrackSubchannelType.RawInterleaved; - currentOffset += - trackLen * (ulong)(track.TrackRawBytesPerSector + 96); + currentOffset += trackLen * (ulong)(track.TrackRawBytesPerSector + 96); break; default: throw new ImageNotSupportedException($"Unknown read mode {readMode}"); @@ -383,8 +381,7 @@ namespace DiscImageChef.DiscImages track.TrackSubchannelOffset = currentOffset; track.TrackSubchannelType = TrackSubchannelType.Q16Interleaved; - currentOffset += - trackLen * (ulong)(track.TrackRawBytesPerSector + 16); + currentOffset += trackLen * (ulong)(track.TrackRawBytesPerSector + 16); if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync); @@ -416,8 +413,7 @@ namespace DiscImageChef.DiscImages track.TrackSubchannelOffset = currentOffset; track.TrackSubchannelType = TrackSubchannelType.RawInterleaved; - currentOffset += - trackLen * (ulong)(track.TrackRawBytesPerSector + 96); + currentOffset += trackLen * (ulong)(track.TrackRawBytesPerSector + 96); if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync); @@ -488,8 +484,7 @@ namespace DiscImageChef.DiscImages track.TrackSubchannelOffset = currentOffset; track.TrackSubchannelType = TrackSubchannelType.Q16Interleaved; - currentOffset += - trackLen * (ulong)(track.TrackRawBytesPerSector + 16); + currentOffset += trackLen * (ulong)(track.TrackRawBytesPerSector + 16); if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync); @@ -509,8 +504,7 @@ namespace DiscImageChef.DiscImages track.TrackSubchannelOffset = currentOffset; track.TrackSubchannelType = TrackSubchannelType.RawInterleaved; - currentOffset += - trackLen * (ulong)(track.TrackRawBytesPerSector + 96); + currentOffset += trackLen * (ulong)(track.TrackRawBytesPerSector + 96); if(!imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync)) imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync); @@ -821,14 +815,14 @@ namespace DiscImageChef.DiscImages if(mode2) { - var mode2Ms = new MemoryStream((int)(sectorSize * length)); + var mode2Ms = new MemoryStream((int)((sectorSize + sectorSkip) * length)); imageStream.Read(buffer, 0, buffer.Length); for(int i = 0; i < length; i++) { byte[] sector = new byte[sectorSize]; - Array.Copy(buffer, sectorSize * i, sector, 0, sectorSize); + Array.Copy(buffer, (sectorSize + sectorSkip) * i, sector, 0, sectorSize); sector = Sector.GetUserDataFromMode2(sector); mode2Ms.Write(sector, 0, sector.Length); }