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 database entry for optimal count of sectors for multiple read in devices.

Browse Source
This commit is contained in:
Natalia Portillo
2019-01-03 16:55:15 +00:00
parent 38544897e5
commit cb1ed0450c
16 changed files with 1791 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,6 +333,8 @@
<e p="20181225214500_StoreReadResultsInReportDatabase.cs" t="Include" />
<e p="20190102061236_AddMultisessionLeadTest.Designer.cs" t="Include" />
<e p="20190102061236_AddMultisessionLeadTest.cs" t="Include" />
<e p="20190102230036_AddOptimalReadMultipleCount.Designer.cs" t="Include" />
<e p="20190102230036_AddOptimalReadMultipleCount.cs" t="Include" />
<e p="DicContextModelSnapshot.cs" t="Include" />
</e>
<e p="Models" t="Include">
@@ -1859,6 +1861,9 @@
<e p="201901022133012_AddMultisessionLeadTest.Designer.cs" t="Include" />
<e p="201901022133012_AddMultisessionLeadTest.cs" t="Include" />
<e p="201901022133012_AddMultisessionLeadTest.resx" t="Include" />
<e p="201901030344456_AddOptimalReadMultipleCount.Designer.cs" t="Include" />
<e p="201901030344456_AddOptimalReadMultipleCount.cs" t="Include" />
<e p="201901030344456_AddOptimalReadMultipleCount.resx" t="Include" />
<e p="Configuration.cs" t="Include" />
</e>
<e p="Models" t="Include">

11
DiscImageChef.Core/Remote.cs
View File

@@ -344,13 +344,20 @@ namespace DiscImageChef.Core
if(existing != null)
{
modifiedDevices++;
existing = new Device(device) {Id = device.Id};
existing = new Device(device)
{
Id = device.Id, OptimalMultipleSectorsRead = device.OptimalMultipleSectorsRead
};
mctx.Devices.Update(existing);
}
else
{
addedDevices++;
mctx.Devices.Add(new Device(device) {Id = device.Id});
mctx.Devices.Add(new Device(device)
{
Id = device.Id,
OptimalMultipleSectorsRead = device.OptimalMultipleSectorsRead
});
}
}

2
DiscImageChef.Database/DiscImageChef.Database.csproj
View File

@@ -93,6 +93,8 @@
<Compile Include="Migrations\20181225214500_StoreReadResultsInReportDatabase.Designer.cs" />
<Compile Include="Migrations\20190102061236_AddMultisessionLeadTest.cs" />
<Compile Include="Migrations\20190102061236_AddMultisessionLeadTest.Designer.cs" />
<Compile Include="Migrations\20190102230036_AddOptimalReadMultipleCount.cs" />
<Compile Include="Migrations\20190102230036_AddOptimalReadMultipleCount.Designer.cs" />
<Compile Include="Migrations\DicContextModelSnapshot.cs" />
<Compile Include="Models\CdOffset.cs" />
<Compile Include="Models\Command.cs" />

1561
DiscImageChef.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

17
DiscImageChef.Database/Migrations/20190102230036_AddOptimalReadMultipleCount.cs Normal file
View File

@@ -0,0 +1,17 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace DiscImageChef.Database.Migrations
{
public partial class AddOptimalReadMultipleCount : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>("OptimalMultipleSectorsRead", "Devices", nullable: false, defaultValue: 0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn("OptimalMultipleSectorsRead", "Devices");
}
}
}

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

@@ -1078,6 +1078,8 @@ namespace DiscImageChef.Database.Migrations
b.Property<int?>("MultiMediaCardId");
b.Property<int>("OptimalMultipleSectorsRead");
b.Property<int?>("PCMCIAId");
b.Property<string>("Revision");

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

@@ -31,6 +31,7 @@
// ****************************************************************************/
using System;
using System.ComponentModel;
using DiscImageChef.CommonTypes.Metadata;
namespace DiscImageChef.Database.Models
@@ -61,5 +62,8 @@ namespace DiscImageChef.Database.Models
}
public DateTime LastSynchronized { get; set; }
[DefaultValue(0)]
public int OptimalMultipleSectorsRead { get; set; }
}
}

5
DiscImageChef.Dto/DeviceDto.cs
View File

@@ -58,7 +58,7 @@ namespace DiscImageChef.Dto
Type = report.Type;
}
public DeviceDto(DeviceReportV2 report, int id)
public DeviceDto(DeviceReportV2 report, int id, int optimalMultipleSectorsRead)
{
ATA = report.ATA;
ATAPI = report.ATAPI;
@@ -149,8 +149,11 @@ namespace DiscImageChef.Dto
if(USB != null) USB.Descriptors = null;
Id = id;
OptimalMultipleSectorsRead = optimalMultipleSectorsRead;
}
public int OptimalMultipleSectorsRead { get; set; }
public new int Id { get; set; }
static TestedMedia ClearBinaries(TestedMedia media)

1
DiscImageChef.Server.Task/DiscImageChef.Server.Task.csproj
View File

@@ -10,6 +10,7 @@
<RootNamespace>DiscImageChef.Server.Task</RootNamespace>
<AssemblyName>DiscImageChef.Server.Task</AssemblyName>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

2
DiscImageChef.Server/Controllers/UpdateController.cs
View File

@@ -82,7 +82,7 @@ namespace DiscImageChef.Server.Controllers
foreach(Device device in ctx.Devices.Where(d => d.ModifiedWhen > lastSync).ToList())
sync.Devices.Add(new
DeviceDto(JsonConvert.DeserializeObject<DeviceReportV2>(JsonConvert.SerializeObject(device)),
device.Id));
device.Id, device.OptimalMultipleSectorsRead));
JsonSerializer js = JsonSerializer.Create();
StringWriter sw = new StringWriter();

7
DiscImageChef.Server/DiscImageChef.Server.csproj
View File

@@ -260,6 +260,10 @@
<Compile Include="Migrations\201901022133012_AddMultisessionLeadTest.Designer.cs">
<DependentUpon>201901022133012_AddMultisessionLeadTest.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\201901030344456_AddOptimalReadMultipleCount.cs" />
<Compile Include="Migrations\201901030344456_AddOptimalReadMultipleCount.Designer.cs">
<DependentUpon>201901030344456_AddOptimalReadMultipleCount.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\Configuration.cs" />
<Compile Include="Models\CdOffset.cs" />
<Compile Include="Models\Command.cs" />
@@ -387,6 +391,9 @@
<EmbeddedResource Include="Migrations\201901022133012_AddMultisessionLeadTest.resx">
<DependentUpon>201901022133012_AddMultisessionLeadTest.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\201901030344456_AddOptimalReadMultipleCount.resx">
<DependentUpon>201901030344456_AddOptimalReadMultipleCount.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

29
DiscImageChef.Server/Migrations/201901030344456_AddOptimalReadMultipleCount.Designer.cs generated Normal file
View File

@@ -0,0 +1,29 @@
// <auto-generated />
namespace DiscImageChef.Server.Migrations
{
using System.CodeDom.Compiler;
using System.Data.Entity.Migrations;
using System.Data.Entity.Migrations.Infrastructure;
using System.Resources;
[GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")]
public sealed partial class AddOptimalReadMultipleCount : IMigrationMetadata
{
private readonly ResourceManager Resources = new ResourceManager(typeof(AddOptimalReadMultipleCount));
string IMigrationMetadata.Id
{
get { return "201901030344456_AddOptimalReadMultipleCount"; }
}
string IMigrationMetadata.Source
{
get { return null; }
}
string IMigrationMetadata.Target
{
get { return Resources.GetString("Target"); }
}
}
}

17
DiscImageChef.Server/Migrations/201901030344456_AddOptimalReadMultipleCount.cs Normal file
View File

@@ -0,0 +1,17 @@
using System.Data.Entity.Migrations;
namespace DiscImageChef.Server.Migrations
{
public partial class AddOptimalReadMultipleCount : DbMigration
{
public override void Up()
{
AddColumn("dbo.Devices", "OptimalMultipleSectorsRead", c => c.Int(false, defaultValue: 0));
}
public override void Down()
{
DropColumn("dbo.Devices", "OptimalMultipleSectorsRead");
}
}
}

126
DiscImageChef.Server/Migrations/201901030344456_AddOptimalReadMultipleCount.resx Normal file
View File

File diff suppressed because one or more lines are too long

3
DiscImageChef.Server/Models/Device.cs
View File

@@ -31,6 +31,7 @@
// ****************************************************************************/
using System;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations.Schema;
using DiscImageChef.CommonTypes.Metadata;
@@ -66,5 +67,7 @@ namespace DiscImageChef.Server.Models
[Index]
public DateTime? ModifiedWhen { get; set; }
public virtual CompactDiscOffset CdOffset { get; set; }
[DefaultValue(0)]
public int OptimalMultipleSectorsRead { get; set; }
}
}

2
DiscImageChef.Server/docs/README.md
View File

@@ -2,7 +2,7 @@ DiscImageChef v4.5.99.1693
Disc Image Chef (because "swiss-army-knife" is used too much)
Copyright © 2011-2019 Natalia Portillo <claunia@claunia.com>
Copyright © 2011-2018 Natalia Portillo <claunia@claunia.com>
[![Build status](https://dev.azure.com/DiscImageChef/DiscImageChef/_apis/build/status/DiscImageChef-.NET%20Desktop-CI)](https://dev.azure.com/DiscImageChef/DiscImageChef/_build/latest?definitionId=4)
[![Build Status](https://travis-ci.org/claunia/DiscImageChef.svg?branch=master)](https://travis-ci.org/claunia/DiscImageChef)