aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add basic fields to device report.

Browse Source
This commit is contained in:
Natalia Portillo
2018-11-27 00:23:05 +00:00
parent 714ed8ef0f
commit 0696a82916
8 changed files with 1274 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/.idea.DiscImageChef/.idea/contentModel.xml generated
View File

@@ -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">

6
DiscImageChef.CommonTypes/Metadata/DeviceReportV2.cs
View File

@@ -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

1182
DiscImageChef.Database/Migrations/20181127001622_AddDeviceBasicFields.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

50
DiscImageChef.Database/Migrations/20181127001622_AddDeviceBasicFields.cs Normal file
View File

@@ -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");
}
}
}

8
DiscImageChef.Database/Migrations/DicContextModelSnapshot.cs
View File

@@ -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");

9
DiscImageChef.Database/Models/Device.cs
View File

@@ -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; }

10
DiscImageChef.Database/Models/Report.cs
View File

@@ -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; }

5
DiscImageChef/Commands/DeviceReport.cs
View File

@@ -67,7 +67,10 @@ namespace DiscImageChef.Commands
Core.Statistics.AddDevice(dev);
DeviceReportV2 report = new DeviceReportV2();
DeviceReportV2 report = new DeviceReportV2
{
Manufacturer = dev.Manufacturer, Model = dev.Model, Revision = dev.Revision, Type = dev.Type
};
bool removable = false;
string jsonFile;