diff --git a/DiscImageChef.Core/Devices/Dumping/XGD.cs b/DiscImageChef.Core/Devices/Dumping/XGD.cs index dd4569da1..f181ff86a 100644 --- a/DiscImageChef.Core/Devices/Dumping/XGD.cs +++ b/DiscImageChef.Core/Devices/Dumping/XGD.cs @@ -53,14 +53,10 @@ using TrackType = DiscImageChef.CommonTypes.Enums.TrackType; namespace DiscImageChef.Core.Devices.Dumping { - /// - /// Implements dumping an Xbox Game Disc using a Kreon drive - /// + /// Implements dumping an Xbox Game Disc using a Kreon drive partial class Dump { - /// - /// Dumps an Xbox Game Disc using a Kreon drive - /// + /// Dumps an Xbox Game Disc using a Kreon drive /// Media tags as retrieved in MMC layer /// Disc type as detected in MMC layer internal void Xgd(Dictionary mediaTags, ref MediaType dskType) @@ -75,26 +71,33 @@ namespace DiscImageChef.Core.Devices.Dumping double maxSpeed = double.MinValue; double minSpeed = double.MaxValue; - if(mediaTags.ContainsKey(MediaTagType.DVD_PFI)) mediaTags.Remove(MediaTagType.DVD_PFI); - if(mediaTags.ContainsKey(MediaTagType.DVD_DMI)) mediaTags.Remove(MediaTagType.DVD_DMI); + if(mediaTags.ContainsKey(MediaTagType.DVD_PFI)) + mediaTags.Remove(MediaTagType.DVD_PFI); + + if(mediaTags.ContainsKey(MediaTagType.DVD_DMI)) + mediaTags.Remove(MediaTagType.DVD_DMI); UpdateStatus?.Invoke("Reading Xbox Security Sector."); dumpLog.WriteLine("Reading Xbox Security Sector."); sense = dev.KreonExtractSs(out byte[] ssBuf, out byte[] senseBuf, dev.Timeout, out _); + if(sense) { dumpLog.WriteLine("Cannot get Xbox Security Sector, not continuing."); StoppingErrorMessage?.Invoke("Cannot get Xbox Security Sector, not continuing."); + return; } dumpLog.WriteLine("Decoding Xbox Security Sector."); UpdateStatus?.Invoke("Decoding Xbox Security Sector."); SS.SecuritySector? xboxSs = SS.Decode(ssBuf); + if(!xboxSs.HasValue) { dumpLog.WriteLine("Cannot decode Xbox Security Sector, not continuing."); StoppingErrorMessage?.Invoke("Cannot decode Xbox Security Sector, not continuing."); + return; } @@ -107,33 +110,41 @@ namespace DiscImageChef.Core.Devices.Dumping UpdateStatus?.Invoke("Locking drive."); dumpLog.WriteLine("Locking drive."); sense = dev.KreonLock(out senseBuf, dev.Timeout, out _); + if(sense) { dumpLog.WriteLine("Cannot lock drive, not continuing."); StoppingErrorMessage?.Invoke("Cannot lock drive, not continuing."); + return; } UpdateStatus?.Invoke("Getting video partition size."); dumpLog.WriteLine("Getting video partition size."); sense = dev.ReadCapacity(out byte[] readBuffer, out senseBuf, dev.Timeout, out _); + if(sense) { dumpLog.WriteLine("Cannot get disc capacity."); StoppingErrorMessage?.Invoke("Cannot get disc capacity."); + return; } ulong totalSize = (ulong)((readBuffer[0] << 24) + (readBuffer[1] << 16) + (readBuffer[2] << 8) + readBuffer[3]); + UpdateStatus?.Invoke("Reading Physical Format Information."); dumpLog.WriteLine("Reading Physical Format Information."); + sense = dev.ReadDiscStructure(out readBuffer, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.PhysicalInformation, 0, 0, out _); + if(sense) { dumpLog.WriteLine("Cannot get PFI."); StoppingErrorMessage?.Invoke("Cannot get PFI."); + return; } @@ -141,17 +152,22 @@ namespace DiscImageChef.Core.Devices.Dumping Array.Copy(readBuffer, 4, tmpBuf, 0, readBuffer.Length - 4); mediaTags.Add(MediaTagType.DVD_PFI, tmpBuf); DicConsole.DebugWriteLine("Dump-media command", "Video partition total size: {0} sectors", totalSize); + ulong l0Video = PFI.Decode(readBuffer).Value.Layer0EndPSN - PFI.Decode(readBuffer).Value.DataAreaStartPSN + 1; + ulong l1Video = totalSize - l0Video + 1; UpdateStatus?.Invoke("Reading Disc Manufacturing Information."); dumpLog.WriteLine("Reading Disc Manufacturing Information."); + sense = dev.ReadDiscStructure(out readBuffer, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.DiscManufacturingInformation, 0, 0, out _); + if(sense) { dumpLog.WriteLine("Cannot get DMI."); StoppingErrorMessage?.Invoke("Cannot get DMI."); + return; } @@ -164,25 +180,30 @@ namespace DiscImageChef.Core.Devices.Dumping UpdateStatus?.Invoke("Unlocking drive (Xtreme)."); dumpLog.WriteLine("Unlocking drive (Xtreme)."); sense = dev.KreonUnlockXtreme(out senseBuf, dev.Timeout, out _); + if(sense) { dumpLog.WriteLine("Cannot unlock drive, not continuing."); StoppingErrorMessage?.Invoke("Cannot unlock drive, not continuing."); + return; } UpdateStatus?.Invoke("Getting game partition size."); dumpLog.WriteLine("Getting game partition size."); sense = dev.ReadCapacity(out readBuffer, out senseBuf, dev.Timeout, out _); + if(sense) { dumpLog.WriteLine("Cannot get disc capacity."); StoppingErrorMessage?.Invoke("Cannot get disc capacity."); + return; } ulong gameSize = (ulong)((readBuffer[0] << 24) + (readBuffer[1] << 16) + (readBuffer[2] << 8) + readBuffer[3]) + 1; + DicConsole.DebugWriteLine("Dump-media command", "Game partition total size: {0} sectors", gameSize); // Get middle zone size @@ -190,41 +211,52 @@ namespace DiscImageChef.Core.Devices.Dumping UpdateStatus?.Invoke("Unlocking drive (Wxripper)."); dumpLog.WriteLine("Unlocking drive (Wxripper)."); sense = dev.KreonUnlockWxripper(out senseBuf, dev.Timeout, out _); + if(sense) { dumpLog.WriteLine("Cannot unlock drive, not continuing."); StoppingErrorMessage?.Invoke("Cannot unlock drive, not continuing."); + return; } UpdateStatus?.Invoke("Getting disc size."); dumpLog.WriteLine("Getting disc size."); sense = dev.ReadCapacity(out readBuffer, out senseBuf, dev.Timeout, out _); + if(sense) { dumpLog.WriteLine("Cannot get disc capacity."); StoppingErrorMessage?.Invoke("Cannot get disc capacity."); + return; } totalSize = (ulong)((readBuffer[0] << 24) + (readBuffer[1] << 16) + (readBuffer[2] << 8) + readBuffer[3]); UpdateStatus?.Invoke("Reading Physical Format Information."); dumpLog.WriteLine("Reading Physical Format Information."); + sense = dev.ReadDiscStructure(out readBuffer, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.PhysicalInformation, 0, 0, out _); + if(sense) { dumpLog.WriteLine("Cannot get PFI."); StoppingErrorMessage?.Invoke("Cannot get PFI."); + return; } DicConsole.DebugWriteLine("Dump-media command", "Unlocked total size: {0} sectors", totalSize); - ulong blocks = totalSize + 1; - ulong middleZone = - totalSize - (PFI.Decode(readBuffer).Value.Layer0EndPSN - - PFI.Decode(readBuffer).Value.DataAreaStartPSN + - 1) - gameSize + 1; + ulong blocks = totalSize + 1; + PFI.PhysicalFormatInformation wxRipperPfi = PFI.Decode(readBuffer).Value; + + UpdateStatus?.Invoke($"WxRipper PFI's Data Area Start PSN: {wxRipperPfi.DataAreaStartPSN} sectors"); + UpdateStatus?.Invoke($"WxRipper PFI's Layer 0 End PSN: {wxRipperPfi.Layer0EndPSN} sectors"); + dumpLog.WriteLine($"WxRipper PFI's Data Area Start PSN: {wxRipperPfi.DataAreaStartPSN} sectors"); + dumpLog.WriteLine($"WxRipper PFI's Layer 0 End PSN: {wxRipperPfi.Layer0EndPSN} sectors"); + + ulong middleZone = totalSize - (wxRipperPfi.Layer0EndPSN - wxRipperPfi.DataAreaStartPSN + 1) - gameSize + 1; tmpBuf = new byte[readBuffer.Length - 4]; Array.Copy(readBuffer, 4, tmpBuf, 0, readBuffer.Length - 4); @@ -232,12 +264,15 @@ namespace DiscImageChef.Core.Devices.Dumping UpdateStatus?.Invoke("Reading Disc Manufacturing Information."); dumpLog.WriteLine("Reading Disc Manufacturing Information."); + sense = dev.ReadDiscStructure(out readBuffer, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.DiscManufacturingInformation, 0, 0, out _); + if(sense) { dumpLog.WriteLine("Cannot get DMI."); StoppingErrorMessage?.Invoke("Cannot get DMI."); + return; } @@ -259,16 +294,18 @@ namespace DiscImageChef.Core.Devices.Dumping dumpLog.WriteLine("Video layer 0 size: {0} sectors", l0Video); dumpLog.WriteLine("Video layer 1 size: {0} sectors", l1Video); dumpLog.WriteLine("Middle zone 0 size: {0} sectors", middleZone); - dumpLog.WriteLine("Game data 0 size: {0} sectors", gameSize); - dumpLog.WriteLine("Total 0 size: {0} sectors", totalSize); - dumpLog.WriteLine("Real layer break: {0}", layerBreak); + dumpLog.WriteLine("Game data 0 size: {0} sectors", gameSize); + dumpLog.WriteLine("Total 0 size: {0} sectors", totalSize); + dumpLog.WriteLine("Real layer break: {0}", layerBreak); bool read12 = !dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false, 0, BLOCK_SIZE, 0, 1, false, dev.Timeout, out _); + if(!read12) { dumpLog.WriteLine("Cannot read medium, aborting scan..."); StoppingErrorMessage?.Invoke("Cannot read medium, aborting scan..."); + return; } @@ -281,26 +318,33 @@ namespace DiscImageChef.Core.Devices.Dumping { sense = dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, 0, BLOCK_SIZE, 0, blocksToRead, false, dev.Timeout, out _); - if(sense || dev.Error) blocksToRead /= 2; + + if(sense || dev.Error) + blocksToRead /= 2; } - if(!dev.Error || blocksToRead == 1) break; + if(!dev.Error || + blocksToRead == 1) + break; } if(dev.Error) { dumpLog.WriteLine("Device error {0} trying to guess ideal transfer length.", dev.LastError); StoppingErrorMessage?.Invoke($"Device error {dev.LastError} trying to guess ideal transfer length."); + return; } - if(skip < blocksToRead) skip = blocksToRead; + if(skip < blocksToRead) + skip = blocksToRead; bool ret = true; foreach(MediaTagType tag in mediaTags.Keys) { - if(outputPlugin.SupportedMediaTags.Contains(tag)) continue; + if(outputPlugin.SupportedMediaTags.Contains(tag)) + continue; ret = false; dumpLog.WriteLine($"Output format does not support {tag}."); @@ -318,6 +362,7 @@ namespace DiscImageChef.Core.Devices.Dumping { dumpLog.WriteLine("Several media tags not supported, not continuing..."); StoppingErrorMessage?.Invoke("Several media tags not supported, not continuing..."); + return; } } @@ -325,8 +370,8 @@ namespace DiscImageChef.Core.Devices.Dumping dumpLog.WriteLine("Reading {0} sectors at a time.", blocksToRead); UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time."); - MhddLog mhddLog = new MhddLog(outputPrefix + ".mhddlog.bin", dev, blocks, BLOCK_SIZE, blocksToRead); - IbgLog ibgLog = new IbgLog(outputPrefix + ".ibg", 0x0010); + var mhddLog = new MhddLog(outputPrefix + ".mhddlog.bin", dev, blocks, BLOCK_SIZE, blocksToRead); + var ibgLog = new IbgLog(outputPrefix + ".ibg", 0x0010); ret = outputPlugin.Create(outputPath, dskType, formatOptions, blocks, BLOCK_SIZE); // Cannot create image @@ -334,8 +379,10 @@ namespace DiscImageChef.Core.Devices.Dumping { dumpLog.WriteLine("Error creating output image, not continuing."); dumpLog.WriteLine(outputPlugin.ErrorMessage); + StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine + outputPlugin.ErrorMessage); + return; } @@ -346,27 +393,26 @@ namespace DiscImageChef.Core.Devices.Dumping uint saveBlocksToRead = blocksToRead; DumpHardwareType currentTry = null; ExtentsULong extents = null; + ResumeSupport.Process(true, true, totalSize, dev.Manufacturer, dev.Model, dev.Serial, dev.PlatformId, ref resume, ref currentTry, ref extents); - if(currentTry == null || extents == null) + + if(currentTry == null || + extents == null) StoppingErrorMessage?.Invoke("Could not process resume file, not continuing..."); (outputPlugin as IWritableOpticalImage).SetTracks(new List { new Track { - TrackBytesPerSector = (int)BLOCK_SIZE, - TrackEndSector = blocks - 1, - TrackSequence = 1, - TrackRawBytesPerSector = (int)BLOCK_SIZE, - TrackSubchannelType = - TrackSubchannelType.None, - TrackSession = 1, - TrackType = TrackType.Data + TrackBytesPerSector = (int)BLOCK_SIZE, TrackEndSector = blocks - 1, TrackSequence = 1, + TrackRawBytesPerSector = (int)BLOCK_SIZE, TrackSubchannelType = TrackSubchannelType.None, + TrackSession = 1, TrackType = TrackType.Data } }); ulong currentSector = resume.NextBlock; + if(resume.NextBlock > 0) { UpdateStatus?.Invoke($"Resuming from block {resume.NextBlock}."); @@ -380,6 +426,7 @@ namespace DiscImageChef.Core.Devices.Dumping DateTime timeSpeedStart = DateTime.UtcNow; ulong sectorSpeedStart = 0; InitProgress?.Invoke(); + for(int e = 0; e <= 16; e++) { if(aborted) @@ -388,12 +435,15 @@ namespace DiscImageChef.Core.Devices.Dumping currentTry.Extents = ExtentsConverter.ToMetadata(extents); UpdateStatus?.Invoke("Aborted!"); dumpLog.WriteLine("Aborted!"); + break; } - if(currentSector >= blocks) break; + if(currentSector >= blocks) + break; ulong extentStart, extentEnd; + // Extents if(e < 16) { @@ -402,12 +452,14 @@ namespace DiscImageChef.Core.Devices.Dumping else extentStart = (xboxSs.Value.Layer0EndPSN + 1) * 2 - ((xboxSs.Value.Extents[e].StartPSN ^ 0xFFFFFF) + 1) - 0x30000; + if(xboxSs.Value.Extents[e].EndPSN <= xboxSs.Value.Layer0EndPSN) extentEnd = xboxSs.Value.Extents[e].EndPSN - 0x30000; else extentEnd = (xboxSs.Value.Layer0EndPSN + 1) * 2 - ((xboxSs.Value.Extents[e].EndPSN ^ 0xFFFFFF) + 1) - 0x30000; } + // After last extent else { @@ -415,7 +467,8 @@ namespace DiscImageChef.Core.Devices.Dumping extentEnd = blocks; } - if(currentSector > extentEnd) continue; + if(currentSector > extentEnd) + continue; for(ulong i = currentSector; i < extentStart; i += blocksToRead) { @@ -426,14 +479,21 @@ namespace DiscImageChef.Core.Devices.Dumping currentTry.Extents = ExtentsConverter.ToMetadata(extents); UpdateStatus?.Invoke("Aborted!"); dumpLog.WriteLine("Aborted!"); + break; } - if(extentStart - i < blocksToRead) blocksToRead = (uint)(extentStart - i); + if(extentStart - i < blocksToRead) + blocksToRead = (uint)(extentStart - i); #pragma warning disable RECS0018 // Comparison of floating point numbers with equality operator - if(currentSpeed > maxSpeed && currentSpeed != 0) maxSpeed = currentSpeed; - if(currentSpeed < minSpeed && currentSpeed != 0) minSpeed = currentSpeed; + if(currentSpeed > maxSpeed && + currentSpeed != 0) + maxSpeed = currentSpeed; + + if(currentSpeed < minSpeed && + currentSpeed != 0) + minSpeed = currentSpeed; #pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator UpdateProgress?.Invoke($"Reading sector {i} of {totalSize} ({currentSpeed:F3} MiB/sec.)", (long)i, @@ -441,9 +501,11 @@ namespace DiscImageChef.Core.Devices.Dumping sense = dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, (uint)i, BLOCK_SIZE, 0, blocksToRead, false, dev.Timeout, out cmdDuration); + totalDuration += cmdDuration; - if(!sense && !dev.Error) + if(!sense && + !dev.Error) { mhddLog.Write(i, cmdDuration); ibgLog.Write(i, currentSpeed * 1024); @@ -455,16 +517,19 @@ namespace DiscImageChef.Core.Devices.Dumping else { // TODO: Reset device after X errors - if(stopOnError) return; // TODO: Return more cleanly + if(stopOnError) + return; // TODO: Return more cleanly - if(i + skip > blocks) skip = (uint)(blocks - i); + if(i + skip > blocks) + skip = (uint)(blocks - i); // Write empty data DateTime writeStart = DateTime.Now; outputPlugin.WriteSectors(new byte[BLOCK_SIZE * skip], i, skip); imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds; - for(ulong b = i; b < i + skip; b++) resume.BadBlocks.Add(b); + for(ulong b = i; b < i + skip; b++) + resume.BadBlocks.Add(b); DicConsole.DebugWriteLine("Dump-Media", "READ error:\n{0}", Sense.PrettifySense(senseBuf)); mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration); @@ -473,10 +538,15 @@ namespace DiscImageChef.Core.Devices.Dumping dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", skip, i); i += skip - blocksToRead; - string[] senseLines = Sense.PrettifySense(senseBuf).Split(new[] {Environment.NewLine}, - StringSplitOptions - .RemoveEmptyEntries); - foreach(string senseLine in senseLines) dumpLog.WriteLine(senseLine); + + string[] senseLines = Sense.PrettifySense(senseBuf).Split(new[] + { + Environment.NewLine + }, StringSplitOptions.RemoveEmptyEntries); + + foreach(string senseLine in senseLines) + dumpLog.WriteLine(senseLine); + newTrim = true; } @@ -486,7 +556,9 @@ namespace DiscImageChef.Core.Devices.Dumping sectorSpeedStart += blocksToRead; double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds; - if(elapsed < 1) continue; + + if(elapsed < 1) + continue; currentSpeed = sectorSpeedStart * BLOCK_SIZE / (1048576 * elapsed); sectorSpeedStart = 0; @@ -496,18 +568,22 @@ namespace DiscImageChef.Core.Devices.Dumping for(ulong i = extentStart; i <= extentEnd; i += blocksToRead) { saveBlocksToRead = blocksToRead; + if(aborted) { currentTry.Extents = ExtentsConverter.ToMetadata(extents); UpdateStatus?.Invoke("Aborted!"); dumpLog.WriteLine("Aborted!"); + break; } - if(extentEnd - i < blocksToRead) blocksToRead = (uint)(extentEnd - i) + 1; + if(extentEnd - i < blocksToRead) + blocksToRead = (uint)(extentEnd - i) + 1; mhddLog.Write(i, cmdDuration); ibgLog.Write(i, currentSpeed * 1024); + // Write empty data DateTime writeStart = DateTime.Now; outputPlugin.WriteSectors(new byte[BLOCK_SIZE * blocksToRead], i, blocksToRead); @@ -518,7 +594,8 @@ namespace DiscImageChef.Core.Devices.Dumping resume.NextBlock = currentSector; } - if(!aborted) currentSector = extentEnd + 1; + if(!aborted) + currentSector = extentEnd + 1; } EndProgress?.Invoke(); @@ -527,6 +604,7 @@ namespace DiscImageChef.Core.Devices.Dumping UpdateStatus?.Invoke("Writing Middle Zone D (empty)."); dumpLog.WriteLine("Writing Middle Zone D (empty)."); InitProgress?.Invoke(); + for(ulong middle = currentSector - blocks - 1; middle < middleZone - 1; middle += blocksToRead) { if(aborted) @@ -534,17 +612,20 @@ namespace DiscImageChef.Core.Devices.Dumping currentTry.Extents = ExtentsConverter.ToMetadata(extents); UpdateStatus?.Invoke("Aborted!"); dumpLog.WriteLine("Aborted!"); + break; } - if(middleZone - 1 - middle < blocksToRead) blocksToRead = (uint)(middleZone - 1 - middle); + if(middleZone - 1 - middle < blocksToRead) + blocksToRead = (uint)(middleZone - 1 - middle); - UpdateProgress - ?.Invoke($"Reading sector {middle + currentSector} of {totalSize} ({currentSpeed:F3} MiB/sec.)", + UpdateProgress?. + Invoke($"Reading sector {middle + currentSector} of {totalSize} ({currentSpeed:F3} MiB/sec.)", (long)(middle + currentSector), (long)totalSize); mhddLog.Write(middle + currentSector, cmdDuration); ibgLog.Write(middle + currentSector, currentSpeed * 1024); + // Write empty data DateTime writeStart = DateTime.Now; outputPlugin.WriteSectors(new byte[BLOCK_SIZE * blocksToRead], middle + currentSector, blocksToRead); @@ -562,17 +643,21 @@ namespace DiscImageChef.Core.Devices.Dumping UpdateStatus?.Invoke("Locking drive."); dumpLog.WriteLine("Locking drive."); sense = dev.KreonLock(out senseBuf, dev.Timeout, out _); + if(sense) { dumpLog.WriteLine("Cannot lock drive, not continuing."); StoppingErrorMessage?.Invoke("Cannot lock drive, not continuing."); + return; } sense = dev.ReadCapacity(out readBuffer, out senseBuf, dev.Timeout, out _); + if(sense) { StoppingErrorMessage?.Invoke("Cannot get disc capacity."); + return; } @@ -580,6 +665,7 @@ namespace DiscImageChef.Core.Devices.Dumping dumpLog.WriteLine("Reading Video Layer 1."); UpdateStatus?.Invoke("Reading Video Layer 1."); InitProgress?.Invoke(); + for(ulong l1 = currentSector - blocks - middleZone + l0Video; l1 < l0Video + l1Video; l1 += blocksToRead) { if(aborted) @@ -587,14 +673,21 @@ namespace DiscImageChef.Core.Devices.Dumping currentTry.Extents = ExtentsConverter.ToMetadata(extents); UpdateStatus?.Invoke("Aborted!"); dumpLog.WriteLine("Aborted!"); + break; } - if(l0Video + l1Video - l1 < blocksToRead) blocksToRead = (uint)(l0Video + l1Video - l1); + if(l0Video + l1Video - l1 < blocksToRead) + blocksToRead = (uint)(l0Video + l1Video - l1); #pragma warning disable RECS0018 // Comparison of floating point numbers with equality operator - if(currentSpeed > maxSpeed && currentSpeed != 0) maxSpeed = currentSpeed; - if(currentSpeed < minSpeed && currentSpeed != 0) minSpeed = currentSpeed; + if(currentSpeed > maxSpeed && + currentSpeed != 0) + maxSpeed = currentSpeed; + + if(currentSpeed < minSpeed && + currentSpeed != 0) + minSpeed = currentSpeed; #pragma warning restore RECS0018 // Comparison of floating point numbers with equality operator UpdateProgress?.Invoke($"Reading sector {currentSector} of {totalSize} ({currentSpeed:F3} MiB/sec.)", @@ -602,9 +695,11 @@ namespace DiscImageChef.Core.Devices.Dumping sense = dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, (uint)l1, BLOCK_SIZE, 0, blocksToRead, false, dev.Timeout, out cmdDuration); + totalDuration += cmdDuration; - if(!sense && !dev.Error) + if(!sense && + !dev.Error) { mhddLog.Write(currentSector, cmdDuration); ibgLog.Write(currentSector, currentSpeed * 1024); @@ -616,7 +711,8 @@ namespace DiscImageChef.Core.Devices.Dumping else { // TODO: Reset device after X errors - if(stopOnError) return; // TODO: Return more cleanly + if(stopOnError) + return; // TODO: Return more cleanly // Write empty data DateTime writeStart = DateTime.Now; @@ -632,9 +728,14 @@ namespace DiscImageChef.Core.Devices.Dumping ibgLog.Write(l1, 0); dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", skip, l1); l1 += skip - blocksToRead; - string[] senseLines = Sense.PrettifySense(senseBuf).Split(new[] {Environment.NewLine}, - StringSplitOptions.RemoveEmptyEntries); - foreach(string senseLine in senseLines) dumpLog.WriteLine(senseLine); + + string[] senseLines = Sense.PrettifySense(senseBuf).Split(new[] + { + Environment.NewLine + }, StringSplitOptions.RemoveEmptyEntries); + + foreach(string senseLine in senseLines) + dumpLog.WriteLine(senseLine); } currentSector += blocksToRead; @@ -642,7 +743,9 @@ namespace DiscImageChef.Core.Devices.Dumping sectorSpeedStart += blocksToRead; double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds; - if(elapsed < 1) continue; + + if(elapsed < 1) + continue; currentSpeed = sectorSpeedStart * BLOCK_SIZE / (1048576 * elapsed); sectorSpeedStart = 0; @@ -654,39 +757,53 @@ namespace DiscImageChef.Core.Devices.Dumping UpdateStatus?.Invoke("Unlocking drive (Wxripper)."); dumpLog.WriteLine("Unlocking drive (Wxripper)."); sense = dev.KreonUnlockWxripper(out senseBuf, dev.Timeout, out _); + if(sense) { dumpLog.WriteLine("Cannot unlock drive, not continuing."); StoppingErrorMessage?.Invoke("Cannot unlock drive, not continuing."); + return; } sense = dev.ReadCapacity(out readBuffer, out senseBuf, dev.Timeout, out _); + if(sense) { StoppingErrorMessage?.Invoke("Cannot get disc capacity."); + return; } end = DateTime.UtcNow; DicConsole.WriteLine(); mhddLog.Close(); + ibgLog.Close(dev, blocks, BLOCK_SIZE, (end - start).TotalSeconds, currentSpeed * 1024, BLOCK_SIZE * (double)(blocks + 1) / 1024 / (totalDuration / 1000), devicePath); + UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds."); - UpdateStatus - ?.Invoke($"Average dump speed {(double)BLOCK_SIZE * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec."); - UpdateStatus - ?.Invoke($"Average write speed {(double)BLOCK_SIZE * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec."); + + UpdateStatus?. + Invoke($"Average dump speed {(double)BLOCK_SIZE * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec."); + + UpdateStatus?. + Invoke($"Average write speed {(double)BLOCK_SIZE * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec."); + dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds); + dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.", (double)BLOCK_SIZE * (double)(blocks + 1) / 1024 / (totalDuration / 1000)); + dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.", (double)BLOCK_SIZE * (double)(blocks + 1) / 1024 / imageWriteDuration); #region Trimming - if(resume.BadBlocks.Count > 0 && !aborted && !notrim && newTrim) + if(resume.BadBlocks.Count > 0 && + !aborted && + !notrim && + newTrim) { start = DateTime.UtcNow; UpdateStatus?.Invoke("Trimming bad sectors"); @@ -694,12 +811,14 @@ namespace DiscImageChef.Core.Devices.Dumping ulong[] tmpArray = resume.BadBlocks.ToArray(); InitProgress?.Invoke(); + foreach(ulong badSector in tmpArray) { if(aborted) { currentTry.Extents = ExtentsConverter.ToMetadata(extents); dumpLog.WriteLine("Aborted!"); + break; } @@ -707,9 +826,11 @@ namespace DiscImageChef.Core.Devices.Dumping sense = dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, (uint)badSector, BLOCK_SIZE, 0, 1, false, dev.Timeout, out cmdDuration); + totalDuration += cmdDuration; - if(sense || dev.Error) continue; + if(sense || dev.Error) + continue; resume.BadBlocks.Remove(badSector); extents.Add(badSector); @@ -724,7 +845,9 @@ namespace DiscImageChef.Core.Devices.Dumping #endregion Trimming #region Error handling - if(resume.BadBlocks.Count > 0 && !aborted && retryPasses > 0) + if(resume.BadBlocks.Count > 0 && + !aborted && + retryPasses > 0) { List tmpList = new List(); @@ -749,6 +872,7 @@ namespace DiscImageChef.Core.Devices.Dumping sense = dev.ModeSense6(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01, dev.Timeout, out _); + if(sense) { sense = dev.ModeSense10(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01, @@ -761,7 +885,8 @@ namespace DiscImageChef.Core.Devices.Dumping if(dcMode10.HasValue) foreach(Modes.ModePage modePage in dcMode10.Value.Pages) - if(modePage.Page == 0x01 && modePage.Subpage == 0x00) + if(modePage.Page == 0x01 && + modePage.Subpage == 0x00) currentModePage = modePage; } } @@ -772,55 +897,68 @@ namespace DiscImageChef.Core.Devices.Dumping if(dcMode6.HasValue) foreach(Modes.ModePage modePage in dcMode6.Value.Pages) - if(modePage.Page == 0x01 && modePage.Subpage == 0x00) + if(modePage.Page == 0x01 && + modePage.Subpage == 0x00) currentModePage = modePage; } if(currentModePage == null) { - pgMmc = new Modes.ModePage_01_MMC {PS = false, ReadRetryCount = 0x20, Parameter = 0x00}; + pgMmc = new Modes.ModePage_01_MMC + { + PS = false, ReadRetryCount = 0x20, Parameter = 0x00 + }; + currentModePage = new Modes.ModePage { Page = 0x01, Subpage = 0x00, PageResponse = Modes.EncodeModePage_01_MMC(pgMmc) }; } - pgMmc = new Modes.ModePage_01_MMC {PS = false, ReadRetryCount = 255, Parameter = 0x20}; - Modes.DecodedMode md = new Modes.DecodedMode + pgMmc = new Modes.ModePage_01_MMC { - Header = new Modes.ModeHeader(), - Pages = new[] + PS = false, ReadRetryCount = 255, Parameter = 0x20 + }; + + var md = new Modes.DecodedMode + { + Header = new Modes.ModeHeader(), Pages = new[] { new Modes.ModePage { - Page = 0x01, - Subpage = 0x00, - PageResponse = Modes.EncodeModePage_01_MMC(pgMmc) + Page = 0x01, Subpage = 0x00, PageResponse = Modes.EncodeModePage_01_MMC(pgMmc) } } }; + md6 = Modes.EncodeMode6(md, dev.ScsiType); md10 = Modes.EncodeMode10(md, dev.ScsiType); UpdateStatus?.Invoke("Sending MODE SELECT to drive (return damaged blocks)."); dumpLog.WriteLine("Sending MODE SELECT to drive (return damaged blocks)."); sense = dev.ModeSelect(md6, out senseBuf, true, false, dev.Timeout, out _); - if(sense) sense = dev.ModeSelect10(md10, out senseBuf, true, false, dev.Timeout, out _); + + if(sense) + sense = dev.ModeSelect10(md10, out senseBuf, true, false, dev.Timeout, out _); if(sense) { - UpdateStatus - ?.Invoke("Drive did not accept MODE SELECT command for persistent error reading, try another drive."); + UpdateStatus?. + Invoke("Drive did not accept MODE SELECT command for persistent error reading, try another drive."); DicConsole.DebugWriteLine("Error: {0}", Sense.PrettifySense(senseBuf)); - dumpLog.WriteLine("Drive did not accept MODE SELECT command for persistent error reading, try another drive."); + + dumpLog. + WriteLine("Drive did not accept MODE SELECT command for persistent error reading, try another drive."); } - else runningPersistent = true; + else + runningPersistent = true; } InitProgress?.Invoke(); repeatRetry: ulong[] tmpArray = resume.BadBlocks.ToArray(); + foreach(ulong badSector in tmpArray) { if(aborted) @@ -828,6 +966,7 @@ namespace DiscImageChef.Core.Devices.Dumping currentTry.Extents = ExtentsConverter.ToMetadata(extents); UpdateStatus?.Invoke("Aborted!"); dumpLog.WriteLine("Aborted!"); + break; } @@ -837,9 +976,11 @@ namespace DiscImageChef.Core.Devices.Dumping sense = dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, (uint)badSector, BLOCK_SIZE, 0, 1, false, dev.Timeout, out cmdDuration); + totalDuration += cmdDuration; - if(!sense && !dev.Error) + if(!sense && + !dev.Error) { resume.BadBlocks.Remove(badSector); extents.Add(badSector); @@ -847,31 +988,41 @@ namespace DiscImageChef.Core.Devices.Dumping UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}."); dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass); } - else if(runningPersistent) outputPlugin.WriteSector(readBuffer, badSector); + else if(runningPersistent) + outputPlugin.WriteSector(readBuffer, badSector); } - if(pass < retryPasses && !aborted && resume.BadBlocks.Count > 0) + if(pass < retryPasses && + !aborted && + resume.BadBlocks.Count > 0) { pass++; forward = !forward; resume.BadBlocks.Sort(); resume.BadBlocks.Reverse(); + goto repeatRetry; } if(runningPersistent && currentModePage.HasValue) { - Modes.DecodedMode md = new Modes.DecodedMode + var md = new Modes.DecodedMode { - Header = new Modes.ModeHeader(), Pages = new[] {currentModePage.Value} + Header = new Modes.ModeHeader(), Pages = new[] + { + currentModePage.Value + } }; + md6 = Modes.EncodeMode6(md, dev.ScsiType); md10 = Modes.EncodeMode10(md, dev.ScsiType); UpdateStatus?.Invoke("Sending MODE SELECT to drive (return device to previous status)."); dumpLog.WriteLine("Sending MODE SELECT to drive (return device to previous status)."); sense = dev.ModeSelect(md6, out senseBuf, true, false, dev.Timeout, out _); - if(sense) dev.ModeSelect10(md10, out senseBuf, true, false, dev.Timeout, out _); + + if(sense) + dev.ModeSelect10(md10, out senseBuf, true, false, dev.Timeout, out _); } EndProgress?.Invoke(); @@ -886,25 +1037,36 @@ namespace DiscImageChef.Core.Devices.Dumping if(tag.Value is null) { DicConsole.ErrorWriteLine("Error: Tag type {0} is null, skipping...", tag.Key); + continue; } ret = outputPlugin.WriteMediaTag(tag.Value, tag.Key); - if(ret || force) continue; + + if(ret || force) + continue; // Cannot write tag to image dumpLog.WriteLine($"Cannot write tag {tag.Key}."); + StoppingErrorMessage?.Invoke($"Cannot write tag {tag.Key}." + Environment.NewLine + outputPlugin.ErrorMessage); + return; } resume.BadBlocks.Sort(); - foreach(ulong bad in resume.BadBlocks) dumpLog.WriteLine("Sector {0} could not be read.", bad); + + foreach(ulong bad in resume.BadBlocks) + dumpLog.WriteLine("Sector {0} could not be read.", bad); + currentTry.Extents = ExtentsConverter.ToMetadata(extents); outputPlugin.SetDumpHardware(resume.Tries); - if(preSidecar != null) outputPlugin.SetCicmMetadata(preSidecar); + + if(preSidecar != null) + outputPlugin.SetCicmMetadata(preSidecar); + dumpLog.WriteLine("Closing output file."); UpdateStatus?.Invoke("Closing output file."); DateTime closeStart = DateTime.Now; @@ -917,20 +1079,24 @@ namespace DiscImageChef.Core.Devices.Dumping { UpdateStatus?.Invoke("Aborted!"); dumpLog.WriteLine("Aborted!"); + return; } double totalChkDuration = 0; + if(!nometadata) { UpdateStatus?.Invoke("Creating sidecar."); dumpLog.WriteLine("Creating sidecar."); - FiltersList filters = new FiltersList(); + var filters = new FiltersList(); IFilter filter = filters.GetFilter(outputPath); IMediaImage inputPlugin = ImageFormat.Detect(filter); + if(!inputPlugin.Open(filter)) { StoppingErrorMessage?.Invoke("Could not open created image."); + return; } @@ -954,9 +1120,12 @@ namespace DiscImageChef.Core.Devices.Dumping totalChkDuration = (end - chkStart).TotalMilliseconds; UpdateStatus?.Invoke($"Sidecar created in {(end - chkStart).TotalSeconds} seconds."); - UpdateStatus - ?.Invoke($"Average checksum speed {(double)BLOCK_SIZE * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec."); + + UpdateStatus?. + Invoke($"Average checksum speed {(double)BLOCK_SIZE * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec."); + dumpLog.WriteLine("Sidecar created in {0} seconds.", (end - chkStart).TotalSeconds); + dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.", (double)BLOCK_SIZE * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000)); @@ -964,16 +1133,19 @@ namespace DiscImageChef.Core.Devices.Dumping AddMediaTagToSidecar(outputPath, tag, ref sidecar); List<(ulong start, string type)> filesystems = new List<(ulong start, string type)>(); + if(sidecar.OpticalDisc[0].Track != null) filesystems.AddRange(from xmlTrack in sidecar.OpticalDisc[0].Track where xmlTrack.FileSystemInformation != null from partition in xmlTrack.FileSystemInformation - where partition.FileSystems != null - from fileSystem in partition.FileSystems + where partition.FileSystems != null from fileSystem in partition.FileSystems select (partition.StartSector, fileSystem.Type)); if(filesystems.Count > 0) - foreach(var filesystem in filesystems.Select(o => new {o.start, o.type}).Distinct()) + foreach(var filesystem in filesystems.Select(o => new + { + o.start, o.type + }).Distinct()) { UpdateStatus?.Invoke($"Found filesystem {filesystem.type} at sector {filesystem.start}"); dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type, filesystem.start); @@ -983,11 +1155,18 @@ namespace DiscImageChef.Core.Devices.Dumping { type = LayersTypeType.OTP, typeSpecified = true, Sectors = new SectorsType[1] }; - sidecar.OpticalDisc[0].Layers.Sectors[0] = new SectorsType {Value = layerBreak}; - sidecar.OpticalDisc[0].Sessions = 1; - sidecar.OpticalDisc[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType); + + sidecar.OpticalDisc[0].Layers.Sectors[0] = new SectorsType + { + Value = layerBreak + }; + + sidecar.OpticalDisc[0].Sessions = 1; + sidecar.OpticalDisc[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType); + CommonTypes.Metadata.MediaType.MediaTypeToString(dskType, out string xmlDskTyp, out string xmlDskSubTyp); + sidecar.OpticalDisc[0].DiscType = xmlDskTyp; sidecar.OpticalDisc[0].DiscSubType = xmlDskSubTyp; @@ -997,18 +1176,21 @@ namespace DiscImageChef.Core.Devices.Dumping UpdateStatus?.Invoke("Writing metadata sidecar"); - FileStream xmlFs = new FileStream(outputPrefix + ".cicm.xml", FileMode.Create); + var xmlFs = new FileStream(outputPrefix + ".cicm.xml", FileMode.Create); - XmlSerializer xmlSer = new XmlSerializer(typeof(CICMMetadataType)); + var xmlSer = new XmlSerializer(typeof(CICMMetadataType)); xmlSer.Serialize(xmlFs, sidecar); xmlFs.Close(); } UpdateStatus?.Invoke(""); - UpdateStatus - ?.Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing)."); - UpdateStatus - ?.Invoke($"Average speed: {(double)BLOCK_SIZE * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec."); + + UpdateStatus?. + Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing)."); + + UpdateStatus?. + Invoke($"Average speed: {(double)BLOCK_SIZE * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec."); + UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec."); UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec."); UpdateStatus?.Invoke($"{resume.BadBlocks.Count} sectors could not be read.");