From 5953246f19a1b5e0a2f5ee4af819a3281529b423 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 21 Dec 2017 20:15:53 +0000 Subject: [PATCH] REFACTOR: All refactor in DiscImageChef. --- DiscImageChef/Commands/Analyze.cs | 22 ++- DiscImageChef/Commands/Compare.cs | 21 +-- DiscImageChef/Commands/CreateSidecar.cs | 4 +- DiscImageChef/Commands/DeviceInfo.cs | 112 ++++++-------- DiscImageChef/Commands/Entropy.cs | 6 +- DiscImageChef/Commands/ExtractFiles.cs | 115 ++++++++------- DiscImageChef/Commands/Ls.cs | 10 +- DiscImageChef/Commands/MediaInfo.cs | 186 ++++++++++++------------ DiscImageChef/Commands/PrintHex.cs | 4 +- DiscImageChef/Commands/Statistics.cs | 8 +- DiscImageChef/Commands/Verify.cs | 7 +- 11 files changed, 235 insertions(+), 260 deletions(-) diff --git a/DiscImageChef/Commands/Analyze.cs b/DiscImageChef/Commands/Analyze.cs index 0f27926d..9b8aa982 100644 --- a/DiscImageChef/Commands/Analyze.cs +++ b/DiscImageChef/Commands/Analyze.cs @@ -78,15 +78,11 @@ namespace DiscImageChef.Commands PluginBase plugins = new PluginBase(); plugins.RegisterAllPlugins(encoding); - List idPlugins; - Filesystem plugin; - string information; bool checkraw = false; - ImagePlugin imageFormat; try { - imageFormat = ImageFormat.Detect(inputFilter); + ImagePlugin imageFormat = ImageFormat.Detect(inputFilter); if(imageFormat == null) { @@ -127,6 +123,9 @@ namespace DiscImageChef.Commands return; } + List idPlugins; + Filesystem plugin; + string information; if(options.SearchForPartitions) { List partitions = Core.Partitions.GetAll(imageFormat); @@ -183,13 +182,12 @@ namespace DiscImageChef.Commands else { plugins.PluginsList.TryGetValue(idPlugins[0], out plugin); - if(plugin != null) - { - DicConsole.WriteLine($"Identified by {plugin.Name}."); - plugin.GetInformation(imageFormat, partitions[i], out information); - DicConsole.Write(information); - Core.Statistics.AddFilesystem(plugin.XmlFSType.Type); - } + if(plugin == null) continue; + + DicConsole.WriteLine($"Identified by {plugin.Name}."); + plugin.GetInformation(imageFormat, partitions[i], out information); + DicConsole.Write(information); + Core.Statistics.AddFilesystem(plugin.XmlFSType.Type); } } } diff --git a/DiscImageChef/Commands/Compare.cs b/DiscImageChef/Commands/Compare.cs index 2c91b581..a52e4e4d 100644 --- a/DiscImageChef/Commands/Compare.cs +++ b/DiscImageChef/Commands/Compare.cs @@ -128,7 +128,8 @@ namespace DiscImageChef.Commands image1Info.ImageHasPartitions = input1Format.ImageHasPartitions(); #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body try { image1Sessions = input1Format.GetSessions(); } - catch { } + catch { // ignored + } #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body image1Info.ImageHasSessions |= image1Sessions.Count > 0; image1Info.ImageSize = input1Format.GetImageSize(); @@ -179,14 +180,16 @@ namespace DiscImageChef.Commands image1DiskTags.Add(disktag, temparray); } #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body - catch { } + catch { // ignored + } #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body } image2Info.ImageHasPartitions = input2Format.ImageHasPartitions(); #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body try { image2Sessions = input2Format.GetSessions(); } - catch { } + catch { // ignored + } #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body image2Info.ImageHasSessions |= image2Sessions.Count > 0; image2Info.ImageSize = input2Format.GetImageSize(); @@ -237,7 +240,8 @@ namespace DiscImageChef.Commands image2DiskTags.Add(disktag, temparray); } #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body - catch { } + catch { // ignored + } #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body } @@ -443,8 +447,7 @@ namespace DiscImageChef.Commands { byte[] image1Sector = input1Format.ReadSector(sector); byte[] image2Sector = input2Format.ReadSector(sector); - bool different, sameSize; - ArrayHelpers.CompareBytes(out different, out sameSize, image1Sector, image2Sector); + ArrayHelpers.CompareBytes(out bool different, out bool sameSize, image1Sector, image2Sector); if(different) { imagesDiffer = true; @@ -459,14 +462,14 @@ namespace DiscImageChef.Commands } } #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body - catch { } + catch { // ignored + } #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body } DicConsole.WriteLine(); - if(imagesDiffer) sb.AppendLine("Images differ"); - else sb.AppendLine("Images do not differ"); + sb.AppendLine(imagesDiffer ? "Images differ" : "Images do not differ"); DicConsole.WriteLine(sb.ToString()); diff --git a/DiscImageChef/Commands/CreateSidecar.cs b/DiscImageChef/Commands/CreateSidecar.cs index 42fdf314..89e99e07 100644 --- a/DiscImageChef/Commands/CreateSidecar.cs +++ b/DiscImageChef/Commands/CreateSidecar.cs @@ -78,8 +78,6 @@ namespace DiscImageChef.Commands return; } - ImagePlugin imageFormat; - FiltersList filtersList = new FiltersList(); Filter inputFilter = filtersList.GetFilter(options.InputFile); @@ -91,7 +89,7 @@ namespace DiscImageChef.Commands try { - imageFormat = ImageFormat.Detect(inputFilter); + ImagePlugin imageFormat = ImageFormat.Detect(inputFilter); if(imageFormat == null) { diff --git a/DiscImageChef/Commands/DeviceInfo.cs b/DiscImageChef/Commands/DeviceInfo.cs index 9e4a0d94..75b43922 100644 --- a/DiscImageChef/Commands/DeviceInfo.cs +++ b/DiscImageChef/Commands/DeviceInfo.cs @@ -161,10 +161,7 @@ namespace DiscImageChef.Commands { case DeviceType.ATA: { - AtaErrorRegistersCHS errorRegisters; - - byte[] ataBuf; - bool sense = dev.AtaIdentify(out ataBuf, out errorRegisters); + bool sense = dev.AtaIdentify(out byte[] ataBuf, out AtaErrorRegistersCHS errorRegisters); if(sense) { @@ -189,8 +186,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine(Identify.Prettify(ataBuf)); - double duration; - dev.EnableMediaCardPassThrough(out errorRegisters, dev.Timeout, out duration); + dev.EnableMediaCardPassThrough(out errorRegisters, dev.Timeout, out _); if(errorRegisters.sector == 0xAA && errorRegisters.sectorCount == 0x55) { @@ -230,10 +226,7 @@ namespace DiscImageChef.Commands } case DeviceType.ATAPI: { - AtaErrorRegistersCHS errorRegisters; - - byte[] ataBuf; - bool sense = dev.AtapiIdentify(out ataBuf, out errorRegisters); + bool sense = dev.AtapiIdentify(out byte[] ataBuf, out AtaErrorRegistersCHS errorRegisters); if(sense) { @@ -263,10 +256,7 @@ namespace DiscImageChef.Commands } case DeviceType.SCSI: { - byte[] senseBuf; - byte[] inqBuf; - - bool sense = dev.ScsiInquiry(out inqBuf, out senseBuf); + bool sense = dev.ScsiInquiry(out byte[] inqBuf, out byte[] senseBuf); if(sense) { @@ -541,28 +531,26 @@ namespace DiscImageChef.Commands } } - byte[] modeBuf; - double duration; Modes.DecodedMode? decMode = null; PeripheralDeviceTypes devType = (PeripheralDeviceTypes)inq.Value.PeripheralDeviceType; - sense = dev.ModeSense10(out modeBuf, out senseBuf, false, true, ScsiModeSensePageControl.Current, - 0x3F, 0xFF, 5, out duration); + sense = dev.ModeSense10(out byte[] modeBuf, out senseBuf, false, true, ScsiModeSensePageControl.Current, + 0x3F, 0xFF, 5, out _); if(sense || dev.Error) sense = dev.ModeSense10(out modeBuf, out senseBuf, false, true, - ScsiModeSensePageControl.Current, 0x3F, 0x00, 5, out duration); + ScsiModeSensePageControl.Current, 0x3F, 0x00, 5, out _); if(!sense && !dev.Error) decMode = Modes.DecodeMode10(modeBuf, devType); if(sense || dev.Error || !decMode.HasValue) { sense = dev.ModeSense6(out modeBuf, out senseBuf, false, ScsiModeSensePageControl.Current, 0x3F, - 0xFF, 5, out duration); + 0xFF, 5, out _); if(sense || dev.Error) sense = dev.ModeSense6(out modeBuf, out senseBuf, false, ScsiModeSensePageControl.Current, - 0x3F, 0x00, 5, out duration); - if(sense || dev.Error) sense = dev.ModeSense(out modeBuf, out senseBuf, 5, out duration); + 0x3F, 0x00, 5, out _); + if(sense || dev.Error) sense = dev.ModeSense(out modeBuf, out senseBuf, 5, out _); if(!sense && !dev.Error) decMode = Modes.DecodeMode6(modeBuf, devType); } @@ -923,8 +911,7 @@ namespace DiscImageChef.Commands switch(devType) { case PeripheralDeviceTypes.MultiMediaDevice: - byte[] confBuf; - sense = dev.GetConfiguration(out confBuf, out senseBuf, dev.Timeout, out duration); + sense = dev.GetConfiguration(out byte[] confBuf, out senseBuf, dev.Timeout, out _); if(!sense) { @@ -1139,7 +1126,7 @@ namespace DiscImageChef.Commands // testing drives show only supported media capabilities. /* byte[] strBuf; - sense = dev.ReadDiscStructure(out strBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.CapabilityList, 0, dev.Timeout, out duration); + sense = dev.ReadDiscStructure(out strBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.CapabilityList, 0, dev.Timeout, out _); if (!sense) { @@ -1158,7 +1145,7 @@ namespace DiscImageChef.Commands } } - sense = dev.ReadDiscStructure(out strBuf, out senseBuf, MmcDiscStructureMediaType.BD, 0, 0, MmcDiscStructureFormat.CapabilityList, 0, dev.Timeout, out duration); + sense = dev.ReadDiscStructure(out strBuf, out senseBuf, MmcDiscStructureMediaType.BD, 0, 0, MmcDiscStructureFormat.CapabilityList, 0, dev.Timeout, out _); if (!sense) { @@ -1192,7 +1179,7 @@ namespace DiscImageChef.Commands case "DVDR PX-712A": plxtDvd = true; plxtSense = dev.PlextorReadEeprom(out plxtBuf, out senseBuf, dev.Timeout, - out duration); + out _); break; case "DVDR PX-714A": case "DVDR PX-716A": @@ -1200,12 +1187,11 @@ namespace DiscImageChef.Commands case "DVDR PX-755A": case "DVDR PX-760A": { - byte[] plxtBufSmall; plxtBuf = new byte[256 * 4]; for(byte i = 0; i < 4; i++) { - plxtSense = dev.PlextorReadEepromBlock(out plxtBufSmall, out senseBuf, i, 256, - dev.Timeout, out duration); + plxtSense = dev.PlextorReadEepromBlock(out byte[] plxtBufSmall, out senseBuf, i, 256, + dev.Timeout, out _); if(plxtSense) break; Array.Copy(plxtBufSmall, 0, plxtBuf, i * 256, 256); @@ -1218,7 +1204,7 @@ namespace DiscImageChef.Commands { if(dev.Model.StartsWith("CD-R ", StringComparison.Ordinal)) plxtSense = dev.PlextorReadEepromCdr(out plxtBuf, out senseBuf, dev.Timeout, - out duration); + out _); break; } } @@ -1265,10 +1251,8 @@ namespace DiscImageChef.Commands } } - bool plxtPwrRecEnabled; - ushort plxtPwrRecSpeed; - plxtSense = dev.PlextorGetPoweRec(out senseBuf, out plxtPwrRecEnabled, out plxtPwrRecSpeed, - dev.Timeout, out duration); + plxtSense = dev.PlextorGetPoweRec(out senseBuf, out bool plxtPwrRecEnabled, out ushort plxtPwrRecSpeed, + dev.Timeout, out _); if(!plxtSense) { DicConsole.Write("Drive supports PoweRec"); @@ -1280,10 +1264,9 @@ namespace DiscImageChef.Commands DicConsole.WriteLine(" and recommends {0} Kb/sec.", plxtPwrRecSpeed); else DicConsole.WriteLine("."); - ushort plxtPwrRecSelected, plxtPwrRecMax, plxtPwrRecLast; - plxtSense = dev.PlextorGetSpeeds(out senseBuf, out plxtPwrRecSelected, - out plxtPwrRecMax, out plxtPwrRecLast, dev.Timeout, - out duration); + plxtSense = dev.PlextorGetSpeeds(out senseBuf, out ushort plxtPwrRecSelected, + out ushort plxtPwrRecMax, out ushort plxtPwrRecLast, dev.Timeout, + out _); if(!plxtSense) { @@ -1304,15 +1287,16 @@ namespace DiscImageChef.Commands } // TODO: Check it with a drive - plxtSense = dev.PlextorGetSilentMode(out plxtBuf, out senseBuf, dev.Timeout, out duration); + plxtSense = dev.PlextorGetSilentMode(out plxtBuf, out senseBuf, dev.Timeout, out _); if(!plxtSense) { DicConsole.WriteLine("Drive supports Plextor SilentMode"); if(plxtBuf[0] == 1) { DicConsole.WriteLine("Plextor SilentMode is enabled:"); - if(plxtBuf[1] == 2) DicConsole.WriteLine("\tAccess time is slow"); - else DicConsole.WriteLine("\tAccess time is fast"); + DicConsole.WriteLine(plxtBuf[1] == 2 + ? "\tAccess time is slow" + : "\tAccess time is fast"); if(plxtBuf[2] > 0) DicConsole.WriteLine("\tCD read speed limited to {0}x", plxtBuf[2]); @@ -1327,13 +1311,13 @@ namespace DiscImageChef.Commands } } - plxtSense = dev.PlextorGetGigaRec(out plxtBuf, out senseBuf, dev.Timeout, out duration); + plxtSense = dev.PlextorGetGigaRec(out plxtBuf, out senseBuf, dev.Timeout, out _); if(!plxtSense) DicConsole.WriteLine("Drive supports Plextor GigaRec"); - plxtSense = dev.PlextorGetSecuRec(out plxtBuf, out senseBuf, dev.Timeout, out duration); + plxtSense = dev.PlextorGetSecuRec(out plxtBuf, out senseBuf, dev.Timeout, out _); if(!plxtSense) DicConsole.WriteLine("Drive supports Plextor SecuRec"); - plxtSense = dev.PlextorGetSpeedRead(out plxtBuf, out senseBuf, dev.Timeout, out duration); + plxtSense = dev.PlextorGetSpeedRead(out plxtBuf, out senseBuf, dev.Timeout, out _); if(!plxtSense) { DicConsole.Write("Drive supports Plextor SpeedRead"); @@ -1341,7 +1325,7 @@ namespace DiscImageChef.Commands else DicConsole.WriteLine(); } - plxtSense = dev.PlextorGetHiding(out plxtBuf, out senseBuf, dev.Timeout, out duration); + plxtSense = dev.PlextorGetHiding(out plxtBuf, out senseBuf, dev.Timeout, out _); if(!plxtSense) { DicConsole.WriteLine("Drive supports hiding CD-Rs and forcing single session"); @@ -1352,23 +1336,23 @@ namespace DiscImageChef.Commands } plxtSense = dev.PlextorGetVariRec(out plxtBuf, out senseBuf, false, dev.Timeout, - out duration); + out _); if(!plxtSense) DicConsole.WriteLine("Drive supports Plextor VariRec"); if(plxtDvd) { plxtSense = dev.PlextorGetVariRec(out plxtBuf, out senseBuf, true, dev.Timeout, - out duration); + out _); if(!plxtSense) DicConsole.WriteLine("Drive supports Plextor VariRec for DVDs"); plxtSense = dev.PlextorGetBitsetting(out plxtBuf, out senseBuf, false, dev.Timeout, - out duration); + out _); if(!plxtSense) DicConsole.WriteLine("Drive supports bitsetting DVD+R book type"); plxtSense = dev.PlextorGetBitsetting(out plxtBuf, out senseBuf, true, dev.Timeout, - out duration); + out _); if(!plxtSense) DicConsole.WriteLine("Drive supports bitsetting DVD+R DL book type"); plxtSense = dev.PlextorGetTestWriteDvdPlus(out plxtBuf, out senseBuf, dev.Timeout, - out duration); + out _); if(!plxtSense) DicConsole.WriteLine("Drive supports test writing DVD+"); } } @@ -1376,8 +1360,7 @@ namespace DiscImageChef.Commands if(inq.Value.KreonPresent) { - KreonFeatures krFeatures; - if(!dev.KreonGetFeatureList(out senseBuf, out krFeatures, dev.Timeout, out duration)) + if(!dev.KreonGetFeatureList(out senseBuf, out KreonFeatures krFeatures, dev.Timeout, out _)) { DicConsole.WriteLine("Drive has kreon firmware:"); if(krFeatures.HasFlag(KreonFeatures.ChallengeResponse)) @@ -1404,9 +1387,8 @@ namespace DiscImageChef.Commands } break; case PeripheralDeviceTypes.SequentialAccess: - byte[] seqBuf; - sense = dev.ReadBlockLimits(out seqBuf, out senseBuf, dev.Timeout, out duration); + sense = dev.ReadBlockLimits(out byte[] seqBuf, out senseBuf, dev.Timeout, out _); if(sense) DicConsole.ErrorWriteLine("READ BLOCK LIMITS:\n{0}", Sense.PrettifySense(senseBuf)); @@ -1418,7 +1400,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine(BlockLimits.Prettify(seqBuf)); } - sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, dev.Timeout, out duration); + sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, dev.Timeout, out _); if(sense) DicConsole.ErrorWriteLine("REPORT DENSITY SUPPORT:\n{0}", Sense.PrettifySense(senseBuf)); @@ -1436,7 +1418,7 @@ namespace DiscImageChef.Commands } sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, true, false, dev.Timeout, - out duration); + out _); if(sense) DicConsole.ErrorWriteLine("REPORT DENSITY SUPPORT (MEDIUM):\n{0}", Sense.PrettifySense(senseBuf)); @@ -1463,7 +1445,7 @@ namespace DiscImageChef.Commands { bool noInfo = true; - bool sense = dev.ReadCid(out byte[] mmcBuf, out uint[] response, dev.Timeout, out double duration); + bool sense = dev.ReadCid(out byte[] mmcBuf, out _, dev.Timeout, out _); if(!sense) { noInfo = false; @@ -1471,7 +1453,7 @@ namespace DiscImageChef.Commands mmcBuf); DicConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCID(mmcBuf)); } - sense = dev.ReadCsd(out mmcBuf, out response, dev.Timeout, out duration); + sense = dev.ReadCsd(out mmcBuf, out _, dev.Timeout, out _); if(!sense) { noInfo = false; @@ -1479,7 +1461,7 @@ namespace DiscImageChef.Commands mmcBuf); DicConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCSD(mmcBuf)); } - sense = dev.ReadOcr(out mmcBuf, out response, dev.Timeout, out duration); + sense = dev.ReadOcr(out mmcBuf, out _, dev.Timeout, out _); if(!sense) { noInfo = false; @@ -1487,7 +1469,7 @@ namespace DiscImageChef.Commands mmcBuf); DicConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyOCR(mmcBuf)); } - sense = dev.ReadExtendedCsd(out mmcBuf, out response, dev.Timeout, out duration); + sense = dev.ReadExtendedCsd(out mmcBuf, out _, dev.Timeout, out _); if(!sense) { noInfo = false; @@ -1503,7 +1485,7 @@ namespace DiscImageChef.Commands { bool noInfo = true; - bool sense = dev.ReadCid(out byte[] sdBuf, out uint[] response, dev.Timeout, out double duration); + bool sense = dev.ReadCid(out byte[] sdBuf, out _, dev.Timeout, out _); if(!sense) { noInfo = false; @@ -1511,7 +1493,7 @@ namespace DiscImageChef.Commands "SecureDigital CID", sdBuf); DicConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(sdBuf)); } - sense = dev.ReadCsd(out sdBuf, out response, dev.Timeout, out duration); + sense = dev.ReadCsd(out sdBuf, out _, dev.Timeout, out _); if(!sense) { noInfo = false; @@ -1519,7 +1501,7 @@ namespace DiscImageChef.Commands "SecureDigital CSD", sdBuf); DicConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(sdBuf)); } - sense = dev.ReadSdocr(out sdBuf, out response, dev.Timeout, out duration); + sense = dev.ReadSdocr(out sdBuf, out _, dev.Timeout, out _); if(!sense) { noInfo = false; @@ -1527,7 +1509,7 @@ namespace DiscImageChef.Commands "SecureDigital OCR", sdBuf); DicConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(sdBuf)); } - sense = dev.ReadScr(out sdBuf, out response, dev.Timeout, out duration); + sense = dev.ReadScr(out sdBuf, out _, dev.Timeout, out _); if(!sense) { noInfo = false; diff --git a/DiscImageChef/Commands/Entropy.cs b/DiscImageChef/Commands/Entropy.cs index 019877d1..0b7a17a7 100644 --- a/DiscImageChef/Commands/Entropy.cs +++ b/DiscImageChef/Commands/Entropy.cs @@ -99,8 +99,7 @@ namespace DiscImageChef.Commands if(options.DuplicatedSectors) { - byte[] garbage; - string sectorHash = sha1CtxTrack.Data(sector, out garbage); + string sectorHash = sha1CtxTrack.Data(sector, out _); if(!uniqueSectorsPerTrack.Contains(sectorHash)) uniqueSectorsPerTrack.Add(sectorHash); } @@ -146,8 +145,7 @@ namespace DiscImageChef.Commands if(options.DuplicatedSectors) { - byte[] garbage; - string sectorHash = sha1Ctx.Data(sector, out garbage); + string sectorHash = sha1Ctx.Data(sector, out _); if(!uniqueSectors.Contains(sectorHash)) uniqueSectors.Add(sectorHash); } diff --git a/DiscImageChef/Commands/ExtractFiles.cs b/DiscImageChef/Commands/ExtractFiles.cs index 231f0deb..194a3564 100644 --- a/DiscImageChef/Commands/ExtractFiles.cs +++ b/DiscImageChef/Commands/ExtractFiles.cs @@ -80,14 +80,9 @@ namespace DiscImageChef.Commands PluginBase plugins = new PluginBase(); plugins.RegisterAllPlugins(encoding); - List idPlugins; - Filesystem plugin; - ImagePlugin imageFormat; - Errno error; - try { - imageFormat = ImageFormat.Detect(inputFilter); + ImagePlugin imageFormat = ImageFormat.Detect(inputFilter); if(imageFormat == null) { @@ -139,6 +134,9 @@ namespace DiscImageChef.Commands List partitions = Core.Partitions.GetAll(imageFormat); Core.Partitions.AddSchemesToStats(partitions); + List idPlugins; + Filesystem plugin; + Errno error; if(partitions.Count == 0) DicConsole.DebugWriteLine("Extract-Files command", "No partitions found"); else { @@ -176,17 +174,14 @@ namespace DiscImageChef.Commands foreach(string entry in rootDir) { FileEntryInfo stat = new FileEntryInfo(); - string outputPath; - FileStream outputFile; - string volumeName; - if(string.IsNullOrEmpty(fs.XmlFSType.VolumeName)) - volumeName = "NO NAME"; - else volumeName = fs.XmlFSType.VolumeName; + string volumeName = string.IsNullOrEmpty(fs.XmlFSType.VolumeName) ? "NO NAME" : fs.XmlFSType.VolumeName; error = fs.Stat(entry, ref stat); if(error == Errno.NoError) { + string outputPath; + FileStream outputFile; if(options.Xattrs) { List xattrs = new List(); @@ -226,17 +221,20 @@ namespace DiscImageChef.Commands { fi.CreationTimeUtc = stat.CreationTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastWriteTimeUtc = stat.LastWriteTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastAccessTimeUtc = stat.AccessTimeUtc; } - catch { } + catch { // ignored + } #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body DicConsole .WriteLine("Written {0} bytes of xattr {1} from file {2} to {3}", @@ -274,11 +272,14 @@ namespace DiscImageChef.Commands FileInfo fi = new FileInfo(outputPath); #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body try { fi.CreationTimeUtc = stat.CreationTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastWriteTimeUtc = stat.LastWriteTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastAccessTimeUtc = stat.AccessTimeUtc; } - catch { } + catch { // ignored + } #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body DicConsole.WriteLine("Written {0} bytes of file {1} to {2}", outBuf.Length, entry, outputPath); @@ -323,16 +324,14 @@ namespace DiscImageChef.Commands foreach(string entry in rootDir) { FileEntryInfo stat = new FileEntryInfo(); - string outputPath; - FileStream outputFile; - string volumeName; - if(string.IsNullOrEmpty(fs.XmlFSType.VolumeName)) volumeName = "NO NAME"; - else volumeName = fs.XmlFSType.VolumeName; + string volumeName = string.IsNullOrEmpty(fs.XmlFSType.VolumeName) ? "NO NAME" : fs.XmlFSType.VolumeName; error = fs.Stat(entry, ref stat); if(error == Errno.NoError) { + FileStream outputFile; + string outputPath; if(options.Xattrs) { List xattrs = new List(); @@ -365,11 +364,14 @@ namespace DiscImageChef.Commands FileInfo fi = new FileInfo(outputPath); #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body try { fi.CreationTimeUtc = stat.CreationTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastWriteTimeUtc = stat.LastWriteTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastAccessTimeUtc = stat.AccessTimeUtc; } - catch { } + catch { // ignored + } #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body DicConsole .WriteLine("Written {0} bytes of xattr {1} from file {2} to {3}", @@ -405,11 +407,14 @@ namespace DiscImageChef.Commands FileInfo fi = new FileInfo(outputPath); #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body try { fi.CreationTimeUtc = stat.CreationTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastWriteTimeUtc = stat.LastWriteTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastAccessTimeUtc = stat.AccessTimeUtc; } - catch { } + catch { // ignored + } #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body DicConsole.WriteLine("Written {0} bytes of file {1} to {2}", outBuf.Length, entry, outputPath); @@ -465,16 +470,14 @@ namespace DiscImageChef.Commands foreach(string entry in rootDir) { FileEntryInfo stat = new FileEntryInfo(); - string outputPath; - FileStream outputFile; - string volumeName; - if(string.IsNullOrEmpty(fs.XmlFSType.VolumeName)) volumeName = "NO NAME"; - else volumeName = fs.XmlFSType.VolumeName; + string volumeName = string.IsNullOrEmpty(fs.XmlFSType.VolumeName) ? "NO NAME" : fs.XmlFSType.VolumeName; error = fs.Stat(entry, ref stat); if(error == Errno.NoError) { + FileStream outputFile; + string outputPath; if(options.Xattrs) { List xattrs = new List(); @@ -507,11 +510,14 @@ namespace DiscImageChef.Commands FileInfo fi = new FileInfo(outputPath); #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body try { fi.CreationTimeUtc = stat.CreationTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastWriteTimeUtc = stat.LastWriteTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastAccessTimeUtc = stat.AccessTimeUtc; } - catch { } + catch { // ignored + } #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body DicConsole .WriteLine("Written {0} bytes of xattr {1} from file {2} to {3}", @@ -547,11 +553,14 @@ namespace DiscImageChef.Commands FileInfo fi = new FileInfo(outputPath); #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body try { fi.CreationTimeUtc = stat.CreationTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastWriteTimeUtc = stat.LastWriteTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastAccessTimeUtc = stat.AccessTimeUtc; } - catch { } + catch { // ignored + } #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body DicConsole.WriteLine("Written {0} bytes of file {1} to {2}", outBuf.Length, entry, outputPath); @@ -592,16 +601,14 @@ namespace DiscImageChef.Commands foreach(string entry in rootDir) { FileEntryInfo stat = new FileEntryInfo(); - string outputPath; - FileStream outputFile; - string volumeName; - if(string.IsNullOrEmpty(fs.XmlFSType.VolumeName)) volumeName = "NO NAME"; - else volumeName = fs.XmlFSType.VolumeName; + string volumeName = string.IsNullOrEmpty(fs.XmlFSType.VolumeName) ? "NO NAME" : fs.XmlFSType.VolumeName; error = fs.Stat(entry, ref stat); if(error == Errno.NoError) { + string outputPath; + FileStream outputFile; if(options.Xattrs) { List xattrs = new List(); @@ -633,11 +640,14 @@ namespace DiscImageChef.Commands FileInfo fi = new FileInfo(outputPath); #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body try { fi.CreationTimeUtc = stat.CreationTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastWriteTimeUtc = stat.LastWriteTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastAccessTimeUtc = stat.AccessTimeUtc; } - catch { } + catch { // ignored + } #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body DicConsole .WriteLine("Written {0} bytes of xattr {1} from file {2} to {3}", @@ -670,11 +680,14 @@ namespace DiscImageChef.Commands FileInfo fi = new FileInfo(outputPath); #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body try { fi.CreationTimeUtc = stat.CreationTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastWriteTimeUtc = stat.LastWriteTimeUtc; } - catch { } + catch { // ignored + } try { fi.LastAccessTimeUtc = stat.AccessTimeUtc; } - catch { } + catch { // ignored + } #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body DicConsole.WriteLine("Written {0} bytes of file {1} to {2}", outBuf.Length, entry, outputPath); diff --git a/DiscImageChef/Commands/Ls.cs b/DiscImageChef/Commands/Ls.cs index edf7b7e9..f7a6ef3f 100644 --- a/DiscImageChef/Commands/Ls.cs +++ b/DiscImageChef/Commands/Ls.cs @@ -76,14 +76,9 @@ namespace DiscImageChef.Commands PluginBase plugins = new PluginBase(); plugins.RegisterAllPlugins(encoding); - List idPlugins; - Filesystem plugin; - ImagePlugin imageFormat; - Errno error; - try { - imageFormat = ImageFormat.Detect(inputFilter); + ImagePlugin imageFormat = ImageFormat.Detect(inputFilter); if(imageFormat == null) { @@ -126,6 +121,9 @@ namespace DiscImageChef.Commands List partitions = Core.Partitions.GetAll(imageFormat); Core.Partitions.AddSchemesToStats(partitions); + List idPlugins; + Filesystem plugin; + Errno error; if(partitions.Count == 0) DicConsole.DebugWriteLine("Ls command", "No partitions found"); else { diff --git a/DiscImageChef/Commands/MediaInfo.cs b/DiscImageChef/Commands/MediaInfo.cs index 847b6a71..ed399036 100644 --- a/DiscImageChef/Commands/MediaInfo.cs +++ b/DiscImageChef/Commands/MediaInfo.cs @@ -77,11 +77,11 @@ namespace DiscImageChef.Commands switch(dev.Type) { case DeviceType.ATA: - DoAtaMediaInfo(options.OutputPrefix, dev); + DoAtaMediaInfo(); break; case DeviceType.MMC: case DeviceType.SecureDigital: - DoSdMediaInfo(options.OutputPrefix, dev); + DoSdMediaInfo(); break; case DeviceType.NVMe: DoNvmeMediaInfo(options.OutputPrefix, dev); @@ -96,7 +96,7 @@ namespace DiscImageChef.Commands Core.Statistics.AddCommand("media-info"); } - static void DoAtaMediaInfo(string outputPrefix, Device dev) + static void DoAtaMediaInfo() { DicConsole.ErrorWriteLine("Please use device-info command for ATA devices."); } @@ -106,7 +106,7 @@ namespace DiscImageChef.Commands throw new NotImplementedException("NVMe devices not yet supported."); } - static void DoSdMediaInfo(string outputPrefix, Device dev) + static void DoSdMediaInfo() { DicConsole.ErrorWriteLine("Please use device-info command for MMC/SD devices."); } @@ -116,7 +116,6 @@ namespace DiscImageChef.Commands byte[] cmdBuf; byte[] senseBuf; bool sense; - double duration; MediaType dskType = MediaType.Unknown; ulong blocks = 0; uint blockSize = 0; @@ -125,7 +124,7 @@ namespace DiscImageChef.Commands if(dev.IsRemovable) { deviceGotReset: - sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out duration); + sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _); if(sense) { FixedSense? decSense = Sense.DecodeFixed(senseBuf); @@ -145,7 +144,7 @@ namespace DiscImageChef.Commands { DicConsole.WriteLine("\rWaiting for drive to become ready"); Thread.Sleep(2000); - sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out duration); + sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _); if(!sense) break; leftRetries--; @@ -164,7 +163,7 @@ namespace DiscImageChef.Commands { DicConsole.WriteLine("\rWaiting for drive to become ready"); Thread.Sleep(2000); - sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out duration); + sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _); if(!sense) break; leftRetries--; @@ -192,26 +191,25 @@ namespace DiscImageChef.Commands } } - byte[] modeBuf; Modes.DecodedMode? decMode = null; PeripheralDeviceTypes devType = dev.ScsiType; - sense = dev.ModeSense10(out modeBuf, out senseBuf, false, true, ScsiModeSensePageControl.Current, 0x3F, - 0xFF, 5, out duration); + sense = dev.ModeSense10(out byte[] modeBuf, out senseBuf, false, true, ScsiModeSensePageControl.Current, 0x3F, + 0xFF, 5, out _); if(sense || dev.Error) sense = dev.ModeSense10(out modeBuf, out senseBuf, false, true, ScsiModeSensePageControl.Current, 0x3F, - 0x00, 5, out duration); + 0x00, 5, out _); if(!sense && !dev.Error) decMode = Modes.DecodeMode10(modeBuf, devType); if(sense || dev.Error || !decMode.HasValue) { sense = dev.ModeSense6(out modeBuf, out senseBuf, false, ScsiModeSensePageControl.Current, 0x3F, 0x00, - 5, out duration); + 5, out _); if(sense || dev.Error) sense = dev.ModeSense6(out modeBuf, out senseBuf, false, ScsiModeSensePageControl.Current, 0x3F, - 0x00, 5, out duration); - if(sense || dev.Error) sense = dev.ModeSense(out modeBuf, out senseBuf, 5, out duration); + 0x00, 5, out _); + if(sense || dev.Error) sense = dev.ModeSense(out modeBuf, out senseBuf, 5, out _); if(!sense && !dev.Error) decMode = Modes.DecodeMode6(modeBuf, devType); } @@ -239,7 +237,7 @@ namespace DiscImageChef.Commands case PeripheralDeviceTypes.OpticalDevice: case PeripheralDeviceTypes.SimplifiedDevice: case PeripheralDeviceTypes.WriteOnceDevice: - sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out duration); + sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out _); if(!sense) { DataFile.WriteTo("Media-Info command", outputPrefix, "_readcapacity.bin", "SCSI READ CAPACITY", @@ -250,7 +248,7 @@ namespace DiscImageChef.Commands if(sense || blocks == 0xFFFFFFFF) { - sense = dev.ReadCapacity16(out cmdBuf, out senseBuf, dev.Timeout, out duration); + sense = dev.ReadCapacity16(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense && blocks == 0) if(dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice) @@ -280,13 +278,12 @@ namespace DiscImageChef.Commands } break; case PeripheralDeviceTypes.SequentialAccess: - byte[] seqBuf; byte[] medBuf; - sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, false, dev.Timeout, out duration); + sense = dev.ReportDensitySupport(out byte[] seqBuf, out senseBuf, false, dev.Timeout, out _); if(!sense) { - sense = dev.ReportDensitySupport(out medBuf, out senseBuf, true, dev.Timeout, out duration); + sense = dev.ReportDensitySupport(out medBuf, out senseBuf, true, dev.Timeout, out _); if(!sense && !seqBuf.SequenceEqual(medBuf)) { @@ -302,10 +299,10 @@ namespace DiscImageChef.Commands } } - sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, true, false, dev.Timeout, out duration); + sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, true, false, dev.Timeout, out _); if(!sense) { - sense = dev.ReportDensitySupport(out medBuf, out senseBuf, true, true, dev.Timeout, out duration); + sense = dev.ReportDensitySupport(out medBuf, out senseBuf, true, true, dev.Timeout, out _); if(!sense && !seqBuf.SequenceEqual(medBuf)) { @@ -325,7 +322,7 @@ namespace DiscImageChef.Commands // TODO: Get a machine where 16-byte CDBs don't get DID_ABORT /* - sense = dev.ReadAttribute(out seqBuf, out senseBuf, ScsiAttributeAction.List, 0, dev.Timeout, out duration); + sense = dev.ReadAttribute(out seqBuf, out senseBuf, ScsiAttributeAction.List, 0, dev.Timeout, out _); if (sense) DicConsole.ErrorWriteLine("SCSI READ ATTRIBUTE:\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else @@ -339,7 +336,7 @@ namespace DiscImageChef.Commands if(dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice) { sense = dev.GetConfiguration(out cmdBuf, out senseBuf, 0, MmcGetConfigurationRt.Current, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ GET CONFIGURATION:\n{0}", Sense.PrettifySense(senseBuf)); @@ -447,7 +444,7 @@ namespace DiscImageChef.Commands sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.RecognizedFormatLayers, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Recognized Format Layers\n{0}", @@ -457,7 +454,7 @@ namespace DiscImageChef.Commands "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.WriteProtectionStatus, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Write Protection Status\n{0}", Sense.PrettifySense(senseBuf)); @@ -467,7 +464,7 @@ namespace DiscImageChef.Commands // More like a drive information /* - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.CapabilityList, 0, dev.Timeout, out duration); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.CapabilityList, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Capability List\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else @@ -484,7 +481,7 @@ namespace DiscImageChef.Commands { sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: PFI\n{0}", Sense.PrettifySense(senseBuf)); @@ -514,8 +511,7 @@ namespace DiscImageChef.Commands dskType = MediaType.DVDPRWDL; break; case DiskCategory.DVDR: - if(decPfi.Value.PartVersion == 6) dskType = MediaType.DVDRDL; - else dskType = MediaType.DVDR; + dskType = decPfi.Value.PartVersion == 6 ? MediaType.DVDRDL : MediaType.DVDR; break; case DiskCategory.DVDRAM: dskType = MediaType.DVDRAM; @@ -524,8 +520,7 @@ namespace DiscImageChef.Commands dskType = MediaType.DVDROM; break; case DiskCategory.DVDRW: - if(decPfi.Value.PartVersion == 3) dskType = MediaType.DVDRWDL; - else dskType = MediaType.DVDRW; + dskType = decPfi.Value.PartVersion == 3 ? MediaType.DVDRWDL : MediaType.DVDRW; break; case DiskCategory.HDDVDR: dskType = MediaType.HDDVDR; @@ -540,9 +535,7 @@ namespace DiscImageChef.Commands dskType = MediaType.HDDVDRW; break; case DiskCategory.Nintendo: - if(decPfi.Value.DiscSize == DVDSize.Eighty) - dskType = MediaType.GOD; - else dskType = MediaType.WOD; + dskType = decPfi.Value.DiscSize == DVDSize.Eighty ? MediaType.GOD : MediaType.WOD; break; case DiskCategory.UMD: dskType = MediaType.UMD; @@ -553,7 +546,7 @@ namespace DiscImageChef.Commands sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.DiscManufacturingInformation, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DMI\n{0}", Sense.PrettifySense(senseBuf)); @@ -586,7 +579,7 @@ namespace DiscImageChef.Commands { sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.CopyrightInformation, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: CMI\n{0}", Sense.PrettifySense(senseBuf)); @@ -607,7 +600,7 @@ namespace DiscImageChef.Commands case MediaType.HDDVDROM: sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.BurstCuttingArea, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: BCA\n{0}", Sense.PrettifySense(senseBuf)); @@ -615,7 +608,7 @@ namespace DiscImageChef.Commands DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_bca.bin", "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, - MmcDiscStructureFormat.DvdAacs, 0, dev.Timeout, out duration); + MmcDiscStructureFormat.DvdAacs, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DVD AACS\n{0}", Sense.PrettifySense(senseBuf)); @@ -626,7 +619,7 @@ namespace DiscImageChef.Commands case MediaType.DVDRAM: case MediaType.HDDVDRAM: sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, - MmcDiscStructureFormat.DvdramDds, 0, dev.Timeout, out duration); + MmcDiscStructureFormat.DvdramDds, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DDS\n{0}", Sense.PrettifySense(senseBuf)); @@ -638,7 +631,7 @@ namespace DiscImageChef.Commands } sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.DvdramMediumStatus, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Medium Status\n{0}", Sense.PrettifySense(senseBuf)); @@ -650,7 +643,7 @@ namespace DiscImageChef.Commands } sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.DvdramSpareAreaInformation, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: SAI\n{0}", Sense.PrettifySense(senseBuf)); @@ -665,7 +658,7 @@ namespace DiscImageChef.Commands case MediaType.HDDVDR: sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.LastBorderOutRmd, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Last-Out Border RMD\n{0}", Sense.PrettifySense(senseBuf)); @@ -678,57 +671,57 @@ namespace DiscImageChef.Commands #region Require drive authentication, won't work /* - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DiscKey, 0, dev.Timeout, out duration); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DiscKey, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Disc Key\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_disckey.bin", "SCSI READ DISC STRUCTURE", cmdBuf); - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.SectorCopyrightInformation, 0, dev.Timeout, out duration); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.SectorCopyrightInformation, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Sector CMI\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_sectorcmi.bin", "SCSI READ DISC STRUCTURE", cmdBuf); - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.MediaIdentifier, 0, dev.Timeout, out duration); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.MediaIdentifier, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_mediaid.bin", "SCSI READ DISC STRUCTURE", cmdBuf); - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.MediaKeyBlock, 0, dev.Timeout, out duration); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.MediaKeyBlock, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_mkb.bin", "SCSI READ DISC STRUCTURE", cmdBuf); - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSVolId, 0, dev.Timeout, out duration); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSVolId, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Volume ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacsvolid.bin", "SCSI READ DISC STRUCTURE", cmdBuf); - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMediaSerial, 0, dev.Timeout, out duration); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMediaSerial, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Media Serial Number\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacssn.bin", "SCSI READ DISC STRUCTURE", cmdBuf); - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMediaId, 0, dev.Timeout, out duration); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMediaId, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacsmediaid.bin", "SCSI READ DISC STRUCTURE", cmdBuf); - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMKB, 0, dev.Timeout, out duration); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMKB, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacsmkb.bin", "SCSI READ DISC STRUCTURE", cmdBuf); - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSLBAExtents, 0, dev.Timeout, out duration); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSLBAExtents, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS LBA Extents\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacslbaextents.bin", "SCSI READ DISC STRUCTURE", cmdBuf); - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMKBCPRM, 0, dev.Timeout, out duration); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMKBCPRM, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS CPRM MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacscprmmkb.bin", "SCSI READ DISC STRUCTURE", cmdBuf); - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSDataKeys, 0, dev.Timeout, out duration); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSDataKeys, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Data Keys\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else @@ -746,7 +739,7 @@ namespace DiscImageChef.Commands if(dskType == MediaType.DVDR || dskType == MediaType.DVDRW) { sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, - MmcDiscStructureFormat.PreRecordedInfo, 0, dev.Timeout, out duration); + MmcDiscStructureFormat.PreRecordedInfo, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Pre-Recorded Info\n{0}", Sense.PrettifySense(senseBuf)); @@ -763,7 +756,7 @@ namespace DiscImageChef.Commands case MediaType.HDDVDR: sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.DvdrMediaIdentifier, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DVD-R Media ID\n{0}", Sense.PrettifySense(senseBuf)); @@ -772,7 +765,7 @@ namespace DiscImageChef.Commands "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.DvdrPhysicalInformation, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DVD-R PFI\n{0}", Sense.PrettifySense(senseBuf)); @@ -787,7 +780,7 @@ namespace DiscImageChef.Commands case MediaType.DVDPRW: case MediaType.DVDPRWDL: sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, - MmcDiscStructureFormat.Adip, 0, dev.Timeout, out duration); + MmcDiscStructureFormat.Adip, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: ADIP\n{0}", Sense.PrettifySense(senseBuf)); @@ -796,7 +789,7 @@ namespace DiscImageChef.Commands "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, - MmcDiscStructureFormat.Dcb, 0, dev.Timeout, out duration); + MmcDiscStructureFormat.Dcb, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DCB\n{0}", Sense.PrettifySense(senseBuf)); @@ -809,7 +802,7 @@ namespace DiscImageChef.Commands case MediaType.HDDVDROM: sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.HddvdCopyrightInformation, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: HDDVD CMI\n{0}", Sense.PrettifySense(senseBuf)); @@ -825,7 +818,7 @@ namespace DiscImageChef.Commands { sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.HddvdrMediumStatus, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: HDDVD-R Medium Status\n{0}", @@ -834,7 +827,7 @@ namespace DiscImageChef.Commands DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_hddvdr_status.bin", "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, - MmcDiscStructureFormat.HddvdrLastRmd, 0, dev.Timeout, out duration); + MmcDiscStructureFormat.HddvdrLastRmd, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Last RMD\n{0}", Sense.PrettifySense(senseBuf)); @@ -850,7 +843,7 @@ namespace DiscImageChef.Commands { sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.DvdrLayerCapacity, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Layer Capacity\n{0}", Sense.PrettifySense(senseBuf)); @@ -864,7 +857,7 @@ namespace DiscImageChef.Commands #region DVD-R DL case MediaType.DVDRDL: sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, - MmcDiscStructureFormat.MiddleZoneStart, 0, dev.Timeout, out duration); + MmcDiscStructureFormat.MiddleZoneStart, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Middle Zone Start\n{0}", Sense.PrettifySense(senseBuf)); @@ -873,7 +866,7 @@ namespace DiscImageChef.Commands "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.JumpIntervalSize, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Jump Interval Size\n{0}", Sense.PrettifySense(senseBuf)); @@ -882,7 +875,7 @@ namespace DiscImageChef.Commands "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.ManualLayerJumpStartLba, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Manual Layer Jump Start LBA\n{0}", @@ -892,7 +885,7 @@ namespace DiscImageChef.Commands "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.RemapAnchorPoint, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Remap Anchor Point\n{0}", Sense.PrettifySense(senseBuf)); @@ -908,7 +901,7 @@ namespace DiscImageChef.Commands case MediaType.BDRXL: case MediaType.BDREXL: sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0, - MmcDiscStructureFormat.DiscInformation, 0, dev.Timeout, out duration); + MmcDiscStructureFormat.DiscInformation, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DI\n{0}", Sense.PrettifySense(senseBuf)); @@ -919,7 +912,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("Blu-ray Disc Information:\n{0}", DI.Prettify(cmdBuf)); } sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0, - MmcDiscStructureFormat.Pac, 0, dev.Timeout, out duration); + MmcDiscStructureFormat.Pac, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: PAC\n{0}", Sense.PrettifySense(senseBuf)); @@ -936,7 +929,7 @@ namespace DiscImageChef.Commands case MediaType.BDROM: sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0, MmcDiscStructureFormat.BdBurstCuttingArea, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: BCA\n{0}", Sense.PrettifySense(senseBuf)); @@ -954,7 +947,7 @@ namespace DiscImageChef.Commands case MediaType.BDRXL: case MediaType.BDREXL: sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0, - MmcDiscStructureFormat.BdDds, 0, dev.Timeout, out duration); + MmcDiscStructureFormat.BdDds, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DDS\n{0}", Sense.PrettifySense(senseBuf)); @@ -966,7 +959,7 @@ namespace DiscImageChef.Commands Decoders.Bluray.DDS.Prettify(cmdBuf)); } sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0, - MmcDiscStructureFormat.CartridgeStatus, 0, dev.Timeout, out duration); + MmcDiscStructureFormat.CartridgeStatus, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Cartridge Status\n{0}", Sense.PrettifySense(senseBuf)); @@ -978,7 +971,7 @@ namespace DiscImageChef.Commands } sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0, MmcDiscStructureFormat.BdSpareAreaInformation, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Spare Area Information\n{0}", @@ -991,7 +984,7 @@ namespace DiscImageChef.Commands DI.Prettify(cmdBuf)); } sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0, - MmcDiscStructureFormat.RawDfl, 0, dev.Timeout, out duration); + MmcDiscStructureFormat.RawDfl, 0, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Raw DFL\n{0}", Sense.PrettifySense(senseBuf)); @@ -1000,7 +993,7 @@ namespace DiscImageChef.Commands "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscInformation(out cmdBuf, out senseBuf, MmcDiscInformationDataTypes.TrackResources, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC INFORMATION 001b\n{0}", Sense.PrettifySense(senseBuf)); @@ -1012,7 +1005,7 @@ namespace DiscImageChef.Commands "SCSI READ DISC INFORMATION", cmdBuf); } sense = dev.ReadDiscInformation(out cmdBuf, out senseBuf, MmcDiscInformationDataTypes.PowResources, - dev.Timeout, out duration); + dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC INFORMATION 010b\n{0}", Sense.PrettifySense(senseBuf)); @@ -1036,7 +1029,7 @@ namespace DiscImageChef.Commands // We discarded all discs that falsify a TOC before requesting a real TOC // No TOC, no CD (or an empty one) bool tocSense = - dev.ReadTocPmaAtip(out cmdBuf, out senseBuf, false, 0, 0, dev.Timeout, out duration); + dev.ReadTocPmaAtip(out cmdBuf, out senseBuf, false, 0, 0, dev.Timeout, out _); if(tocSense) DicConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: TOC\n{0}", Sense.PrettifySense(senseBuf)); @@ -1052,7 +1045,7 @@ namespace DiscImageChef.Commands } // ATIP exists on blank CDs - sense = dev.ReadAtip(out cmdBuf, out senseBuf, dev.Timeout, out duration); + sense = dev.ReadAtip(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: ATIP\n{0}", Sense.PrettifySense(senseBuf)); @@ -1074,7 +1067,7 @@ namespace DiscImageChef.Commands { sense = dev.ReadDiscInformation(out cmdBuf, out senseBuf, MmcDiscInformationDataTypes.DiscInformation, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC INFORMATION 000b\n{0}", Sense.PrettifySense(senseBuf)); @@ -1106,7 +1099,7 @@ namespace DiscImageChef.Commands int sessions = 1; int firstTrackLastSession = 0; - sense = dev.ReadSessionInfo(out cmdBuf, out senseBuf, dev.Timeout, out duration); + sense = dev.ReadSessionInfo(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: Session info\n{0}", Sense.PrettifySense(senseBuf)); @@ -1159,7 +1152,7 @@ namespace DiscImageChef.Commands if(hasVideoTrack && !hasDataTrack && sessions == 1) dskType = MediaType.CDV; } - sense = dev.ReadRawToc(out cmdBuf, out senseBuf, 1, dev.Timeout, out duration); + sense = dev.ReadRawToc(out cmdBuf, out senseBuf, 1, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: Raw TOC\n{0}", Sense.PrettifySense(senseBuf)); @@ -1169,7 +1162,7 @@ namespace DiscImageChef.Commands "SCSI READ TOC/PMA/ATIP", cmdBuf); DicConsole.WriteLine("Raw TOC:\n{0}", FullTOC.Prettify(cmdBuf)); } - sense = dev.ReadPma(out cmdBuf, out senseBuf, dev.Timeout, out duration); + sense = dev.ReadPma(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: PMA\n{0}", Sense.PrettifySense(senseBuf)); @@ -1180,7 +1173,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("PMA:\n{0}", PMA.Prettify(cmdBuf)); } - sense = dev.ReadCdText(out cmdBuf, out senseBuf, dev.Timeout, out duration); + sense = dev.ReadCdText(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: CD-TEXT\n{0}", Sense.PrettifySense(senseBuf)); @@ -1203,7 +1196,7 @@ namespace DiscImageChef.Commands { sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: PFI\n{0}", Sense.PrettifySense(senseBuf)); @@ -1227,7 +1220,7 @@ namespace DiscImageChef.Commands } sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, MmcDiscStructureFormat.DiscManufacturingInformation, 0, dev.Timeout, - out duration); + out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DMI\n{0}", Sense.PrettifySense(senseBuf)); @@ -1244,16 +1237,15 @@ namespace DiscImageChef.Commands case MediaType.XGD2: case MediaType.XGD3: // We need to get INQUIRY to know if it is a Kreon drive - byte[] inqBuffer; Inquiry.SCSIInquiry? inq; - sense = dev.ScsiInquiry(out inqBuffer, out senseBuf); + sense = dev.ScsiInquiry(out byte[] inqBuffer, out senseBuf); if(!sense) { inq = Inquiry.Decode(inqBuffer); if(inq.HasValue && inq.Value.KreonPresent) { - sense = dev.KreonExtractSs(out cmdBuf, out senseBuf, dev.Timeout, out duration); + sense = dev.KreonExtractSs(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "KREON EXTRACT SS:\n{0}", Sense.PrettifySense(senseBuf)); @@ -1268,14 +1260,14 @@ namespace DiscImageChef.Commands // Get video partition size DicConsole.DebugWriteLine("Dump-media command", "Getting video partition size"); - sense = dev.KreonLock(out senseBuf, dev.Timeout, out duration); + sense = dev.KreonLock(out senseBuf, dev.Timeout, out _); if(sense) { DicConsole.ErrorWriteLine("Cannot lock drive, not continuing."); return; } - sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out duration); + sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense) { DicConsole.ErrorWriteLine("Cannot get disc capacity."); @@ -1284,7 +1276,7 @@ namespace DiscImageChef.Commands totalSize = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, - MmcDiscStructureFormat.PhysicalInformation, 0, 0, out duration); + MmcDiscStructureFormat.PhysicalInformation, 0, 0, out _); if(sense) { DicConsole.ErrorWriteLine("Cannot get PFI."); @@ -1299,14 +1291,14 @@ namespace DiscImageChef.Commands // Get game partition size DicConsole.DebugWriteLine("Dump-media command", "Getting game partition size"); - sense = dev.KreonUnlockXtreme(out senseBuf, dev.Timeout, out duration); + sense = dev.KreonUnlockXtreme(out senseBuf, dev.Timeout, out _); if(sense) { DicConsole.ErrorWriteLine("Cannot unlock drive, not continuing."); return; } - sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out duration); + sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense) { DicConsole.ErrorWriteLine("Cannot get disc capacity."); @@ -1319,14 +1311,14 @@ namespace DiscImageChef.Commands // Get middle zone size DicConsole.DebugWriteLine("Dump-media command", "Getting middle zone size"); - sense = dev.KreonUnlockWxripper(out senseBuf, dev.Timeout, out duration); + sense = dev.KreonUnlockWxripper(out senseBuf, dev.Timeout, out _); if(sense) { DicConsole.ErrorWriteLine("Cannot unlock drive, not continuing."); return; } - sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out duration); + sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense) { DicConsole.ErrorWriteLine("Cannot get disc capacity."); @@ -1335,7 +1327,7 @@ namespace DiscImageChef.Commands totalSize = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0, - MmcDiscStructureFormat.PhysicalInformation, 0, 0, out duration); + MmcDiscStructureFormat.PhysicalInformation, 0, 0, out _); if(sense) { DicConsole.ErrorWriteLine("Cannot get PFI."); @@ -1373,7 +1365,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("Media identified as {0}", dskType); Core.Statistics.AddMedia(dskType, true); - sense = dev.ReadMediaSerialNumber(out cmdBuf, out senseBuf, dev.Timeout, out duration); + sense = dev.ReadMediaSerialNumber(out cmdBuf, out senseBuf, dev.Timeout, out _); if(sense) DicConsole.DebugWriteLine("Media-Info command", "READ MEDIA SERIAL NUMBER\n{0}", Sense.PrettifySense(senseBuf)); diff --git a/DiscImageChef/Commands/PrintHex.cs b/DiscImageChef/Commands/PrintHex.cs index 15b6bcdb..e2345e3b 100644 --- a/DiscImageChef/Commands/PrintHex.cs +++ b/DiscImageChef/Commands/PrintHex.cs @@ -71,7 +71,6 @@ namespace DiscImageChef.Commands for(ulong i = 0; i < options.Length; i++) { DicConsole.WriteLine("Sector {0}", options.StartSector + i); - byte[] sector; if(inputFormat.ImageInfo.ReadableSectorTags == null) { @@ -89,8 +88,7 @@ namespace DiscImageChef.Commands } } - if(options.LongSectors) sector = inputFormat.ReadSectorLong(options.StartSector + i); - else sector = inputFormat.ReadSector(options.StartSector + i); + byte[] sector = options.LongSectors ? inputFormat.ReadSectorLong(options.StartSector + i) : inputFormat.ReadSector(options.StartSector + i); DiscImageChef.PrintHex.PrintHexArray(sector, options.WidthBytes); } diff --git a/DiscImageChef/Commands/Statistics.cs b/DiscImageChef/Commands/Statistics.cs index cf9c8a8a..65cfe129 100644 --- a/DiscImageChef/Commands/Statistics.cs +++ b/DiscImageChef/Commands/Statistics.cs @@ -182,12 +182,8 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("Media statistics"); DicConsole.WriteLine("================"); foreach(MediaStats ms in Core.Statistics.AllStats.Medias) - if(ms.real) - DicConsole.WriteLine("Media type {0} has been found {1} times in a real device.", ms.type, - ms.Value); - else - DicConsole.WriteLine("Media type {0} has been found {1} times in a media image.", ms.type, - ms.Value); + DicConsole.WriteLine("Media type {0} has been found {1} times in a {2} image.", ms.type, + ms.Value, ms.real ? "real" : "media"); DicConsole.WriteLine(); thereAreStats = true; diff --git a/DiscImageChef/Commands/Verify.cs b/DiscImageChef/Commands/Verify.cs index ac3ad4c3..c68f137b 100644 --- a/DiscImageChef/Commands/Verify.cs +++ b/DiscImageChef/Commands/Verify.cs @@ -108,8 +108,7 @@ namespace DiscImageChef.Commands try { List inputTracks = inputFormat.GetTracks(); - if(inputTracks.Count > 0) formatHasTracks = true; - else formatHasTracks = false; + formatHasTracks = inputTracks.Count > 0; } catch { formatHasTracks = false; } @@ -243,13 +242,13 @@ namespace DiscImageChef.Commands if(failingLbas.Count == (int)inputFormat.GetSectors()) DicConsole.VerboseWriteLine("\tall sectors."); else - for(int i = 0; i < failingLbas.Count; i++) DicConsole.VerboseWriteLine("\t{0}", failingLbas[i]); + foreach(ulong t in failingLbas) DicConsole.VerboseWriteLine("\t{0}", t); DicConsole.WriteLine("LBAs without checksum:"); if(unknownLbas.Count == (int)inputFormat.GetSectors()) DicConsole.VerboseWriteLine("\tall sectors."); else - for(int i = 0; i < unknownLbas.Count; i++) DicConsole.VerboseWriteLine("\t{0}", unknownLbas[i]); + foreach(ulong t in unknownLbas) DicConsole.VerboseWriteLine("\t{0}", t); } DicConsole.WriteLine("Total sectors........... {0}", inputFormat.GetSectors());