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

Get platform automatically when creating softwaretype.

Browse Source
This commit is contained in:
Natalia Portillo
2017-12-29 01:34:02 +00:00
parent efc48f3e6a
commit efd1236999
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DiscImageChef.Core/Devices/Dumping/ResumeSupport.cs
View File

@@ -117,7 +117,7 @@ namespace DiscImageChef.Core.Devices.Dumping
currentTry = new DumpHardwareType currentTry = new DumpHardwareType
{ {
Software = Metadata.Version.GetSoftwareType(platform), Software = Metadata.Version.GetSoftwareType(),
Manufacturer = manufacturer, Manufacturer = manufacturer,
Model = model, Model = model,
Serial = serial Serial = serial
@@ -136,7 +136,7 @@ namespace DiscImageChef.Core.Devices.Dumping
}; };
currentTry = new DumpHardwareType currentTry = new DumpHardwareType
{ {
Software = Metadata.Version.GetSoftwareType(platform), Software = Metadata.Version.GetSoftwareType(),
Manufacturer = manufacturer, Manufacturer = manufacturer,
Model = model, Model = model,
Serial = serial Serial = serial

2
DiscImageChef.Core/Devices/Dumping/SSC.cs
View File

@@ -670,7 +670,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.BlockMedia[0].DumpHardwareArray[0].Model = dev.Model; sidecar.BlockMedia[0].DumpHardwareArray[0].Model = dev.Model;
sidecar.BlockMedia[0].DumpHardwareArray[0].Revision = dev.Revision; sidecar.BlockMedia[0].DumpHardwareArray[0].Revision = dev.Revision;
sidecar.BlockMedia[0].DumpHardwareArray[0].Serial = dev.Serial; sidecar.BlockMedia[0].DumpHardwareArray[0].Serial = dev.Serial;
sidecar.BlockMedia[0].DumpHardwareArray[0].Software = Version.GetSoftwareType(dev.PlatformId); sidecar.BlockMedia[0].DumpHardwareArray[0].Software = Version.GetSoftwareType();
sidecar.BlockMedia[0].TapeInformation = partitions.ToArray(); sidecar.BlockMedia[0].TapeInformation = partitions.ToArray();
if(!aborted) if(!aborted)

6
DiscImageChef.Metadata/Version.cs
View File

@@ -40,15 +40,13 @@ namespace DiscImageChef.Metadata
/// <summary> /// <summary>
/// Gets XML software type for the running version /// Gets XML software type for the running version
/// </summary> /// </summary>
/// <param name="platform">Platform we are running in</param>
/// <returns>XML software type</returns> /// <returns>XML software type</returns>
public static SoftwareType GetSoftwareType(PlatformID platform) public static SoftwareType GetSoftwareType()
{ {
// TODO: Platform should be get automatically
return new SoftwareType return new SoftwareType
{ {
Name = "DiscImageChef", Name = "DiscImageChef",
OperatingSystem = platform.ToString(), OperatingSystem = DetectOS.GetRealPlatformID().ToString(),
Version = typeof(Version).Assembly.GetName().Version.ToString() Version = typeof(Version).Assembly.GetName().Version.ToString()
}; };
} }