From 0696a82916dd92a56e56ac8ed450c6e8f058d94b Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Tue, 27 Nov 2018 00:23:05 +0000
Subject: [PATCH] Add basic fields to device report.

---
 .../.idea/contentModel.xml                    |    3 +
 .../Metadata/DeviceReportV2.cs                |    6 +
 ...127001622_AddDeviceBasicFields.Designer.cs | 1182 +++++++++++++++++
 .../20181127001622_AddDeviceBasicFields.cs    |   50 +
 .../Migrations/DicContextModelSnapshot.cs     |    8 +
 DiscImageChef.Database/Models/Device.cs       |    9 +
 DiscImageChef.Database/Models/Report.cs       |   10 +
 DiscImageChef/Commands/DeviceReport.cs        |    9 +-
 8 files changed, 1274 insertions(+), 3 deletions(-)
 create mode 100644 DiscImageChef.Database/Migrations/20181127001622_AddDeviceBasicFields.Designer.cs
 create mode 100644 DiscImageChef.Database/Migrations/20181127001622_AddDeviceBasicFields.cs

diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
index 1a30998db..c12ae9fc1 100644
--- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml
+++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
@@ -296,6 +296,8 @@
         <e p="Migrations" t="Include">
           <e p="20181126222301_DeviceReportV2.Designer.cs" t="Include" />
           <e p="20181126222301_DeviceReportV2.cs" t="Include" />
+          <e p="20181127001622_AddDeviceBasicFields.Designer.cs" t="Include" />
+          <e p="20181127001622_AddDeviceBasicFields.cs" t="Include" />
           <e p="DicContextModelSnapshot.cs" t="Include" />
         </e>
         <e p="Models" t="Include">
@@ -1102,6 +1104,7 @@
         <e p="DiscImageChef.EntityFramework.csproj" t="IncludeRecursive" />
         <e p="Program.cs" t="Include" />
         <e p="bin" t="ExcludeRecursive" />
+        <e p="discimagechef.db" t="Include" />
         <e p="obj" t="ExcludeRecursive">
           <e p="Debug" t="Include">
             <e p="netcoreapp2.1" t="Include">
diff --git a/DiscImageChef.CommonTypes/Metadata/DeviceReportV2.cs b/DiscImageChef.CommonTypes/Metadata/DeviceReportV2.cs
index a1c07dd40..99491eeac 100644
--- a/DiscImageChef.CommonTypes/Metadata/DeviceReportV2.cs
+++ b/DiscImageChef.CommonTypes/Metadata/DeviceReportV2.cs
@@ -38,6 +38,7 @@
 
 using System;
 using System.ComponentModel.DataAnnotations;
+using DiscImageChef.CommonTypes.Enums;
 using DiscImageChef.Decoders.ATA;
 using DiscImageChef.Decoders.SCSI;
 using DiscImageChef.Decoders.SCSI.MMC;
@@ -61,6 +62,11 @@ namespace DiscImageChef.CommonTypes.Metadata
         public Scsi     SCSI           { get; set; }
         public MmcSd    MultiMediaCard { get; set; }
         public MmcSd    SecureDigital  { get; set; }
+
+        public string     Manufacturer { get; set; }
+        public string     Model        { get; set; }
+        public string     Revision     { get; set; }
+        public DeviceType Type         { get; set; }
     }
 
     public class Usb
diff --git a/DiscImageChef.Database/Migrations/20181127001622_AddDeviceBasicFields.Designer.cs b/DiscImageChef.Database/Migrations/20181127001622_AddDeviceBasicFields.Designer.cs
new file mode 100644
index 000000000..4cc894a8b
--- /dev/null
+++ b/DiscImageChef.Database/Migrations/20181127001622_AddDeviceBasicFields.Designer.cs
@@ -0,0 +1,1182 @@
+// <auto-generated />
+using System;
+using DiscImageChef.Database;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+namespace DiscImageChef.Database.Migrations
+{
+    [DbContext(typeof(DicContext))]
+    [Migration("20181127001622_AddDeviceBasicFields")]
+    partial class AddDeviceBasicFields
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.1.4-rtm-31024");
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Ata", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<byte[]>("Identify");
+
+                    b.Property<int?>("ReadCapabilitiesId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ReadCapabilitiesId");
+
+                    b.ToTable("Ata");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.BlockDescriptor", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<uint?>("BlockLength");
+
+                    b.Property<ulong?>("Blocks");
+
+                    b.Property<byte>("Density");
+
+                    b.Property<int?>("ScsiModeId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScsiModeId");
+
+                    b.ToTable("BlockDescriptor");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Chs", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<ushort>("Cylinders");
+
+                    b.Property<ushort>("Heads");
+
+                    b.Property<ushort>("Sectors");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Chs");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.DensityCode", b =>
+                {
+                    b.Property<int>("Code")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int?>("SscSupportedMediaId");
+
+                    b.HasKey("Code");
+
+                    b.HasIndex("SscSupportedMediaId");
+
+                    b.ToTable("DensityCode");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.DeviceReportV2", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int?>("ATAId");
+
+                    b.Property<int?>("ATAPIId");
+
+                    b.Property<bool>("CompactFlash");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired();
+
+                    b.Property<int?>("FireWireId");
+
+                    b.Property<string>("Manufacturer");
+
+                    b.Property<string>("Model");
+
+                    b.Property<int?>("MultiMediaCardId");
+
+                    b.Property<int?>("PCMCIAId");
+
+                    b.Property<string>("Revision");
+
+                    b.Property<int?>("SCSIId");
+
+                    b.Property<int?>("SecureDigitalId");
+
+                    b.Property<int>("Type");
+
+                    b.Property<int?>("USBId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ATAId");
+
+                    b.HasIndex("ATAPIId");
+
+                    b.HasIndex("FireWireId");
+
+                    b.HasIndex("MultiMediaCardId");
+
+                    b.HasIndex("PCMCIAId");
+
+                    b.HasIndex("SCSIId");
+
+                    b.HasIndex("SecureDigitalId");
+
+                    b.HasIndex("USBId");
+
+                    b.ToTable("Reports");
+
+                    b.HasDiscriminator<string>("Discriminator").HasValue("DeviceReportV2");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.FireWire", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Manufacturer");
+
+                    b.Property<string>("Product");
+
+                    b.Property<uint>("ProductID");
+
+                    b.Property<bool>("RemovableMedia");
+
+                    b.Property<uint>("VendorID");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("FireWire");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Mmc", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int?>("FeaturesId");
+
+                    b.Property<int?>("ModeSense2AId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FeaturesId");
+
+                    b.HasIndex("ModeSense2AId");
+
+                    b.ToTable("Mmc");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.MmcFeatures", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<byte?>("AACSVersion");
+
+                    b.Property<byte?>("AGIDs");
+
+                    b.Property<byte?>("BindingNonceBlocks");
+
+                    b.Property<ushort?>("BlocksPerReadableUnit");
+
+                    b.Property<bool>("BufferUnderrunFreeInDVD");
+
+                    b.Property<bool>("BufferUnderrunFreeInSAO");
+
+                    b.Property<bool>("BufferUnderrunFreeInTAO");
+
+                    b.Property<byte?>("CPRMVersion");
+
+                    b.Property<byte?>("CSSVersion");
+
+                    b.Property<bool>("CanAudioScan");
+
+                    b.Property<bool>("CanEject");
+
+                    b.Property<bool>("CanEraseSector");
+
+                    b.Property<bool>("CanExpandBDRESpareArea");
+
+                    b.Property<bool>("CanFormat");
+
+                    b.Property<bool>("CanFormatBDREWithoutSpare");
+
+                    b.Property<bool>("CanFormatCert");
+
+                    b.Property<bool>("CanFormatFRF");
+
+                    b.Property<bool>("CanFormatQCert");
+
+                    b.Property<bool>("CanFormatRRM");
+
+                    b.Property<bool>("CanGenerateBindingNonce");
+
+                    b.Property<bool>("CanLoad");
+
+                    b.Property<bool>("CanMuteSeparateChannels");
+
+                    b.Property<bool>("CanOverwriteSAOTrack");
+
+                    b.Property<bool>("CanOverwriteTAOTrack");
+
+                    b.Property<bool>("CanPlayCDAudio");
+
+                    b.Property<bool>("CanPseudoOverwriteBDR");
+
+                    b.Property<bool>("CanReadAllDualR");
+
+                    b.Property<bool>("CanReadAllDualRW");
+
+                    b.Property<bool>("CanReadBD");
+
+                    b.Property<bool>("CanReadBDR");
+
+                    b.Property<bool>("CanReadBDRE1");
+
+                    b.Property<bool>("CanReadBDRE2");
+
+                    b.Property<bool>("CanReadBDROM");
+
+                    b.Property<bool>("CanReadBluBCA");
+
+                    b.Property<bool>("CanReadCD");
+
+                    b.Property<bool>("CanReadCDMRW");
+
+                    b.Property<bool>("CanReadCPRM_MKB");
+
+                    b.Property<bool>("CanReadDDCD");
+
+                    b.Property<bool>("CanReadDVD");
+
+                    b.Property<bool>("CanReadDVDPlusMRW");
+
+                    b.Property<bool>("CanReadDVDPlusR");
+
+                    b.Property<bool>("CanReadDVDPlusRDL");
+
+                    b.Property<bool>("CanReadDVDPlusRW");
+
+                    b.Property<bool>("CanReadDVDPlusRWDL");
+
+                    b.Property<bool>("CanReadDriveAACSCertificate");
+
+                    b.Property<bool>("CanReadHDDVD");
+
+                    b.Property<bool>("CanReadHDDVDR");
+
+                    b.Property<bool>("CanReadHDDVDRAM");
+
+                    b.Property<bool>("CanReadLeadInCDText");
+
+                    b.Property<bool>("CanReadOldBDR");
+
+                    b.Property<bool>("CanReadOldBDRE");
+
+                    b.Property<bool>("CanReadOldBDROM");
+
+                    b.Property<bool>("CanReadSpareAreaInformation");
+
+                    b.Property<bool>("CanReportDriveSerial");
+
+                    b.Property<bool>("CanReportMediaSerial");
+
+                    b.Property<bool>("CanTestWriteDDCDR");
+
+                    b.Property<bool>("CanTestWriteDVD");
+
+                    b.Property<bool>("CanTestWriteInSAO");
+
+                    b.Property<bool>("CanTestWriteInTAO");
+
+                    b.Property<bool>("CanUpgradeFirmware");
+
+                    b.Property<bool>("CanWriteBD");
+
+                    b.Property<bool>("CanWriteBDR");
+
+                    b.Property<bool>("CanWriteBDRE1");
+
+                    b.Property<bool>("CanWriteBDRE2");
+
+                    b.Property<bool>("CanWriteBusEncryptedBlocks");
+
+                    b.Property<bool>("CanWriteCDMRW");
+
+                    b.Property<bool>("CanWriteCDRW");
+
+                    b.Property<bool>("CanWriteCDRWCAV");
+
+                    b.Property<bool>("CanWriteCDSAO");
+
+                    b.Property<bool>("CanWriteCDTAO");
+
+                    b.Property<bool>("CanWriteCSSManagedDVD");
+
+                    b.Property<bool>("CanWriteDDCDR");
+
+                    b.Property<bool>("CanWriteDDCDRW");
+
+                    b.Property<bool>("CanWriteDVDPlusMRW");
+
+                    b.Property<bool>("CanWriteDVDPlusR");
+
+                    b.Property<bool>("CanWriteDVDPlusRDL");
+
+                    b.Property<bool>("CanWriteDVDPlusRW");
+
+                    b.Property<bool>("CanWriteDVDPlusRWDL");
+
+                    b.Property<bool>("CanWriteDVDR");
+
+                    b.Property<bool>("CanWriteDVDRDL");
+
+                    b.Property<bool>("CanWriteDVDRW");
+
+                    b.Property<bool>("CanWriteHDDVDR");
+
+                    b.Property<bool>("CanWriteHDDVDRAM");
+
+                    b.Property<bool>("CanWriteOldBDR");
+
+                    b.Property<bool>("CanWriteOldBDRE");
+
+                    b.Property<bool>("CanWritePackedSubchannelInTAO");
+
+                    b.Property<bool>("CanWriteRWSubchannelInSAO");
+
+                    b.Property<bool>("CanWriteRWSubchannelInTAO");
+
+                    b.Property<bool>("CanWriteRaw");
+
+                    b.Property<bool>("CanWriteRawMultiSession");
+
+                    b.Property<bool>("CanWriteRawSubchannelInTAO");
+
+                    b.Property<bool>("ChangerIsSideChangeCapable");
+
+                    b.Property<byte>("ChangerSlots");
+
+                    b.Property<bool>("ChangerSupportsDiscPresent");
+
+                    b.Property<bool>("DBML");
+
+                    b.Property<bool>("DVDMultiRead");
+
+                    b.Property<bool>("EmbeddedChanger");
+
+                    b.Property<bool>("ErrorRecoveryPage");
+
+                    b.Property<DateTime?>("FirmwareDate");
+
+                    b.Property<byte?>("LoadingMechanismType");
+
+                    b.Property<bool>("Locked");
+
+                    b.Property<uint?>("LogicalBlockSize");
+
+                    b.Property<bool>("MultiRead");
+
+                    b.Property<uint?>("PhysicalInterfaceStandard");
+
+                    b.Property<uint?>("PhysicalInterfaceStandardNumber");
+
+                    b.Property<bool>("PreventJumper");
+
+                    b.Property<bool>("SupportsAACS");
+
+                    b.Property<bool>("SupportsBusEncryption");
+
+                    b.Property<bool>("SupportsC2");
+
+                    b.Property<bool>("SupportsCPRM");
+
+                    b.Property<bool>("SupportsCSS");
+
+                    b.Property<bool>("SupportsDAP");
+
+                    b.Property<bool>("SupportsDeviceBusyEvent");
+
+                    b.Property<bool>("SupportsHybridDiscs");
+
+                    b.Property<bool>("SupportsModePage1Ch");
+
+                    b.Property<bool>("SupportsOSSC");
+
+                    b.Property<bool>("SupportsPWP");
+
+                    b.Property<bool>("SupportsSWPP");
+
+                    b.Property<bool>("SupportsSecurDisc");
+
+                    b.Property<bool>("SupportsSeparateVolume");
+
+                    b.Property<bool>("SupportsVCPS");
+
+                    b.Property<bool>("SupportsWriteInhibitDCB");
+
+                    b.Property<bool>("SupportsWriteProtectPAC");
+
+                    b.Property<ushort?>("VolumeLevels");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MmcFeatures");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.MmcSd", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<byte[]>("CID");
+
+                    b.Property<byte[]>("CSD");
+
+                    b.Property<byte[]>("ExtendedCSD");
+
+                    b.Property<byte[]>("OCR");
+
+                    b.Property<byte[]>("SCR");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MmcSd");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Pcmcia", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<byte[]>("CIS");
+
+                    b.Property<ushort?>("CardCode");
+
+                    b.Property<string>("Compliance");
+
+                    b.Property<string>("Manufacturer");
+
+                    b.Property<ushort?>("ManufacturerCode");
+
+                    b.Property<string>("ProductName");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Pcmcia");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Scsi", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<byte[]>("InquiryData");
+
+                    b.Property<byte[]>("ModeSense10Data");
+
+                    b.Property<byte[]>("ModeSense6Data");
+
+                    b.Property<int?>("ModeSenseId");
+
+                    b.Property<int?>("MultiMediaDeviceId");
+
+                    b.Property<int?>("ReadCapabilitiesId");
+
+                    b.Property<int?>("SequentialDeviceId");
+
+                    b.Property<bool>("SupportsModeSense10");
+
+                    b.Property<bool>("SupportsModeSense6");
+
+                    b.Property<bool>("SupportsModeSubpages");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ModeSenseId");
+
+                    b.HasIndex("MultiMediaDeviceId");
+
+                    b.HasIndex("ReadCapabilitiesId");
+
+                    b.HasIndex("SequentialDeviceId");
+
+                    b.ToTable("Scsi");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.ScsiMode", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("BlankCheckEnabled");
+
+                    b.Property<byte?>("BufferedMode");
+
+                    b.Property<bool>("DPOandFUA");
+
+                    b.Property<byte?>("MediumType");
+
+                    b.Property<byte?>("Speed");
+
+                    b.Property<bool>("WriteProtected");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ScsiMode");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.ScsiPage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int?>("ScsiId");
+
+                    b.Property<int?>("ScsiModeId");
+
+                    b.Property<byte>("page");
+
+                    b.Property<byte?>("subpage");
+
+                    b.Property<byte[]>("value");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScsiId");
+
+                    b.HasIndex("ScsiModeId");
+
+                    b.ToTable("ScsiPage");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Ssc", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<byte?>("BlockSizeGranularity");
+
+                    b.Property<uint?>("MaxBlockLength");
+
+                    b.Property<uint?>("MinBlockLength");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Ssc");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.SscSupportedMedia", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Description");
+
+                    b.Property<ushort>("Length");
+
+                    b.Property<byte>("MediumType");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Organization");
+
+                    b.Property<int?>("SscId");
+
+                    b.Property<int?>("TestedSequentialMediaId");
+
+                    b.Property<ushort>("Width");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SscId");
+
+                    b.HasIndex("TestedSequentialMediaId");
+
+                    b.ToTable("SscSupportedMedia");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.SupportedDensity", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<uint>("BitsPerMm");
+
+                    b.Property<uint>("Capacity");
+
+                    b.Property<bool>("DefaultDensity");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("Duplicate");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Organization");
+
+                    b.Property<byte>("PrimaryCode");
+
+                    b.Property<byte>("SecondaryCode");
+
+                    b.Property<int?>("SscId");
+
+                    b.Property<int?>("TestedSequentialMediaId");
+
+                    b.Property<ushort>("Tracks");
+
+                    b.Property<ushort>("Width");
+
+                    b.Property<bool>("Writable");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SscId");
+
+                    b.HasIndex("TestedSequentialMediaId");
+
+                    b.ToTable("SupportedDensity");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.TestedMedia", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int?>("AtaId");
+
+                    b.Property<uint?>("BlockSize");
+
+                    b.Property<ulong?>("Blocks");
+
+                    b.Property<int?>("CHSId");
+
+                    b.Property<bool?>("CanReadAACS");
+
+                    b.Property<bool?>("CanReadADIP");
+
+                    b.Property<bool?>("CanReadATIP");
+
+                    b.Property<bool?>("CanReadBCA");
+
+                    b.Property<bool?>("CanReadC2Pointers");
+
+                    b.Property<bool?>("CanReadCMI");
+
+                    b.Property<bool?>("CanReadCorrectedSubchannel");
+
+                    b.Property<bool?>("CanReadCorrectedSubchannelWithC2");
+
+                    b.Property<bool?>("CanReadDCB");
+
+                    b.Property<bool?>("CanReadDDS");
+
+                    b.Property<bool?>("CanReadDMI");
+
+                    b.Property<bool?>("CanReadDiscInformation");
+
+                    b.Property<bool?>("CanReadFirstTrackPreGap");
+
+                    b.Property<bool?>("CanReadFullTOC");
+
+                    b.Property<bool?>("CanReadHDCMI");
+
+                    b.Property<bool?>("CanReadLayerCapacity");
+
+                    b.Property<bool?>("CanReadLeadIn");
+
+                    b.Property<bool?>("CanReadLeadOut");
+
+                    b.Property<bool?>("CanReadMediaID");
+
+                    b.Property<bool?>("CanReadMediaSerial");
+
+                    b.Property<bool?>("CanReadPAC");
+
+                    b.Property<bool?>("CanReadPFI");
+
+                    b.Property<bool?>("CanReadPMA");
+
+                    b.Property<bool?>("CanReadPQSubchannel");
+
+                    b.Property<bool?>("CanReadPQSubchannelWithC2");
+
+                    b.Property<bool?>("CanReadPRI");
+
+                    b.Property<bool?>("CanReadRWSubchannel");
+
+                    b.Property<bool?>("CanReadRWSubchannelWithC2");
+
+                    b.Property<bool?>("CanReadRecordablePFI");
+
+                    b.Property<bool?>("CanReadSpareAreaInformation");
+
+                    b.Property<bool?>("CanReadTOC");
+
+                    b.Property<int?>("CurrentCHSId");
+
+                    b.Property<byte?>("Density");
+
+                    b.Property<byte[]>("IdentifyData");
+
+                    b.Property<ulong?>("LBA48Sectors");
+
+                    b.Property<uint?>("LBASectors");
+
+                    b.Property<ushort?>("LogicalAlignment");
+
+                    b.Property<uint?>("LongBlockSize");
+
+                    b.Property<string>("Manufacturer");
+
+                    b.Property<bool>("MediaIsRecognized");
+
+                    b.Property<byte?>("MediumType");
+
+                    b.Property<string>("MediumTypeName");
+
+                    b.Property<int?>("MmcId");
+
+                    b.Property<byte[]>("ModeSense10Data");
+
+                    b.Property<byte[]>("ModeSense6Data");
+
+                    b.Property<string>("Model");
+
+                    b.Property<ushort?>("NominalRotationRate");
+
+                    b.Property<uint?>("PhysicalBlockSize");
+
+                    b.Property<int?>("ScsiId");
+
+                    b.Property<bool?>("SolidStateDevice");
+
+                    b.Property<bool?>("SupportsHLDTSTReadRawDVD");
+
+                    b.Property<bool?>("SupportsNECReadCDDA");
+
+                    b.Property<bool?>("SupportsPioneerReadCDDA");
+
+                    b.Property<bool?>("SupportsPioneerReadCDDAMSF");
+
+                    b.Property<bool?>("SupportsPlextorReadCDDA");
+
+                    b.Property<bool?>("SupportsPlextorReadRawDVD");
+
+                    b.Property<bool?>("SupportsRead10");
+
+                    b.Property<bool?>("SupportsRead12");
+
+                    b.Property<bool?>("SupportsRead16");
+
+                    b.Property<bool?>("SupportsRead6");
+
+                    b.Property<bool?>("SupportsReadCapacity");
+
+                    b.Property<bool?>("SupportsReadCapacity16");
+
+                    b.Property<bool?>("SupportsReadCd");
+
+                    b.Property<bool?>("SupportsReadCdMsf");
+
+                    b.Property<bool?>("SupportsReadCdMsfRaw");
+
+                    b.Property<bool?>("SupportsReadCdRaw");
+
+                    b.Property<bool?>("SupportsReadDma");
+
+                    b.Property<bool?>("SupportsReadDmaLba");
+
+                    b.Property<bool?>("SupportsReadDmaLba48");
+
+                    b.Property<bool?>("SupportsReadDmaRetry");
+
+                    b.Property<bool?>("SupportsReadDmaRetryLba");
+
+                    b.Property<bool?>("SupportsReadLba");
+
+                    b.Property<bool?>("SupportsReadLba48");
+
+                    b.Property<bool?>("SupportsReadLong");
+
+                    b.Property<bool?>("SupportsReadLong16");
+
+                    b.Property<bool?>("SupportsReadLongLba");
+
+                    b.Property<bool?>("SupportsReadLongRetry");
+
+                    b.Property<bool?>("SupportsReadLongRetryLba");
+
+                    b.Property<bool?>("SupportsReadRetry");
+
+                    b.Property<bool?>("SupportsReadRetryLba");
+
+                    b.Property<bool?>("SupportsReadSectors");
+
+                    b.Property<bool?>("SupportsSeek");
+
+                    b.Property<bool?>("SupportsSeekLba");
+
+                    b.Property<ushort?>("UnformattedBPS");
+
+                    b.Property<ushort?>("UnformattedBPT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AtaId");
+
+                    b.HasIndex("CHSId");
+
+                    b.HasIndex("CurrentCHSId");
+
+                    b.HasIndex("MmcId");
+
+                    b.HasIndex("ScsiId");
+
+                    b.ToTable("TestedMedia");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.TestedSequentialMedia", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool?>("CanReadMediaSerial");
+
+                    b.Property<byte?>("Density");
+
+                    b.Property<string>("Manufacturer");
+
+                    b.Property<bool>("MediaIsRecognized");
+
+                    b.Property<byte?>("MediumType");
+
+                    b.Property<string>("MediumTypeName");
+
+                    b.Property<byte[]>("ModeSense10Data");
+
+                    b.Property<byte[]>("ModeSense6Data");
+
+                    b.Property<string>("Model");
+
+                    b.Property<int?>("SscId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SscId");
+
+                    b.ToTable("TestedSequentialMedia");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Usb", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<byte[]>("Descriptors");
+
+                    b.Property<string>("Manufacturer");
+
+                    b.Property<string>("Product");
+
+                    b.Property<ushort>("ProductID");
+
+                    b.Property<bool>("RemovableMedia");
+
+                    b.Property<ushort>("VendorID");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Usb");
+                });
+
+            modelBuilder.Entity("DiscImageChef.Decoders.SCSI.Modes+ModePage_2A", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("AccurateCDDA");
+
+                    b.Property<bool>("AudioPlay");
+
+                    b.Property<bool>("BCK");
+
+                    b.Property<bool>("BUF");
+
+                    b.Property<ushort>("BufferSize");
+
+                    b.Property<bool>("C2Pointer");
+
+                    b.Property<bool>("CDDACommand");
+
+                    b.Property<ushort>("CMRSupported");
+
+                    b.Property<bool>("Composite");
+
+                    b.Property<ushort>("CurrentSpeed");
+
+                    b.Property<ushort>("CurrentWriteSpeed");
+
+                    b.Property<ushort>("CurrentWriteSpeedSelected");
+
+                    b.Property<bool>("DeinterlaveSubchannel");
+
+                    b.Property<bool>("DigitalPort1");
+
+                    b.Property<bool>("DigitalPort2");
+
+                    b.Property<bool>("Eject");
+
+                    b.Property<bool>("ISRC");
+
+                    b.Property<bool>("LSBF");
+
+                    b.Property<bool>("LeadInPW");
+
+                    b.Property<byte>("Length");
+
+                    b.Property<byte>("LoadingMechanism");
+
+                    b.Property<bool>("Lock");
+
+                    b.Property<bool>("LockState");
+
+                    b.Property<ushort>("MaxWriteSpeed");
+
+                    b.Property<ushort>("MaximumSpeed");
+
+                    b.Property<bool>("Method2");
+
+                    b.Property<bool>("Mode2Form1");
+
+                    b.Property<bool>("Mode2Form2");
+
+                    b.Property<bool>("MultiSession");
+
+                    b.Property<bool>("PS");
+
+                    b.Property<bool>("PreventJumper");
+
+                    b.Property<bool>("RCK");
+
+                    b.Property<bool>("ReadBarcode");
+
+                    b.Property<bool>("ReadCDR");
+
+                    b.Property<bool>("ReadCDRW");
+
+                    b.Property<bool>("ReadDVDR");
+
+                    b.Property<bool>("ReadDVDRAM");
+
+                    b.Property<bool>("ReadDVDROM");
+
+                    b.Property<byte>("RotationControlSelected");
+
+                    b.Property<bool>("SCC");
+
+                    b.Property<bool>("SDP");
+
+                    b.Property<bool>("SSS");
+
+                    b.Property<bool>("SeparateChannelMute");
+
+                    b.Property<bool>("SeparateChannelVolume");
+
+                    b.Property<bool>("Subchannel");
+
+                    b.Property<ushort>("SupportedVolumeLevels");
+
+                    b.Property<bool>("TestWrite");
+
+                    b.Property<bool>("UPC");
+
+                    b.Property<bool>("WriteCDR");
+
+                    b.Property<bool>("WriteCDRW");
+
+                    b.Property<bool>("WriteDVDR");
+
+                    b.Property<bool>("WriteDVDRAM");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ModePage_2A");
+                });
+
+            modelBuilder.Entity("DiscImageChef.Database.Models.Device", b =>
+                {
+                    b.HasBaseType("DiscImageChef.CommonTypes.Metadata.DeviceReportV2");
+
+                    b.Property<DateTime>("LastSynchronized");
+
+                    b.ToTable("Device");
+
+                    b.HasDiscriminator().HasValue("Device");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Ata", b =>
+                {
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.TestedMedia", "ReadCapabilities")
+                        .WithMany()
+                        .HasForeignKey("ReadCapabilitiesId");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.BlockDescriptor", b =>
+                {
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.ScsiMode")
+                        .WithMany("BlockDescriptors")
+                        .HasForeignKey("ScsiModeId");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.DensityCode", b =>
+                {
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.SscSupportedMedia")
+                        .WithMany("DensityCodes")
+                        .HasForeignKey("SscSupportedMediaId");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.DeviceReportV2", b =>
+                {
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Ata", "ATA")
+                        .WithMany()
+                        .HasForeignKey("ATAId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Ata", "ATAPI")
+                        .WithMany()
+                        .HasForeignKey("ATAPIId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.FireWire", "FireWire")
+                        .WithMany()
+                        .HasForeignKey("FireWireId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.MmcSd", "MultiMediaCard")
+                        .WithMany()
+                        .HasForeignKey("MultiMediaCardId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Pcmcia", "PCMCIA")
+                        .WithMany()
+                        .HasForeignKey("PCMCIAId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Scsi", "SCSI")
+                        .WithMany()
+                        .HasForeignKey("SCSIId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.MmcSd", "SecureDigital")
+                        .WithMany()
+                        .HasForeignKey("SecureDigitalId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Usb", "USB")
+                        .WithMany()
+                        .HasForeignKey("USBId");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Mmc", b =>
+                {
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.MmcFeatures", "Features")
+                        .WithMany()
+                        .HasForeignKey("FeaturesId");
+
+                    b.HasOne("DiscImageChef.Decoders.SCSI.Modes+ModePage_2A", "ModeSense2A")
+                        .WithMany()
+                        .HasForeignKey("ModeSense2AId");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Scsi", b =>
+                {
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.ScsiMode", "ModeSense")
+                        .WithMany()
+                        .HasForeignKey("ModeSenseId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Mmc", "MultiMediaDevice")
+                        .WithMany()
+                        .HasForeignKey("MultiMediaDeviceId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.TestedMedia", "ReadCapabilities")
+                        .WithMany()
+                        .HasForeignKey("ReadCapabilitiesId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Ssc", "SequentialDevice")
+                        .WithMany()
+                        .HasForeignKey("SequentialDeviceId");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.ScsiPage", b =>
+                {
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Scsi")
+                        .WithMany("EVPDPages")
+                        .HasForeignKey("ScsiId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.ScsiMode")
+                        .WithMany("ModePages")
+                        .HasForeignKey("ScsiModeId");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.SscSupportedMedia", b =>
+                {
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Ssc")
+                        .WithMany("SupportedMediaTypes")
+                        .HasForeignKey("SscId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.TestedSequentialMedia")
+                        .WithMany("SupportedMediaTypes")
+                        .HasForeignKey("TestedSequentialMediaId");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.SupportedDensity", b =>
+                {
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Ssc")
+                        .WithMany("SupportedDensities")
+                        .HasForeignKey("SscId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.TestedSequentialMedia")
+                        .WithMany("SupportedDensities")
+                        .HasForeignKey("TestedSequentialMediaId");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.TestedMedia", b =>
+                {
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Ata")
+                        .WithMany("RemovableMedias")
+                        .HasForeignKey("AtaId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Chs", "CHS")
+                        .WithMany()
+                        .HasForeignKey("CHSId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Chs", "CurrentCHS")
+                        .WithMany()
+                        .HasForeignKey("CurrentCHSId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Mmc")
+                        .WithMany("TestedMedia")
+                        .HasForeignKey("MmcId");
+
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Scsi")
+                        .WithMany("RemovableMedias")
+                        .HasForeignKey("ScsiId");
+                });
+
+            modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.TestedSequentialMedia", b =>
+                {
+                    b.HasOne("DiscImageChef.CommonTypes.Metadata.Ssc")
+                        .WithMany("TestedMedia")
+                        .HasForeignKey("SscId");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/DiscImageChef.Database/Migrations/20181127001622_AddDeviceBasicFields.cs b/DiscImageChef.Database/Migrations/20181127001622_AddDeviceBasicFields.cs
new file mode 100644
index 000000000..a0c23ea68
--- /dev/null
+++ b/DiscImageChef.Database/Migrations/20181127001622_AddDeviceBasicFields.cs
@@ -0,0 +1,50 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace DiscImageChef.Database.Migrations
+{
+    public partial class AddDeviceBasicFields : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Manufacturer",
+                table: "Reports",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Model",
+                table: "Reports",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Revision",
+                table: "Reports",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "Type",
+                table: "Reports",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Manufacturer",
+                table: "Reports");
+
+            migrationBuilder.DropColumn(
+                name: "Model",
+                table: "Reports");
+
+            migrationBuilder.DropColumn(
+                name: "Revision",
+                table: "Reports");
+
+            migrationBuilder.DropColumn(
+                name: "Type",
+                table: "Reports");
+        }
+    }
+}
diff --git a/DiscImageChef.Database/Migrations/DicContextModelSnapshot.cs b/DiscImageChef.Database/Migrations/DicContextModelSnapshot.cs
index 63d9cdf30..6336d5223 100644
--- a/DiscImageChef.Database/Migrations/DicContextModelSnapshot.cs
+++ b/DiscImageChef.Database/Migrations/DicContextModelSnapshot.cs
@@ -90,14 +90,22 @@ namespace DiscImageChef.Database.Migrations
 
                 b.Property<int?>("FireWireId");
 
+                b.Property<string>("Manufacturer");
+
+                b.Property<string>("Model");
+
                 b.Property<int?>("MultiMediaCardId");
 
                 b.Property<int?>("PCMCIAId");
 
+                b.Property<string>("Revision");
+
                 b.Property<int?>("SCSIId");
 
                 b.Property<int?>("SecureDigitalId");
 
+                b.Property<int>("Type");
+
                 b.Property<int?>("USBId");
 
                 b.HasKey("Id");
diff --git a/DiscImageChef.Database/Models/Device.cs b/DiscImageChef.Database/Models/Device.cs
index 8125f5663..cd421b55c 100644
--- a/DiscImageChef.Database/Models/Device.cs
+++ b/DiscImageChef.Database/Models/Device.cs
@@ -5,6 +5,11 @@ namespace DiscImageChef.Database.Models
 {
     public class Device : DeviceReportV2
     {
+        public Device()
+        {
+            LastSynchronized = DateTime.UtcNow;
+        }
+
         public Device(DeviceReportV2 report)
         {
             ATA              = report.ATA;
@@ -17,6 +22,10 @@ namespace DiscImageChef.Database.Models
             SCSI             = report.SCSI;
             SecureDigital    = report.SecureDigital;
             USB              = report.USB;
+            Manufacturer     = report.Manufacturer;
+            Model            = report.Model;
+            Revision         = report.Revision;
+            Type             = report.Type;
         }
 
         public DateTime LastSynchronized { get; set; }
diff --git a/DiscImageChef.Database/Models/Report.cs b/DiscImageChef.Database/Models/Report.cs
index 72c2f697f..e85a8c5ad 100644
--- a/DiscImageChef.Database/Models/Report.cs
+++ b/DiscImageChef.Database/Models/Report.cs
@@ -5,6 +5,12 @@ namespace DiscImageChef.Database.Models
 {
     public class Report : DeviceReportV2
     {
+        public Report()
+        {
+            Created = DateTime.UtcNow;
+            Uploaded = false;
+        }
+
         public Report(DeviceReportV2 report)
         {
             ATA            = report.ATA;
@@ -18,6 +24,10 @@ namespace DiscImageChef.Database.Models
             SecureDigital  = report.SecureDigital;
             USB            = report.USB;
             Uploaded       = false;
+            Manufacturer   = report.Manufacturer;
+            Model          = report.Model;
+            Revision       = report.Revision;
+            Type           = report.Type;
         }
 
         public DateTime Created  { get; set; }
diff --git a/DiscImageChef/Commands/DeviceReport.cs b/DiscImageChef/Commands/DeviceReport.cs
index e509e90d3..2e6e76ba8 100644
--- a/DiscImageChef/Commands/DeviceReport.cs
+++ b/DiscImageChef/Commands/DeviceReport.cs
@@ -67,9 +67,12 @@ namespace DiscImageChef.Commands
 
             Core.Statistics.AddDevice(dev);
 
-            DeviceReportV2 report    = new DeviceReportV2();
-            bool           removable = false;
-            string         jsonFile;
+            DeviceReportV2 report = new DeviceReportV2
+            {
+                Manufacturer = dev.Manufacturer, Model = dev.Model, Revision = dev.Revision, Type = dev.Type
+            };
+            bool   removable = false;
+            string jsonFile;
 
             if(!string.IsNullOrWhiteSpace(dev.Manufacturer) && !string.IsNullOrWhiteSpace(dev.Revision))
                 jsonFile = dev.Manufacturer + "_" + dev.Model + "_" + dev.Revision + ".json";