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

Refactor rename "Revision" to "FirmwareRevision".

Browse Source
This commit is contained in:
Natalia Portillo
2020-01-09 15:02:21 +00:00
parent 823b399932
commit 13ccbcb998
13 changed files with 726 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DiscImageChef/Commands/Device/DeviceReport.cs
View File

@@ -129,19 +129,19 @@ namespace DiscImageChef.Commands.Device
var report = new DeviceReportV2
{
Manufacturer = dev.Manufacturer, Model = dev.Model, Revision = dev.Revision, Type = dev.Type
Manufacturer = dev.Manufacturer, Model = dev.Model, Revision = dev.FirmwareRevision, 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";
!string.IsNullOrWhiteSpace(dev.FirmwareRevision))
jsonFile = dev.Manufacturer + "_" + dev.Model + "_" + dev.FirmwareRevision + ".json";
else if(!string.IsNullOrWhiteSpace(dev.Manufacturer))
jsonFile = dev.Manufacturer + "_" + dev.Model + ".json";
else if(!string.IsNullOrWhiteSpace(dev.Revision))
jsonFile = dev.Model + "_" + dev.Revision + ".json";
else if(!string.IsNullOrWhiteSpace(dev.FirmwareRevision))
jsonFile = dev.Model + "_" + dev.FirmwareRevision + ".json";
else
jsonFile = dev.Model + ".json";

2
DiscImageChef/Commands/Device/Info.cs
View File

@@ -1078,7 +1078,7 @@ namespace DiscImageChef.Commands.Device
// Search for device in master database
Database.Models.Device dbDev =
ctx.Devices.FirstOrDefault(d => d.Manufacturer == dev.Manufacturer && d.Model == dev.Model &&
d.Revision == dev.Revision);
d.Revision == dev.FirmwareRevision);
if(dbDev is null)
DicConsole.WriteLine("Device not in database, please create a device report and attach it to a Github issue.");

2
DiscImageChef/Commands/Media/Info.cs
View File

@@ -557,7 +557,7 @@ namespace DiscImageChef.Commands.Media
// Search for device in master database
Database.Models.Device dbDev =
ctx.Devices.FirstOrDefault(d => d.Manufacturer == dev.Manufacturer && d.Model == dev.Model &&
d.Revision == dev.Revision);
d.Revision == dev.FirmwareRevision);
Dump.SolveTrackPregaps(dev, null, null, tracks, supportsPqSubchannel, supportsRwSubchannel, dbDev,
out bool inexactPositioning);