Store and use undecoded buffers for ATA IDENTIFY (PACKET) DEVICE, SCSI INQUIRY and SCSI MODE PAGE 2Ah in device reports.

DiscImageChef.CommonTypes/Metadata/DeviceReportV2.cs

@@ -39,6 +39,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Linq;
 using System.Text;
 using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.Decoders.ATA;
@@ -74,6 +75,18 @@ namespace DiscImageChef.CommonTypes.Metadata
             {
                 SCSI = new Scsi(reportV1.SCSI);
                 Type = DeviceType.SCSI;
+
+                if(SCSI.ModeSense?.ModePages?.FirstOrDefault(p => p.page == 0x2A)?.value != null)
+                {
+                    if(SCSI.MultiMediaDevice != null)
+                        SCSI.MultiMediaDevice.ModeSense2AData =
+                            SCSI.ModeSense?.ModePages?.FirstOrDefault(p => p.page == 0x2A)?.value;
+                    else if(SCSI.Inquiry?.PeripheralDeviceType == (byte)PeripheralDeviceTypes.MultiMediaDevice)
+                        SCSI.MultiMediaDevice = new Mmc
+                        {
+                            ModeSense2AData = SCSI.ModeSense?.ModePages?.FirstOrDefault(p => p.page == 0x2A)?.value
+                        };
+                }
             }
 
             if(reportV1.ATAPI != null)
@@ -211,8 +224,6 @@ namespace DiscImageChef.CommonTypes.Metadata
 
     public class Ata
     {
-        public Identify.IdentifyDevice? IdentifyDevice;
-
         public Ata() { }
 
         public Ata(ataType ata)
@@ -229,11 +240,7 @@ namespace DiscImageChef.CommonTypes.Metadata
                     RemovableMedias.Add(new TestedMedia(ataRemovableMedia, true));
             }
 
-            if(Identify != null)
+            if(Identify != null) return;
-            {
-                IdentifyDevice = Decoders.ATA.Identify.Decode(Identify);
-                return;
-            }
 
             Identify.IdentifyDevice identifyDevice = new Identify.IdentifyDevice();
 
@@ -398,9 +405,11 @@ namespace DiscImageChef.CommonTypes.Metadata
 
             if(ata.WRVSectorCountMode2Specified) identifyDevice.WRVSectorCountMode2 = ata.WRVSectorCountMode2;
 
-            IdentifyDevice = identifyDevice;
+            Identify = Decoders.ATA.Identify.Encode(identifyDevice);
         }
 
+        public Identify.IdentifyDevice? IdentifyDevice => Decoders.ATA.Identify.Decode(Identify);
+
         [JsonIgnore]
         public int Id { get;                                     set; }
         public         byte[]            Identify         { get; set; }
@@ -447,8 +456,6 @@ namespace DiscImageChef.CommonTypes.Metadata
 
     public class Scsi
     {
-        public Inquiry.SCSIInquiry? Inquiry;
-
         public Scsi() { }
 
         public Scsi(scsiType scsi)
@@ -482,11 +489,7 @@ namespace DiscImageChef.CommonTypes.Metadata
 
             if(scsi.SequentialDevice != null) SequentialDevice = new Ssc(scsi.SequentialDevice);
 
-            if(InquiryData != null)
+            if(InquiryData != null) return;
-            {
-                Inquiry = Decoders.SCSI.Inquiry.Decode(InquiryData);
-                return;
-            }
 
             Inquiry.SCSIInquiry inq = new Inquiry.SCSIInquiry();
 
@@ -553,9 +556,11 @@ namespace DiscImageChef.CommonTypes.Metadata
             inq.WBus16               = scsi.Inquiry.WideBus16;
             inq.WBus32               = scsi.Inquiry.WideBus32;
 
-            Inquiry = inq;
+            InquiryData = Decoders.SCSI.Inquiry.Encode(inq);
         }
 
+        public Inquiry.SCSIInquiry? Inquiry => Decoders.SCSI.Inquiry.Decode(InquiryData);
+
         [JsonIgnore]
         public int Id { get;                                         set; }
         public         byte[]            InquiryData          { get; set; }
@@ -672,7 +677,7 @@ namespace DiscImageChef.CommonTypes.Metadata
         public Mmc(mmcType mmc)
         {
             if(mmc.ModeSense2A != null)
-                ModeSense2A = new Modes.ModePage_2A
+                ModeSense2AData = Modes.EncodeModePage_2A(new Modes.ModePage_2A
                 {
                     AccurateCDDA = mmc.ModeSense2A.AccurateCDDA,
                     BCK          = mmc.ModeSense2A.BCK,
@@ -682,15 +687,20 @@ namespace DiscImageChef.CommonTypes.Metadata
                     Lock         = mmc.ModeSense2A.CanLockMedia,
                     CDDACommand  = mmc.ModeSense2A.CDDACommand,
                     Composite    = mmc.ModeSense2A.CompositeAudioVideo,
-                    CMRSupported                     = (ushort)(mmc.ModeSense2A.CSSandCPPMSupported ? 1 : 0),
+                    CMRSupported =
+                        (ushort)(mmc.ModeSense2A.CSSandCPPMSupported
+                                     ? 1
+                                     : 0),
                     CurrentSpeed      = mmc.ModeSense2A.CurrentSpeed,
                     CurrentWriteSpeed = mmc.ModeSense2A.CurrentWriteSpeed,
-                    CurrentWriteSpeedSelected        = mmc.ModeSense2A.CurrentWriteSpeedSelected,
+                    CurrentWriteSpeedSelected =
+                        mmc.ModeSense2A.CurrentWriteSpeedSelected,
                     SDP          = mmc.ModeSense2A.DeterministicSlotChanger,
                     DigitalPort1 = mmc.ModeSense2A.DigitalPort1,
                     DigitalPort2 = mmc.ModeSense2A.DigitalPort2,
                     LeadInPW     = mmc.ModeSense2A.LeadInPW,
-                    LoadingMechanism                 = mmc.ModeSense2A.LoadingMechanismType,
+                    LoadingMechanism =
+                        mmc.ModeSense2A.LoadingMechanismType,
                     LockState     = mmc.ModeSense2A.LockStatus,
                     LSBF          = mmc.ModeSense2A.LSBF,
                     MaximumSpeed  = mmc.ModeSense2A.MaximumSpeed,
@@ -702,7 +712,8 @@ namespace DiscImageChef.CommonTypes.Metadata
                     SCC           = mmc.ModeSense2A.ReadsBothSides,
                     ReadCDR       = mmc.ModeSense2A.ReadsCDR,
                     ReadCDRW      = mmc.ModeSense2A.ReadsCDRW,
-                    DeinterlaveSubchannel            = mmc.ModeSense2A.ReadsDeinterlavedSubchannel,
+                    DeinterlaveSubchannel =
+                        mmc.ModeSense2A.ReadsDeinterlavedSubchannel,
                     ReadDVDR   = mmc.ModeSense2A.ReadsDVDR,
                     ReadDVDRAM = mmc.ModeSense2A.ReadsDVDRAM,
                     ReadDVDROM = mmc.ModeSense2A.ReadsDVDROM,
@@ -713,19 +724,25 @@ namespace DiscImageChef.CommonTypes.Metadata
                     Subchannel = mmc.ModeSense2A.ReadsSubchannel,
                     UPC        = mmc.ModeSense2A.ReadsUPC,
                     C2Pointer  = mmc.ModeSense2A.ReturnsC2Pointers,
-                    RotationControlSelected          = mmc.ModeSense2A.RotationControlSelected,
+                    RotationControlSelected =
-                    SeparateChannelMute              = mmc.ModeSense2A.SeparateChannelMute,
+                        mmc.ModeSense2A.RotationControlSelected,
-                    SeparateChannelVolume            = mmc.ModeSense2A.SeparateChannelVolume,
+                    SeparateChannelMute =
+                        mmc.ModeSense2A.SeparateChannelMute,
+                    SeparateChannelVolume =
+                        mmc.ModeSense2A.SeparateChannelVolume,
                     SSS          = mmc.ModeSense2A.SSS,
                     MultiSession = mmc.ModeSense2A.SupportsMultiSession,
-                    SupportedVolumeLevels            = mmc.ModeSense2A.SupportedVolumeLevels,
+                    SupportedVolumeLevels =
+                        mmc.ModeSense2A.SupportedVolumeLevels,
                     TestWrite   = mmc.ModeSense2A.TestWrite,
                     WriteCDR    = mmc.ModeSense2A.WritesCDR,
                     WriteCDRW   = mmc.ModeSense2A.WritesCDRW,
                     WriteDVDR   = mmc.ModeSense2A.WritesDVDR,
                     WriteDVDRAM = mmc.ModeSense2A.WritesDVDRAM,
-                    WriteSpeedPerformanceDescriptors = mmc.ModeSense2A.WriteSpeedPerformanceDescriptors
+                    WriteSpeedPerformanceDescriptors =
-                };
+                        mmc.ModeSense2A.WriteSpeedPerformanceDescriptors
+                });
+
             if(mmc.Features != null) Features = new MmcFeatures(mmc.Features);
 
             if(mmc.TestedMedia == null) return;
@@ -736,9 +753,10 @@ namespace DiscImageChef.CommonTypes.Metadata
 
         [JsonIgnore]
         public int Id { get; set; }
-        public virtual Modes.ModePage_2A ModeSense2A { get; set; }
+        public virtual Modes.ModePage_2A ModeSense2A     => Modes.DecodeModePage_2A(ModeSense2AData);
         public virtual MmcFeatures       Features        { get; set; }
         public virtual List<TestedMedia> TestedMedia     { get; set; }
+        public         byte[]            ModeSense2AData { get; set; }
     }
 
     public class MmcFeatures

DiscImageChef.Core/Devices/Report/Scsi.cs

@@ -51,9 +51,7 @@ namespace DiscImageChef.Core.Devices.Report
 
             if(sense || !Inquiry.Decode(buffer).HasValue) return null;
 
-            report.Inquiry = Inquiry.Decode(buffer);
+            report.InquiryData = buffer;
-
-            if(debug) report.InquiryData = buffer;
 
             return report;
         }
@@ -82,7 +80,7 @@ namespace DiscImageChef.Core.Devices.Report
             return evpds.Count > 0 ? evpds : null;
         }
 
-        public void ReportScsiModes(ref DeviceReportV2 report, ref Modes.ModePage_2A cdromMode)
+        public void ReportScsiModes(ref DeviceReportV2 report, out byte[] cdromMode)
         {
             Modes.DecodedMode?    decMode = null;
             PeripheralDeviceTypes devType = dev.ScsiType;
@@ -157,7 +155,7 @@ namespace DiscImageChef.Core.Devices.Report
                 modePages.Add(modePage);
 
                 if(modePage.page == 0x2A && modePage.subpage == 0x00)
-                    cdromMode = Modes.DecodeModePage_2A(page.PageResponse);
+                    cdromMode = page.PageResponse;
             }
 
             if(modePages.Count > 0) report.SCSI.ModeSense.ModePages = modePages;

DiscImageChef.Core/Statistics.cs

@@ -37,6 +37,7 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Threading;
+using System.Xml;
 using System.Xml.Serialization;
 using DiscImageChef.CommonTypes.Interop;
 using DiscImageChef.CommonTypes.Metadata;
@@ -44,6 +45,7 @@ using DiscImageChef.Database;
 using DiscImageChef.Database.Models;
 using Newtonsoft.Json;
 using Device = DiscImageChef.Devices.Device;
+using Formatting = Newtonsoft.Json.Formatting;
 using MediaType = DiscImageChef.CommonTypes.MediaType;
 using OperatingSystem = DiscImageChef.Database.Models.OperatingSystem;
 using Version = DiscImageChef.Database.Models.Version;
@@ -68,10 +70,13 @@ namespace DiscImageChef.Core
         public static void LoadStats()
         {
             if(File.Exists(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml")))
+            {
+                try
                 {
                     Stats         allStats = new Stats();
                     XmlSerializer xs       = new XmlSerializer(allStats.GetType());
-                StreamReader  sr       = new StreamReader(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml"));
+                    StreamReader sr =
+                        new StreamReader(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml"));
                     allStats = (Stats)xs.Deserialize(sr);
                     sr.Close();
 
@@ -88,7 +93,8 @@ namespace DiscImageChef.Core
 
                         if(allStats.Commands.Benchmark > 0)
                         {
-                        Command command = ctx.Commands.FirstOrDefault(c => c.Name == "benchmark" && c.Synchronized) ??
+                            Command command =
+                                ctx.Commands.FirstOrDefault(c => c.Name == "benchmark" && c.Synchronized) ??
                                 new Command {Name = "benchmark", Synchronized = true};
 
                             command.Count += (ulong)allStats.Commands.Benchmark;
@@ -97,7 +103,8 @@ namespace DiscImageChef.Core
 
                         if(allStats.Commands.Checksum > 0)
                         {
-                        Command command = ctx.Commands.FirstOrDefault(c => c.Name == "checksum" && c.Synchronized) ??
+                            Command command =
+                                ctx.Commands.FirstOrDefault(c => c.Name == "checksum" && c.Synchronized) ??
                                 new Command {Name = "checksum", Synchronized = true};
 
                             command.Count += (ulong)allStats.Commands.Checksum;
@@ -144,7 +151,8 @@ namespace DiscImageChef.Core
 
                         if(allStats.Commands.DeviceInfo > 0)
                         {
-                        Command command = ctx.Commands.FirstOrDefault(c => c.Name == "device-info" && c.Synchronized) ??
+                            Command command =
+                                ctx.Commands.FirstOrDefault(c => c.Name == "device-info" && c.Synchronized) ??
                                 new Command {Name = "device-info", Synchronized = true};
 
                             command.Count += (ulong)allStats.Commands.DeviceInfo;
@@ -163,7 +171,8 @@ namespace DiscImageChef.Core
 
                         if(allStats.Commands.DumpMedia > 0)
                         {
-                        Command command = ctx.Commands.FirstOrDefault(c => c.Name == "dump-media" && c.Synchronized) ??
+                            Command command =
+                                ctx.Commands.FirstOrDefault(c => c.Name == "dump-media" && c.Synchronized) ??
                                 new Command {Name = "dump-media", Synchronized = true};
 
                             command.Count += (ulong)allStats.Commands.DumpMedia;
@@ -200,7 +209,8 @@ namespace DiscImageChef.Core
 
                         if(allStats.Commands.ImageInfo > 0)
                         {
-                        Command command = ctx.Commands.FirstOrDefault(c => c.Name == "image-info" && c.Synchronized) ??
+                            Command command =
+                                ctx.Commands.FirstOrDefault(c => c.Name == "image-info" && c.Synchronized) ??
                                 new Command {Name = "image-info", Synchronized = true};
 
                             command.Count += (ulong)allStats.Commands.ImageInfo;
@@ -238,7 +248,8 @@ namespace DiscImageChef.Core
 
                         if(allStats.Commands.MediaInfo > 0)
                         {
-                        Command command = ctx.Commands.FirstOrDefault(c => c.Name == "media-info" && c.Synchronized) ??
+                            Command command =
+                                ctx.Commands.FirstOrDefault(c => c.Name == "media-info" && c.Synchronized) ??
                                 new Command {Name = "media-info", Synchronized = true};
 
                             command.Count += (ulong)allStats.Commands.MediaInfo;
@@ -247,7 +258,8 @@ namespace DiscImageChef.Core
 
                         if(allStats.Commands.MediaScan > 0)
                         {
-                        Command command = ctx.Commands.FirstOrDefault(c => c.Name == "media-scan" && c.Synchronized) ??
+                            Command command =
+                                ctx.Commands.FirstOrDefault(c => c.Name == "media-scan" && c.Synchronized) ??
                                 new Command {Name = "media-scan", Synchronized = true};
 
                             command.Count += (ulong)allStats.Commands.MediaScan;
@@ -256,7 +268,8 @@ namespace DiscImageChef.Core
 
                         if(allStats.Commands.PrintHex > 0)
                         {
-                        Command command = ctx.Commands.FirstOrDefault(c => c.Name == "printhex" && c.Synchronized) ??
+                            Command command =
+                                ctx.Commands.FirstOrDefault(c => c.Name == "printhex" && c.Synchronized) ??
                                 new Command {Name = "printhex", Synchronized = true};
 
                             command.Count += (ulong)allStats.Commands.PrintHex;
@@ -284,7 +297,9 @@ namespace DiscImageChef.Core
                                                                          c.Version == operatingSystem.version &&
                                                                          c.Synchronized) ?? new OperatingSystem
                                 {
-                                Name = operatingSystem.name, Version = operatingSystem.version, Synchronized = true
+                                    Name         = operatingSystem.name,
+                                    Version      = operatingSystem.version,
+                                    Synchronized = true
                                 };
 
                             existing.Count += (ulong)operatingSystem.Value;
@@ -296,7 +311,8 @@ namespace DiscImageChef.Core
                         {
                             if(string.IsNullOrWhiteSpace(nvs.name)) continue;
 
-                        Version existing = ctx.Versions.FirstOrDefault(c => c.Value == nvs.name && c.Synchronized) ??
+                            Version existing =
+                                ctx.Versions.FirstOrDefault(c => c.Value == nvs.name && c.Synchronized) ??
                                 new Version {Value = nvs.name, Synchronized = true};
 
                             existing.Count += (ulong)nvs.Value;
@@ -321,7 +337,8 @@ namespace DiscImageChef.Core
                         {
                             if(string.IsNullOrWhiteSpace(nvs.name)) continue;
 
-                        Partition existing = ctx.Partitions.FirstOrDefault(c => c.Name == nvs.name && c.Synchronized) ??
+                            Partition existing =
+                                ctx.Partitions.FirstOrDefault(c => c.Name == nvs.name && c.Synchronized) ??
                                 new Partition {Name = nvs.name, Synchronized = true};
 
                             existing.Count += (ulong)nvs.Value;
@@ -369,9 +386,10 @@ namespace DiscImageChef.Core
                     if(allStats.Devices != null)
                         foreach(DeviceStats device in allStats.Devices)
                         {
-                        if(ctx.SeenDevices.Any(d => d.Manufacturer == device.Manufacturer && d.Model == device.Model &&
+                            if(ctx.SeenDevices.Any(d => d.Manufacturer == device.Manufacturer &&
-                                                    d.Revision     == device.Revision     && d.Bus   == device.Bus))
+                                                        d.Model        == device.Model        &&
-                            continue;
+                                                        d.Revision     == device.Revision     &&
+                                                        d.Bus          == device.Bus)) continue;
 
                             ctx.SeenDevices.Add(new DeviceStat
                             {
@@ -402,6 +420,11 @@ namespace DiscImageChef.Core
                     ctx.SaveChanges();
                     File.Delete(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml"));
                 }
+                catch(XmlException)
+                {
+                    // Do not care about it
+                }
+            }
 
             if(Settings.Settings.Current.Stats == null) return;
 

DiscImageChef/Commands/DeviceReport.cs

@@ -168,7 +168,7 @@ namespace DiscImageChef.Commands
 
                     if(!Identify.Decode(buffer).HasValue) break;
 
-                    report.ATA = new Ata {IdentifyDevice = Identify.Decode(buffer)};
+                    report.ATA = new Ata {Identify = buffer};
 
                     if(report.ATA.IdentifyDevice == null) break;
 
@@ -199,8 +199,7 @@ namespace DiscImageChef.Commands
                         System.Console.ReadKey(true);
                         DicConsole.WriteLine("Querying ATA IDENTIFY...");
                         dev.AtaIdentify(out buffer, out _, dev.Timeout, out _);
-                        report.ATA.IdentifyDevice = Identify.Decode(buffer);
+                        report.ATA.Identify = buffer;
-                        if(options.Debug) report.ATA.Identify = buffer;
                         List<TestedMedia> mediaTests          = new List<TestedMedia>();
 
                         pressedKey = new ConsoleKeyInfo();
@@ -252,9 +251,7 @@ namespace DiscImageChef.Commands
                     if(!Identify.Decode(buffer).HasValue) return;
 
                     Identify.IdentifyDevice? atapiIdNullable = Identify.Decode(buffer);
-                    if(atapiIdNullable != null) report.ATAPI = new Ata {IdentifyDevice = atapiIdNullable};
+                    report.ATAPI.Identify = buffer;
-
-                    if(options.Debug) report.ATAPI.Identify = buffer;
 
                     goto case DeviceType.SCSI;
                 case DeviceType.SCSI:
@@ -297,9 +294,7 @@ namespace DiscImageChef.Commands
 
                     report.SCSI.EVPDPages = reporter.ReportEvpdPages();
 
-                    Modes.ModePage_2A cdromMode = null;
+                    reporter.ReportScsiModes(ref report, out byte[] cdromMode);
-
-                    reporter.ReportScsiModes(ref report, ref cdromMode);
 
                     string mediumManufacturer;
                     byte[] senseBuffer;
@@ -313,18 +308,18 @@ namespace DiscImageChef.Commands
 
                             report.SCSI.MultiMediaDevice = new Mmc
                             {
-                                ModeSense2A = cdromMode, Features = reporter.ReportMmcFeatures()
+                                ModeSense2AData = cdromMode, Features = reporter.ReportMmcFeatures()
                             };
 
                             if(cdromMode != null)
                             {
                                 mediaTypes.Add("CD-ROM");
                                 mediaTypes.Add("Audio CD");
-                                if(cdromMode.ReadCDR) mediaTypes.Add("CD-R");
+                                if(report.SCSI.MultiMediaDevice.ModeSense2A.ReadCDR) mediaTypes.Add("CD-R");
-                                if(cdromMode.ReadCDRW) mediaTypes.Add("CD-RW");
+                                if(report.SCSI.MultiMediaDevice.ModeSense2A.ReadCDRW) mediaTypes.Add("CD-RW");
-                                if(cdromMode.ReadDVDROM) mediaTypes.Add("DVD-ROM");
+                                if(report.SCSI.MultiMediaDevice.ModeSense2A.ReadDVDROM) mediaTypes.Add("DVD-ROM");
-                                if(cdromMode.ReadDVDRAM) mediaTypes.Add("DVD-RAM");
+                                if(report.SCSI.MultiMediaDevice.ModeSense2A.ReadDVDRAM) mediaTypes.Add("DVD-RAM");
-                                if(cdromMode.ReadDVDR) mediaTypes.Add("DVD-R");
+                                if(report.SCSI.MultiMediaDevice.ModeSense2A.ReadDVDR) mediaTypes.Add("DVD-R");
                             }
 
                             if(report.SCSI.MultiMediaDevice.Features != null)