diff --git a/CHANGELIST.md b/CHANGELIST.md index b4c61ab5..9c9c19b8 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -161,6 +161,7 @@ - Disable XGD layerbreak reporting - Disable XGD1 PVD reporting - Put Redump limitations behind existing flag +- Add framework for reported disc type ### 2.3 (2022-02-05) - Start overhauling Redump information pulling, again diff --git a/MPF.Core/Data/Constants.cs b/MPF.Core/Data/Constants.cs index e59aac6c..c8e7a8ce 100644 --- a/MPF.Core/Data/Constants.cs +++ b/MPF.Core/Data/Constants.cs @@ -86,6 +86,7 @@ namespace MPF.Core.Data public const string DumpingDriveManufacturer = "Manufacturer"; public const string DumpingDriveModel = "Model"; public const string DumpingDriveFirmware = "Firmware"; + public const string ReportedDiscType = "Reported Disc Type"; public const string PVDField = "Primary Volume Descriptor (PVD)"; public const string DATField = "DAT"; public const string SizeField = "Size"; diff --git a/MPF.Library/InfoTool.cs b/MPF.Library/InfoTool.cs index 701659b1..b2a70482 100644 --- a/MPF.Library/InfoTool.cs +++ b/MPF.Library/InfoTool.cs @@ -842,6 +842,7 @@ namespace MPF.Library AddIfExists(output, Template.DumpingDriveManufacturer, info.DumpingInfo.Manufacturer, 1); AddIfExists(output, Template.DumpingDriveModel, info.DumpingInfo.Model, 1); AddIfExists(output, Template.DumpingDriveFirmware, info.DumpingInfo.Firmware, 1); + AddIfExists(output, Template.ReportedDiscType, info.DumpingInfo.ReportedDiscType, 1); // Make sure there aren't any instances of two blank lines in a row string last = null; diff --git a/MPF.Test/RedumpLib/SubmissionInfoTests.cs b/MPF.Test/RedumpLib/SubmissionInfoTests.cs index a8c788c6..73e5de5e 100644 --- a/MPF.Test/RedumpLib/SubmissionInfoTests.cs +++ b/MPF.Test/RedumpLib/SubmissionInfoTests.cs @@ -163,6 +163,7 @@ namespace MPF.Test.RedumpLib Manufacturer = "ATAPI", Model = "Optical Drive", Firmware = "1.23", + ReportedDiscType = "CD-R", }, Artifacts = new Dictionary() diff --git a/MPF/ViewModels/MainViewModel.cs b/MPF/ViewModels/MainViewModel.cs index 9333e265..23ca43f2 100644 --- a/MPF/ViewModels/MainViewModel.cs +++ b/MPF/ViewModels/MainViewModel.cs @@ -405,6 +405,7 @@ namespace MPF.UI.ViewModels Manufacturer = "ATAPI", Model = "Optical Drive", Firmware = "1.23", + ReportedDiscType = "CD-R", }, Artifacts = new Dictionary() diff --git a/RedumpLib/Data/SubmissionInfo.cs b/RedumpLib/Data/SubmissionInfo.cs index e390d70a..fc875c81 100644 --- a/RedumpLib/Data/SubmissionInfo.cs +++ b/RedumpLib/Data/SubmissionInfo.cs @@ -542,6 +542,10 @@ namespace RedumpLib.Data [JsonProperty(PropertyName = "d_drive_firmware", Required = Required.AllowNull)] public string Firmware { get; set; } + // Name not defined by Redump + [JsonProperty(PropertyName = "d_reported_disc_type", Required = Required.AllowNull)] + public string ReportedDiscType { get; set; } + public object Clone() { return new DumpingInfoSection @@ -550,6 +554,7 @@ namespace RedumpLib.Data Manufacturer = this.Manufacturer, Model = this.Model, Firmware = this.Firmware, + ReportedDiscType = this.ReportedDiscType, }; } }