diff --git a/DiscImageChef.Server/Areas/Admin/Controllers/VersionsController.cs b/DiscImageChef.Server/Areas/Admin/Controllers/VersionsController.cs index 1ddf1216..865652ee 100644 --- a/DiscImageChef.Server/Areas/Admin/Controllers/VersionsController.cs +++ b/DiscImageChef.Server/Areas/Admin/Controllers/VersionsController.cs @@ -15,6 +15,6 @@ namespace DiscImageChef.Server.Areas.Admin.Controllers public VersionsController(DicServerContext context) => _context = context; // GET: Admin/Versions - public async Task Index() => View(await _context.Versions.OrderBy(v => v.Value).ToListAsync()); + public async Task Index() => View(await _context.Versions.OrderBy(v => v.Name).ToListAsync()); } } \ No newline at end of file diff --git a/DiscImageChef.Server/Areas/Admin/Views/Versions/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Versions/Index.cshtml index 101324f0..b753837b 100644 --- a/DiscImageChef.Server/Areas/Admin/Views/Versions/Index.cshtml +++ b/DiscImageChef.Server/Areas/Admin/Views/Versions/Index.cshtml @@ -38,7 +38,7 @@ - @Html.DisplayNameFor(model => model.Value) + @Html.DisplayNameFor(model => model.Name) @Html.DisplayNameFor(model => model.Count) @@ -51,7 +51,7 @@ { - @Html.DisplayFor(modelItem => item.Value) + @Html.DisplayFor(modelItem => item.Name) @Html.DisplayFor(modelItem => item.Count) diff --git a/DiscImageChef.Server/Controllers/StatsController.cs b/DiscImageChef.Server/Controllers/StatsController.cs index 50dc4fd7..c9bc63c5 100644 --- a/DiscImageChef.Server/Controllers/StatsController.cs +++ b/DiscImageChef.Server/Controllers/StatsController.cs @@ -114,7 +114,7 @@ namespace DiscImageChef.Server.Controllers foreach(Version nvs in ctx.Versions) versions.Add(new NameValueStats { - name = nvs.Value == "previous" ? "Previous than 3.4.99.0" : nvs.Value, Value = nvs.Count + name = nvs.Name == "previous" ? "Previous than 3.4.99.0" : nvs.Name, Value = nvs.Count }); ViewBag.repVersions = versions.OrderBy(ver => ver.name).ToList(); @@ -370,7 +370,7 @@ namespace DiscImageChef.Server.Controllers string[][] result = { ctx.Versions.OrderByDescending(o => o.Count).Take(10). - Select(v => v.Value == "previous" ? "Previous than 3.4.99.0" : v.Value).ToArray(), + Select(v => v.Name == "previous" ? "Previous than 3.4.99.0" : v.Name).ToArray(), ctx.Versions.OrderByDescending(o => o.Count).Take(10).Select(x => x.Count.ToString()).ToArray() }; diff --git a/DiscImageChef.Server/Controllers/UploadStatsController.cs b/DiscImageChef.Server/Controllers/UploadStatsController.cs index c6974b28..90d90ff1 100644 --- a/DiscImageChef.Server/Controllers/UploadStatsController.cs +++ b/DiscImageChef.Server/Controllers/UploadStatsController.cs @@ -150,12 +150,12 @@ namespace DiscImageChef.Server.Controllers if(newstats.Versions != null) foreach(NameValueStats nvs in newstats.Versions) { - Version existing = _ctx.Versions.FirstOrDefault(c => c.Value == nvs.name); + Version existing = _ctx.Versions.FirstOrDefault(c => c.Name == nvs.name); if(existing == null) _ctx.Versions.Add(new Version { - Value = nvs.name, Count = nvs.Value + Name = nvs.name, Count = nvs.Value }); else existing.Count += nvs.Value; diff --git a/DiscImageChef.Server/Core/StatsConverter.cs b/DiscImageChef.Server/Core/StatsConverter.cs index 4d447230..464292c8 100644 --- a/DiscImageChef.Server/Core/StatsConverter.cs +++ b/DiscImageChef.Server/Core/StatsConverter.cs @@ -362,12 +362,12 @@ namespace DiscImageChef.Server if(string.IsNullOrWhiteSpace(nvs.name)) continue; - Version existing = ctx.Versions.FirstOrDefault(c => c.Value == nvs.name); + Version existing = ctx.Versions.FirstOrDefault(c => c.Name == nvs.name); if(existing == null) ctx.Versions.Add(new Version { - Count = nvs.Value, Value = nvs.name + Count = nvs.Value, Name = nvs.name }); else existing.Count += nvs.Value; @@ -375,12 +375,12 @@ namespace DiscImageChef.Server } else { - Version existing = ctx.Versions.FirstOrDefault(c => c.Value == "previous"); + Version existing = ctx.Versions.FirstOrDefault(c => c.Name == "previous"); if(existing == null) ctx.Versions.Add(new Version { - Count = 1, Value = "previous" + Count = 1, Name = "previous" }); else existing.Count++; diff --git a/DiscImageChef.Server/Migrations/20191203212552_NameCountModel.Designer.cs b/DiscImageChef.Server/Migrations/20191203212552_NameCountModel.Designer.cs new file mode 100644 index 00000000..1d7cc6db --- /dev/null +++ b/DiscImageChef.Server/Migrations/20191203212552_NameCountModel.Designer.cs @@ -0,0 +1,2290 @@ +// +using System; +using DiscImageChef.Server.Models; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +namespace DiscImageChef.Server.Migrations +{ + [DbContext(typeof(DicServerContext))] + [Migration("20191203212552_NameCountModel")] + partial class NameCountModel + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "3.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 64); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Ata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Identify") + .HasColumnType("longblob"); + + b.Property("ReadCapabilitiesId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ReadCapabilitiesId"); + + b.ToTable("Ata"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.BlockDescriptor", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BlockLength") + .HasColumnType("int unsigned"); + + b.Property("Blocks") + .HasColumnType("bigint unsigned"); + + b.Property("Density") + .HasColumnType("tinyint unsigned"); + + b.Property("ScsiModeId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ScsiModeId"); + + b.ToTable("BlockDescriptor"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Chs", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Cylinders") + .HasColumnType("smallint unsigned"); + + b.Property("Heads") + .HasColumnType("smallint unsigned"); + + b.Property("Sectors") + .HasColumnType("smallint unsigned"); + + b.HasKey("Id"); + + b.ToTable("Chs"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.DensityCode", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Code") + .HasColumnType("int"); + + b.Property("SscSupportedMediaId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("SscSupportedMediaId"); + + b.ToTable("DensityCode"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.FireWire", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Manufacturer") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Product") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("ProductID") + .HasColumnType("int unsigned"); + + b.Property("RemovableMedia") + .HasColumnType("tinyint(1)"); + + b.Property("VendorID") + .HasColumnType("int unsigned"); + + b.HasKey("Id"); + + b.ToTable("FireWire"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Mmc", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("FeaturesId") + .HasColumnType("int"); + + b.Property("ModeSense2AData") + .HasColumnType("longblob"); + + b.HasKey("Id"); + + b.HasIndex("FeaturesId"); + + b.ToTable("Mmc"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.MmcFeatures", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AACSVersion") + .HasColumnType("tinyint unsigned"); + + b.Property("AGIDs") + .HasColumnType("tinyint unsigned"); + + b.Property("BinaryData") + .HasColumnType("longblob"); + + b.Property("BindingNonceBlocks") + .HasColumnType("tinyint unsigned"); + + b.Property("BlocksPerReadableUnit") + .HasColumnType("smallint unsigned"); + + b.Property("BufferUnderrunFreeInDVD") + .HasColumnType("tinyint(1)"); + + b.Property("BufferUnderrunFreeInSAO") + .HasColumnType("tinyint(1)"); + + b.Property("BufferUnderrunFreeInTAO") + .HasColumnType("tinyint(1)"); + + b.Property("CPRMVersion") + .HasColumnType("tinyint unsigned"); + + b.Property("CSSVersion") + .HasColumnType("tinyint unsigned"); + + b.Property("CanAudioScan") + .HasColumnType("tinyint(1)"); + + b.Property("CanEject") + .HasColumnType("tinyint(1)"); + + b.Property("CanEraseSector") + .HasColumnType("tinyint(1)"); + + b.Property("CanExpandBDRESpareArea") + .HasColumnType("tinyint(1)"); + + b.Property("CanFormat") + .HasColumnType("tinyint(1)"); + + b.Property("CanFormatBDREWithoutSpare") + .HasColumnType("tinyint(1)"); + + b.Property("CanFormatCert") + .HasColumnType("tinyint(1)"); + + b.Property("CanFormatFRF") + .HasColumnType("tinyint(1)"); + + b.Property("CanFormatQCert") + .HasColumnType("tinyint(1)"); + + b.Property("CanFormatRRM") + .HasColumnType("tinyint(1)"); + + b.Property("CanGenerateBindingNonce") + .HasColumnType("tinyint(1)"); + + b.Property("CanLoad") + .HasColumnType("tinyint(1)"); + + b.Property("CanMuteSeparateChannels") + .HasColumnType("tinyint(1)"); + + b.Property("CanOverwriteSAOTrack") + .HasColumnType("tinyint(1)"); + + b.Property("CanOverwriteTAOTrack") + .HasColumnType("tinyint(1)"); + + b.Property("CanPlayCDAudio") + .HasColumnType("tinyint(1)"); + + b.Property("CanPseudoOverwriteBDR") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadAllDualR") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadAllDualRW") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadBD") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadBDR") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadBDRE1") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadBDRE2") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadBDROM") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadBluBCA") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadCD") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadCDMRW") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadCPRM_MKB") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadDDCD") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadDVD") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadDVDPlusMRW") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadDVDPlusR") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadDVDPlusRDL") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadDVDPlusRW") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadDVDPlusRWDL") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadDriveAACSCertificate") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadHDDVD") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadHDDVDR") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadHDDVDRAM") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadLeadInCDText") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadOldBDR") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadOldBDRE") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadOldBDROM") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadSpareAreaInformation") + .HasColumnType("tinyint(1)"); + + b.Property("CanReportDriveSerial") + .HasColumnType("tinyint(1)"); + + b.Property("CanReportMediaSerial") + .HasColumnType("tinyint(1)"); + + b.Property("CanTestWriteDDCDR") + .HasColumnType("tinyint(1)"); + + b.Property("CanTestWriteDVD") + .HasColumnType("tinyint(1)"); + + b.Property("CanTestWriteInSAO") + .HasColumnType("tinyint(1)"); + + b.Property("CanTestWriteInTAO") + .HasColumnType("tinyint(1)"); + + b.Property("CanUpgradeFirmware") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteBD") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteBDR") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteBDRE1") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteBDRE2") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteBusEncryptedBlocks") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteCDMRW") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteCDRW") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteCDRWCAV") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteCDSAO") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteCDTAO") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteCSSManagedDVD") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteDDCDR") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteDDCDRW") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteDVDPlusMRW") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteDVDPlusR") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteDVDPlusRDL") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteDVDPlusRW") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteDVDPlusRWDL") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteDVDR") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteDVDRDL") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteDVDRW") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteHDDVDR") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteHDDVDRAM") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteOldBDR") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteOldBDRE") + .HasColumnType("tinyint(1)"); + + b.Property("CanWritePackedSubchannelInTAO") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteRWSubchannelInSAO") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteRWSubchannelInTAO") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteRaw") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteRawMultiSession") + .HasColumnType("tinyint(1)"); + + b.Property("CanWriteRawSubchannelInTAO") + .HasColumnType("tinyint(1)"); + + b.Property("ChangerIsSideChangeCapable") + .HasColumnType("tinyint(1)"); + + b.Property("ChangerSlots") + .HasColumnType("tinyint unsigned"); + + b.Property("ChangerSupportsDiscPresent") + .HasColumnType("tinyint(1)"); + + b.Property("DBML") + .HasColumnType("tinyint(1)"); + + b.Property("DVDMultiRead") + .HasColumnType("tinyint(1)"); + + b.Property("EmbeddedChanger") + .HasColumnType("tinyint(1)"); + + b.Property("ErrorRecoveryPage") + .HasColumnType("tinyint(1)"); + + b.Property("FirmwareDate") + .HasColumnType("datetime(6)"); + + b.Property("LoadingMechanismType") + .HasColumnType("tinyint unsigned"); + + b.Property("Locked") + .HasColumnType("tinyint(1)"); + + b.Property("LogicalBlockSize") + .HasColumnType("int unsigned"); + + b.Property("MultiRead") + .HasColumnType("tinyint(1)"); + + b.Property("PhysicalInterfaceStandardNumber") + .HasColumnType("int unsigned"); + + b.Property("PreventJumper") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsAACS") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsBusEncryption") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsC2") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsCPRM") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsCSS") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsDAP") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsDeviceBusyEvent") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsHybridDiscs") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsModePage1Ch") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsOSSC") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsPWP") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsSWPP") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsSecurDisc") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsSeparateVolume") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsVCPS") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsWriteInhibitDCB") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsWriteProtectPAC") + .HasColumnType("tinyint(1)"); + + b.Property("VolumeLevels") + .HasColumnType("smallint unsigned"); + + b.HasKey("Id"); + + b.ToTable("MmcFeatures"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.MmcSd", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CID") + .HasColumnType("longblob"); + + b.Property("CSD") + .HasColumnType("longblob"); + + b.Property("ExtendedCSD") + .HasColumnType("longblob"); + + b.Property("OCR") + .HasColumnType("longblob"); + + b.Property("SCR") + .HasColumnType("longblob"); + + b.HasKey("Id"); + + b.ToTable("MmcSd"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Pcmcia", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CIS") + .HasColumnType("longblob"); + + b.Property("CardCode") + .HasColumnType("smallint unsigned"); + + b.Property("Compliance") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Manufacturer") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("ManufacturerCode") + .HasColumnType("smallint unsigned"); + + b.Property("ProductName") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("Pcmcia"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Scsi", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("InquiryData") + .HasColumnType("longblob"); + + b.Property("ModeSense10ChangeableData") + .HasColumnType("longblob"); + + b.Property("ModeSense10CurrentData") + .HasColumnType("longblob"); + + b.Property("ModeSense10Data") + .HasColumnType("longblob"); + + b.Property("ModeSense6ChangeableData") + .HasColumnType("longblob"); + + b.Property("ModeSense6CurrentData") + .HasColumnType("longblob"); + + b.Property("ModeSense6Data") + .HasColumnType("longblob"); + + b.Property("ModeSenseId") + .HasColumnType("int"); + + b.Property("MultiMediaDeviceId") + .HasColumnType("int"); + + b.Property("ReadCapabilitiesId") + .HasColumnType("int"); + + b.Property("SequentialDeviceId") + .HasColumnType("int"); + + b.Property("SupportsModeSense10") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsModeSense6") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsModeSubpages") + .HasColumnType("tinyint(1)"); + + 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("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BlankCheckEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("BufferedMode") + .HasColumnType("tinyint unsigned"); + + b.Property("DPOandFUA") + .HasColumnType("tinyint(1)"); + + b.Property("MediumType") + .HasColumnType("tinyint unsigned"); + + b.Property("Speed") + .HasColumnType("tinyint unsigned"); + + b.Property("WriteProtected") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.ToTable("ScsiMode"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.ScsiPage", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ScsiId") + .HasColumnType("int"); + + b.Property("ScsiModeId") + .HasColumnType("int"); + + b.Property("page") + .HasColumnType("tinyint unsigned"); + + b.Property("subpage") + .HasColumnType("tinyint unsigned"); + + b.Property("value") + .HasColumnType("longblob"); + + b.HasKey("Id"); + + b.HasIndex("ScsiId"); + + b.HasIndex("ScsiModeId"); + + b.ToTable("ScsiPage"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Ssc", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BlockSizeGranularity") + .HasColumnType("tinyint unsigned"); + + b.Property("MaxBlockLength") + .HasColumnType("int unsigned"); + + b.Property("MinBlockLength") + .HasColumnType("int unsigned"); + + b.HasKey("Id"); + + b.ToTable("Ssc"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.SscSupportedMedia", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Description") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Length") + .HasColumnType("smallint unsigned"); + + b.Property("MediumType") + .HasColumnType("tinyint unsigned"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Organization") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("SscId") + .HasColumnType("int"); + + b.Property("TestedSequentialMediaId") + .HasColumnType("int"); + + b.Property("Width") + .HasColumnType("smallint unsigned"); + + b.HasKey("Id"); + + b.HasIndex("SscId"); + + b.HasIndex("TestedSequentialMediaId"); + + b.ToTable("SscSupportedMedia"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.SupportedDensity", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("BitsPerMm") + .HasColumnType("int unsigned"); + + b.Property("Capacity") + .HasColumnType("int unsigned"); + + b.Property("DefaultDensity") + .HasColumnType("tinyint(1)"); + + b.Property("Description") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Duplicate") + .HasColumnType("tinyint(1)"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Organization") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("PrimaryCode") + .HasColumnType("tinyint unsigned"); + + b.Property("SecondaryCode") + .HasColumnType("tinyint unsigned"); + + b.Property("SscId") + .HasColumnType("int"); + + b.Property("TestedSequentialMediaId") + .HasColumnType("int"); + + b.Property("Tracks") + .HasColumnType("smallint unsigned"); + + b.Property("Width") + .HasColumnType("smallint unsigned"); + + b.Property("Writable") + .HasColumnType("tinyint(1)"); + + b.HasKey("Id"); + + b.HasIndex("SscId"); + + b.HasIndex("TestedSequentialMediaId"); + + b.ToTable("SupportedDensity"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.TestedMedia", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AdipData") + .HasColumnType("longblob"); + + b.Property("AtaId") + .HasColumnType("int"); + + b.Property("AtipData") + .HasColumnType("longblob"); + + b.Property("BlockSize") + .HasColumnType("int unsigned"); + + b.Property("Blocks") + .HasColumnType("bigint unsigned"); + + b.Property("BluBcaData") + .HasColumnType("longblob"); + + b.Property("BluDdsData") + .HasColumnType("longblob"); + + b.Property("BluDiData") + .HasColumnType("longblob"); + + b.Property("BluPacData") + .HasColumnType("longblob"); + + b.Property("BluSaiData") + .HasColumnType("longblob"); + + b.Property("C2PointersData") + .HasColumnType("longblob"); + + b.Property("CHSId") + .HasColumnType("int"); + + b.Property("CanReadAACS") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadADIP") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadATIP") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadBCA") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadC2Pointers") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadCMI") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadCdScrambled") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadCorrectedSubchannel") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadCorrectedSubchannelWithC2") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadDCB") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadDDS") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadDMI") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadDiscInformation") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadFirstTrackPreGap") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadFullTOC") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadHDCMI") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadLayerCapacity") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadLeadIn") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadLeadOut") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadMediaID") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadMediaSerial") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadPAC") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadPFI") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadPMA") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadPQSubchannel") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadPQSubchannelWithC2") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadPRI") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadRWSubchannel") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadRWSubchannelWithC2") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadRecordablePFI") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadSpareAreaInformation") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadTOC") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadingIntersessionLeadIn") + .HasColumnType("tinyint(1)"); + + b.Property("CanReadingIntersessionLeadOut") + .HasColumnType("tinyint(1)"); + + b.Property("CmiData") + .HasColumnType("longblob"); + + b.Property("CorrectedSubchannelData") + .HasColumnType("longblob"); + + b.Property("CorrectedSubchannelWithC2Data") + .HasColumnType("longblob"); + + b.Property("CurrentCHSId") + .HasColumnType("int"); + + b.Property("DcbData") + .HasColumnType("longblob"); + + b.Property("Density") + .HasColumnType("tinyint unsigned"); + + b.Property("DmiData") + .HasColumnType("longblob"); + + b.Property("DvdAacsData") + .HasColumnType("longblob"); + + b.Property("DvdBcaData") + .HasColumnType("longblob"); + + b.Property("DvdDdsData") + .HasColumnType("longblob"); + + b.Property("DvdLayerData") + .HasColumnType("longblob"); + + b.Property("DvdSaiData") + .HasColumnType("longblob"); + + b.Property("EmbossedPfiData") + .HasColumnType("longblob"); + + b.Property("FullTocData") + .HasColumnType("longblob"); + + b.Property("HLDTSTReadRawDVDData") + .HasColumnType("longblob"); + + b.Property("HdCmiData") + .HasColumnType("longblob"); + + b.Property("IdentifyData") + .HasColumnType("longblob"); + + b.Property("IntersessionLeadInData") + .HasColumnType("longblob"); + + b.Property("IntersessionLeadOutData") + .HasColumnType("longblob"); + + b.Property("LBA48Sectors") + .HasColumnType("bigint unsigned"); + + b.Property("LBASectors") + .HasColumnType("int unsigned"); + + b.Property("LeadInData") + .HasColumnType("longblob"); + + b.Property("LeadOutData") + .HasColumnType("longblob"); + + b.Property("LogicalAlignment") + .HasColumnType("smallint unsigned"); + + b.Property("LongBlockSize") + .HasColumnType("int unsigned"); + + b.Property("Manufacturer") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("MediaIsRecognized") + .HasColumnType("tinyint(1)"); + + b.Property("MediumType") + .HasColumnType("tinyint unsigned"); + + b.Property("MediumTypeName") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("MmcId") + .HasColumnType("int"); + + b.Property("ModeSense10Data") + .HasColumnType("longblob"); + + b.Property("ModeSense6Data") + .HasColumnType("longblob"); + + b.Property("Model") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("NecReadCddaData") + .HasColumnType("longblob"); + + b.Property("NominalRotationRate") + .HasColumnType("smallint unsigned"); + + b.Property("PQSubchannelData") + .HasColumnType("longblob"); + + b.Property("PQSubchannelWithC2Data") + .HasColumnType("longblob"); + + b.Property("PfiData") + .HasColumnType("longblob"); + + b.Property("PhysicalBlockSize") + .HasColumnType("int unsigned"); + + b.Property("PioneerReadCddaData") + .HasColumnType("longblob"); + + b.Property("PioneerReadCddaMsfData") + .HasColumnType("longblob"); + + b.Property("PlextorReadCddaData") + .HasColumnType("longblob"); + + b.Property("PlextorReadRawDVDData") + .HasColumnType("longblob"); + + b.Property("PmaData") + .HasColumnType("longblob"); + + b.Property("PriData") + .HasColumnType("longblob"); + + b.Property("RWSubchannelData") + .HasColumnType("longblob"); + + b.Property("RWSubchannelWithC2Data") + .HasColumnType("longblob"); + + b.Property("Read10Data") + .HasColumnType("longblob"); + + b.Property("Read12Data") + .HasColumnType("longblob"); + + b.Property("Read16Data") + .HasColumnType("longblob"); + + b.Property("Read6Data") + .HasColumnType("longblob"); + + b.Property("ReadCdData") + .HasColumnType("longblob"); + + b.Property("ReadCdFullData") + .HasColumnType("longblob"); + + b.Property("ReadCdMsfData") + .HasColumnType("longblob"); + + b.Property("ReadCdMsfFullData") + .HasColumnType("longblob"); + + b.Property("ReadCdScrambledData") + .HasColumnType("longblob"); + + b.Property("ReadDmaData") + .HasColumnType("longblob"); + + b.Property("ReadDmaLba48Data") + .HasColumnType("longblob"); + + b.Property("ReadDmaLbaData") + .HasColumnType("longblob"); + + b.Property("ReadDmaRetryData") + .HasColumnType("longblob"); + + b.Property("ReadDmaRetryLbaData") + .HasColumnType("longblob"); + + b.Property("ReadLba48Data") + .HasColumnType("longblob"); + + b.Property("ReadLbaData") + .HasColumnType("longblob"); + + b.Property("ReadLong10Data") + .HasColumnType("longblob"); + + b.Property("ReadLong16Data") + .HasColumnType("longblob"); + + b.Property("ReadLongData") + .HasColumnType("longblob"); + + b.Property("ReadLongLbaData") + .HasColumnType("longblob"); + + b.Property("ReadLongRetryData") + .HasColumnType("longblob"); + + b.Property("ReadLongRetryLbaData") + .HasColumnType("longblob"); + + b.Property("ReadRetryLbaData") + .HasColumnType("longblob"); + + b.Property("ReadSectorsData") + .HasColumnType("longblob"); + + b.Property("ReadSectorsRetryData") + .HasColumnType("longblob"); + + b.Property("ScsiId") + .HasColumnType("int"); + + b.Property("SolidStateDevice") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsHLDTSTReadRawDVD") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsNECReadCDDA") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsPioneerReadCDDA") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsPioneerReadCDDAMSF") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsPlextorReadCDDA") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsPlextorReadRawDVD") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsRead10") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsRead12") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsRead16") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsRead6") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadCapacity") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadCapacity16") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadCd") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadCdMsf") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadCdMsfRaw") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadCdRaw") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadDma") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadDmaLba") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadDmaLba48") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadDmaRetry") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadDmaRetryLba") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadLba") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadLba48") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadLong") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadLong16") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadLongLba") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadLongRetry") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadLongRetryLba") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadRetry") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadRetryLba") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsReadSectors") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsSeek") + .HasColumnType("tinyint(1)"); + + b.Property("SupportsSeekLba") + .HasColumnType("tinyint(1)"); + + b.Property("TocData") + .HasColumnType("longblob"); + + b.Property("Track1PregapData") + .HasColumnType("longblob"); + + b.Property("UnformattedBPS") + .HasColumnType("smallint unsigned"); + + b.Property("UnformattedBPT") + .HasColumnType("smallint unsigned"); + + 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("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("CanReadMediaSerial") + .HasColumnType("tinyint(1)"); + + b.Property("Density") + .HasColumnType("tinyint unsigned"); + + b.Property("Manufacturer") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("MediaIsRecognized") + .HasColumnType("tinyint(1)"); + + b.Property("MediumType") + .HasColumnType("tinyint unsigned"); + + b.Property("MediumTypeName") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("ModeSense10Data") + .HasColumnType("longblob"); + + b.Property("ModeSense6Data") + .HasColumnType("longblob"); + + b.Property("Model") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("SscId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("SscId"); + + b.ToTable("TestedSequentialMedia"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Usb", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Descriptors") + .HasColumnType("longblob"); + + b.Property("Manufacturer") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Product") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("ProductID") + .HasColumnType("smallint unsigned"); + + b.Property("RemovableMedia") + .HasColumnType("tinyint(1)"); + + b.Property("VendorID") + .HasColumnType("smallint unsigned"); + + b.HasKey("Id"); + + b.ToTable("Usb"); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.Command", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("bigint"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("Commands"); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.CompactDiscOffset", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AddedWhen") + .HasColumnType("datetime(6)"); + + b.Property("Agreement") + .HasColumnType("float"); + + b.Property("Manufacturer") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Model") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("ModifiedWhen") + .HasColumnType("datetime(6)"); + + b.Property("Offset") + .HasColumnType("smallint"); + + b.Property("Submissions") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ModifiedWhen"); + + b.ToTable("CdOffsets"); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ATAId") + .HasColumnType("int"); + + b.Property("ATAPIId") + .HasColumnType("int"); + + b.Property("AddedWhen") + .HasColumnType("datetime(6)"); + + b.Property("CdOffsetId") + .HasColumnType("int"); + + b.Property("CompactFlash") + .HasColumnType("tinyint(1)"); + + b.Property("FireWireId") + .HasColumnType("int"); + + b.Property("Manufacturer") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Model") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("ModifiedWhen") + .HasColumnType("datetime(6)"); + + b.Property("MultiMediaCardId") + .HasColumnType("int"); + + b.Property("OptimalMultipleSectorsRead") + .HasColumnType("int"); + + b.Property("PCMCIAId") + .HasColumnType("int"); + + b.Property("Revision") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("SCSIId") + .HasColumnType("int"); + + b.Property("SecureDigitalId") + .HasColumnType("int"); + + b.Property("Type") + .HasColumnType("int"); + + b.Property("USBId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ATAId"); + + b.HasIndex("ATAPIId"); + + b.HasIndex("CdOffsetId"); + + b.HasIndex("FireWireId"); + + b.HasIndex("ModifiedWhen"); + + b.HasIndex("MultiMediaCardId"); + + b.HasIndex("PCMCIAId"); + + b.HasIndex("SCSIId"); + + b.HasIndex("SecureDigitalId"); + + b.HasIndex("USBId"); + + b.ToTable("Devices"); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Bus") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Manufacturer") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Model") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("ReportId") + .HasColumnType("int"); + + b.Property("Revision") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.HasIndex("ReportId"); + + b.ToTable("DeviceStats"); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.Filesystem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("bigint"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("Filesystems"); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.Filter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("bigint"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("Filters"); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.Media", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("bigint"); + + b.Property("Real") + .HasColumnType("tinyint(1)"); + + b.Property("Type") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("Medias"); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.MediaFormat", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("bigint"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("MediaFormats"); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.OperatingSystem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("bigint"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Version") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("OperatingSystems"); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.Partition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("bigint"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("Partitions"); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ATAId") + .HasColumnType("int"); + + b.Property("ATAPIId") + .HasColumnType("int"); + + b.Property("CompactFlash") + .HasColumnType("tinyint(1)"); + + b.Property("FireWireId") + .HasColumnType("int"); + + b.Property("Manufacturer") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Model") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("MultiMediaCardId") + .HasColumnType("int"); + + b.Property("PCMCIAId") + .HasColumnType("int"); + + b.Property("Revision") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("SCSIId") + .HasColumnType("int"); + + b.Property("SecureDigitalId") + .HasColumnType("int"); + + b.Property("Type") + .HasColumnType("int"); + + b.Property("USBId") + .HasColumnType("int"); + + b.Property("UploadedWhen") + .HasColumnType("datetime(6)"); + + 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"); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AddedWhen") + .HasColumnType("datetime(6)"); + + b.Property("ModifiedWhen") + .HasColumnType("datetime(6)"); + + b.Property("Product") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("ProductId") + .HasColumnType("smallint unsigned"); + + b.Property("VendorId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ModifiedWhen"); + + b.HasIndex("ProductId"); + + b.HasIndex("VendorId"); + + b.ToTable("UsbProducts"); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.UsbVendor", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("AddedWhen") + .HasColumnType("datetime(6)"); + + b.Property("ModifiedWhen") + .HasColumnType("datetime(6)"); + + b.Property("Vendor") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("VendorId") + .HasColumnType("smallint unsigned"); + + b.HasKey("Id"); + + b.HasIndex("ModifiedWhen"); + + b.HasIndex("VendorId") + .IsUnique(); + + b.ToTable("UsbVendors"); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.Version", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("bigint"); + + b.Property("Name") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.ToTable("Versions"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("varchar(255) CHARACTER SET utf8mb4"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Name") + .HasColumnType("varchar(256) CHARACTER SET utf8mb4") + .HasMaxLength(256); + + b.Property("NormalizedName") + .HasColumnType("varchar(256) CHARACTER SET utf8mb4") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasName("RoleNameIndex"); + + b.ToTable("AspNetRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("ClaimValue") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("RoleId") + .IsRequired() + .HasColumnType("varchar(255) CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b => + { + b.Property("Id") + .HasColumnType("varchar(255) CHARACTER SET utf8mb4"); + + b.Property("AccessFailedCount") + .HasColumnType("int"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("Email") + .HasColumnType("varchar(256) CHARACTER SET utf8mb4") + .HasMaxLength(256); + + b.Property("EmailConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("LockoutEnd") + .HasColumnType("datetime(6)"); + + b.Property("NormalizedEmail") + .HasColumnType("varchar(256) CHARACTER SET utf8mb4") + .HasMaxLength(256); + + b.Property("NormalizedUserName") + .HasColumnType("varchar(256) CHARACTER SET utf8mb4") + .HasMaxLength(256); + + b.Property("PasswordHash") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("PhoneNumber") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("tinyint(1)"); + + b.Property("SecurityStamp") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("TwoFactorEnabled") + .HasColumnType("tinyint(1)"); + + b.Property("UserName") + .HasColumnType("varchar(256) CHARACTER SET utf8mb4") + .HasMaxLength(256); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasName("UserNameIndex"); + + b.ToTable("AspNetUsers"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + b.Property("ClaimType") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("ClaimValue") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255) CHARACTER SET utf8mb4"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("varchar(128) CHARACTER SET utf8mb4") + .HasMaxLength(128); + + b.Property("ProviderKey") + .HasColumnType("varchar(128) CHARACTER SET utf8mb4") + .HasMaxLength(128); + + b.Property("ProviderDisplayName") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.Property("UserId") + .IsRequired() + .HasColumnType("varchar(255) CHARACTER SET utf8mb4"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("varchar(255) CHARACTER SET utf8mb4"); + + b.Property("RoleId") + .HasColumnType("varchar(255) CHARACTER SET utf8mb4"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("varchar(255) CHARACTER SET utf8mb4"); + + b.Property("LoginProvider") + .HasColumnType("varchar(128) CHARACTER SET utf8mb4") + .HasMaxLength(128); + + b.Property("Name") + .HasColumnType("varchar(128) CHARACTER SET utf8mb4") + .HasMaxLength(128); + + b.Property("Value") + .HasColumnType("longtext CHARACTER SET utf8mb4"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens"); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Ata", b => + { + b.HasOne("DiscImageChef.CommonTypes.Metadata.TestedMedia", "ReadCapabilities") + .WithMany() + .HasForeignKey("ReadCapabilitiesId") + .OnDelete(DeleteBehavior.SetNull); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.BlockDescriptor", b => + { + b.HasOne("DiscImageChef.CommonTypes.Metadata.ScsiMode", null) + .WithMany("BlockDescriptors") + .HasForeignKey("ScsiModeId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.DensityCode", b => + { + b.HasOne("DiscImageChef.CommonTypes.Metadata.SscSupportedMedia", null) + .WithMany("DensityCodes") + .HasForeignKey("SscSupportedMediaId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Mmc", b => + { + b.HasOne("DiscImageChef.CommonTypes.Metadata.MmcFeatures", "Features") + .WithMany() + .HasForeignKey("FeaturesId") + .OnDelete(DeleteBehavior.SetNull); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.Scsi", b => + { + b.HasOne("DiscImageChef.CommonTypes.Metadata.ScsiMode", "ModeSense") + .WithMany() + .HasForeignKey("ModeSenseId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.Mmc", "MultiMediaDevice") + .WithMany() + .HasForeignKey("MultiMediaDeviceId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.TestedMedia", "ReadCapabilities") + .WithMany() + .HasForeignKey("ReadCapabilitiesId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.Ssc", "SequentialDevice") + .WithMany() + .HasForeignKey("SequentialDeviceId") + .OnDelete(DeleteBehavior.SetNull); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.ScsiPage", b => + { + b.HasOne("DiscImageChef.CommonTypes.Metadata.Scsi", null) + .WithMany("EVPDPages") + .HasForeignKey("ScsiId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.ScsiMode", null) + .WithMany("ModePages") + .HasForeignKey("ScsiModeId") + .OnDelete(DeleteBehavior.SetNull); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.SscSupportedMedia", b => + { + b.HasOne("DiscImageChef.CommonTypes.Metadata.Ssc", null) + .WithMany("SupportedMediaTypes") + .HasForeignKey("SscId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.TestedSequentialMedia", null) + .WithMany("SupportedMediaTypes") + .HasForeignKey("TestedSequentialMediaId") + .OnDelete(DeleteBehavior.SetNull); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.SupportedDensity", b => + { + b.HasOne("DiscImageChef.CommonTypes.Metadata.Ssc", null) + .WithMany("SupportedDensities") + .HasForeignKey("SscId") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.TestedSequentialMedia", null) + .WithMany("SupportedDensities") + .HasForeignKey("TestedSequentialMediaId") + .OnDelete(DeleteBehavior.Cascade); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.TestedMedia", b => + { + b.HasOne("DiscImageChef.CommonTypes.Metadata.Ata", null) + .WithMany("RemovableMedias") + .HasForeignKey("AtaId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.Chs", "CHS") + .WithMany() + .HasForeignKey("CHSId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.Chs", "CurrentCHS") + .WithMany() + .HasForeignKey("CurrentCHSId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.Mmc", null) + .WithMany("TestedMedia") + .HasForeignKey("MmcId") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.Scsi", null) + .WithMany("RemovableMedias") + .HasForeignKey("ScsiId") + .OnDelete(DeleteBehavior.SetNull); + }); + + modelBuilder.Entity("DiscImageChef.CommonTypes.Metadata.TestedSequentialMedia", b => + { + b.HasOne("DiscImageChef.CommonTypes.Metadata.Ssc", null) + .WithMany("TestedMedia") + .HasForeignKey("SscId") + .OnDelete(DeleteBehavior.SetNull); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.Device", b => + { + b.HasOne("DiscImageChef.CommonTypes.Metadata.Ata", "ATA") + .WithMany() + .HasForeignKey("ATAId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.Ata", "ATAPI") + .WithMany() + .HasForeignKey("ATAPIId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.Server.Models.CompactDiscOffset", "CdOffset") + .WithMany("Devices") + .HasForeignKey("CdOffsetId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.FireWire", "FireWire") + .WithMany() + .HasForeignKey("FireWireId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.MmcSd", "MultiMediaCard") + .WithMany() + .HasForeignKey("MultiMediaCardId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.Pcmcia", "PCMCIA") + .WithMany() + .HasForeignKey("PCMCIAId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.Scsi", "SCSI") + .WithMany() + .HasForeignKey("SCSIId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.MmcSd", "SecureDigital") + .WithMany() + .HasForeignKey("SecureDigitalId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.Usb", "USB") + .WithMany() + .HasForeignKey("USBId") + .OnDelete(DeleteBehavior.SetNull); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.DeviceStat", b => + { + b.HasOne("DiscImageChef.Server.Models.Device", "Report") + .WithMany() + .HasForeignKey("ReportId") + .OnDelete(DeleteBehavior.SetNull); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.UploadedReport", b => + { + b.HasOne("DiscImageChef.CommonTypes.Metadata.Ata", "ATA") + .WithMany() + .HasForeignKey("ATAId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.Ata", "ATAPI") + .WithMany() + .HasForeignKey("ATAPIId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.FireWire", "FireWire") + .WithMany() + .HasForeignKey("FireWireId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.MmcSd", "MultiMediaCard") + .WithMany() + .HasForeignKey("MultiMediaCardId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.Pcmcia", "PCMCIA") + .WithMany() + .HasForeignKey("PCMCIAId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.Scsi", "SCSI") + .WithMany() + .HasForeignKey("SCSIId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.MmcSd", "SecureDigital") + .WithMany() + .HasForeignKey("SecureDigitalId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("DiscImageChef.CommonTypes.Metadata.Usb", "USB") + .WithMany() + .HasForeignKey("USBId") + .OnDelete(DeleteBehavior.SetNull); + }); + + modelBuilder.Entity("DiscImageChef.Server.Models.UsbProduct", b => + { + b.HasOne("DiscImageChef.Server.Models.UsbVendor", "Vendor") + .WithMany("Products") + .HasForeignKey("VendorId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/DiscImageChef.Server/Migrations/20191203212552_NameCountModel.cs b/DiscImageChef.Server/Migrations/20191203212552_NameCountModel.cs new file mode 100644 index 00000000..7de65980 --- /dev/null +++ b/DiscImageChef.Server/Migrations/20191203212552_NameCountModel.cs @@ -0,0 +1,13 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace DiscImageChef.Server.Migrations +{ + public partial class NameCountModel : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) => + migrationBuilder.Sql("ALTER TABLE Versions CHANGE `Value` `Name` LONGTEXT"); + + protected override void Down(MigrationBuilder migrationBuilder) => + migrationBuilder.Sql("ALTER TABLE Versions CHANGE `Name` `Value` LONGTEXT"); + } +} \ No newline at end of file diff --git a/DiscImageChef.Server/Migrations/DicServerContextModelSnapshot.cs b/DiscImageChef.Server/Migrations/DicServerContextModelSnapshot.cs index f5956861..b89cff84 100644 --- a/DiscImageChef.Server/Migrations/DicServerContextModelSnapshot.cs +++ b/DiscImageChef.Server/Migrations/DicServerContextModelSnapshot.cs @@ -1278,7 +1278,7 @@ namespace DiscImageChef.Server.Migrations b.Property("Count").HasColumnType("bigint"); - b.Property("Value").HasColumnType("longtext CHARACTER SET utf8mb4"); + b.Property("Name").HasColumnType("longtext CHARACTER SET utf8mb4"); b.HasKey("Id"); diff --git a/DiscImageChef.Server/Models/Command.cs b/DiscImageChef.Server/Models/Command.cs index 6fe0dfe1..dd14fafc 100644 --- a/DiscImageChef.Server/Models/Command.cs +++ b/DiscImageChef.Server/Models/Command.cs @@ -32,9 +32,5 @@ namespace DiscImageChef.Server.Models { - public class Command : BaseModel - { - public string Name { get; set; } - public long Count { get; set; } - } + public class Command : NameCountModel { } } \ No newline at end of file diff --git a/DiscImageChef.Server/Models/Filesystem.cs b/DiscImageChef.Server/Models/Filesystem.cs index 4ccd324f..8fdc1825 100644 --- a/DiscImageChef.Server/Models/Filesystem.cs +++ b/DiscImageChef.Server/Models/Filesystem.cs @@ -32,9 +32,5 @@ namespace DiscImageChef.Server.Models { - public class Filesystem : BaseModel - { - public string Name { get; set; } - public long Count { get; set; } - } + public class Filesystem : NameCountModel { } } \ No newline at end of file diff --git a/DiscImageChef.Server/Models/Filter.cs b/DiscImageChef.Server/Models/Filter.cs index 5103d3f8..c7be4555 100644 --- a/DiscImageChef.Server/Models/Filter.cs +++ b/DiscImageChef.Server/Models/Filter.cs @@ -32,9 +32,5 @@ namespace DiscImageChef.Server.Models { - public class Filter : BaseModel - { - public string Name { get; set; } - public long Count { get; set; } - } + public class Filter : NameCountModel { } } \ No newline at end of file diff --git a/DiscImageChef.Server/Models/MediaFormat.cs b/DiscImageChef.Server/Models/MediaFormat.cs index b438431f..ca762a30 100644 --- a/DiscImageChef.Server/Models/MediaFormat.cs +++ b/DiscImageChef.Server/Models/MediaFormat.cs @@ -32,9 +32,5 @@ namespace DiscImageChef.Server.Models { - public class MediaFormat : BaseModel - { - public string Name { get; set; } - public long Count { get; set; } - } + public class MediaFormat : NameCountModel { } } \ No newline at end of file diff --git a/DiscImageChef.Server/Models/NameCountModel.cs b/DiscImageChef.Server/Models/NameCountModel.cs new file mode 100644 index 00000000..5d709dc1 --- /dev/null +++ b/DiscImageChef.Server/Models/NameCountModel.cs @@ -0,0 +1,8 @@ +namespace DiscImageChef.Server.Models +{ + public class NameCountModel : BaseModel + { + public string Name { get; set; } + public long Count { get; set; } + } +} \ No newline at end of file diff --git a/DiscImageChef.Server/Models/Partition.cs b/DiscImageChef.Server/Models/Partition.cs index afe153b3..45e0a72c 100644 --- a/DiscImageChef.Server/Models/Partition.cs +++ b/DiscImageChef.Server/Models/Partition.cs @@ -32,9 +32,5 @@ namespace DiscImageChef.Server.Models { - public class Partition : BaseModel - { - public string Name { get; set; } - public long Count { get; set; } - } + public class Partition : NameCountModel { } } \ No newline at end of file diff --git a/DiscImageChef.Server/Models/Version.cs b/DiscImageChef.Server/Models/Version.cs index 6e964bef..82dced97 100644 --- a/DiscImageChef.Server/Models/Version.cs +++ b/DiscImageChef.Server/Models/Version.cs @@ -32,9 +32,5 @@ namespace DiscImageChef.Server.Models { - public class Version : BaseModel - { - public string Value { get; set; } - public long Count { get; set; } - } + public class Version : NameCountModel { } } \ No newline at end of file