SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Add dumping info section skeleton

Browse Source
This commit is contained in:
Matt Nadareski
2022-10-06 11:11:23 -07:00
parent 2f3e7d105d
commit 1a9d38dd0e
8 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MPF.Library/InfoTool.cs
View File

@@ -660,7 +660,6 @@ namespace MPF.Library
info.SizeAndChecksums.Layerbreak2,
info.SizeAndChecksums.Layerbreak3),
1);
AddIfExists(output, Template.DumpingProgramField, info.CommonDiscInfo.DumpingProgram, 1);
AddIfExists(output, Template.CategoryField, info.CommonDiscInfo.Category.LongName(), 1);
AddIfExists(output, Template.FullyMatchingIDField, info.FullyMatchedID?.ToString(), 1);
AddIfExists(output, Template.PartiallyMatchingIDsField, info.PartiallyMatchedIDs, 1);
@@ -751,6 +750,10 @@ namespace MPF.Library
AddIfExists(output, Template.CommentsField, info.CommonDiscInfo.Comments.Trim(), 1);
AddIfExists(output, Template.ContentsField, info.CommonDiscInfo.Contents.Trim(), 1);
// Dumping Info section
output.Add(""); output.Add("Dumping Info:");
AddIfExists(output, Template.DumpingProgramField, info.DumpingInfo.DumpingProgram, 1);
// Version and Editions section
output.Add(""); output.Add("Version and Editions:");
AddIfExists(output, Template.VersionField, info.VersionAndEditions.Version, 1);

2
MPF.Modules/DD/Parameters.cs
View File

@@ -82,7 +82,7 @@ namespace MPF.Modules.DD
string outputDirectory = Path.GetDirectoryName(basePath);
// TODO: Determine if there's a DD version anywhere
info.CommonDiscInfo.DumpingProgram = EnumConverter.LongName(this.InternalProgram);
info.DumpingInfo.DumpingProgram = EnumConverter.LongName(this.InternalProgram);
switch (this.Type)
{

2
MPF.Modules/DiscImageCreator/Parameters.cs
View File

@@ -377,7 +377,7 @@ namespace MPF.Modules.DiscImageCreator
// Get the dumping program and version
(_, string dicVersion) = GetCommandFilePathAndVersion(basePath);
info.CommonDiscInfo.DumpingProgram = $"{EnumConverter.LongName(this.InternalProgram)} {dicVersion ?? "Unknown Version"}";
info.DumpingInfo.DumpingProgram = $"{EnumConverter.LongName(this.InternalProgram)} {dicVersion ?? "Unknown Version"}";
// Fill in the hash data
info.TracksAndWriteOffsets.ClrMameProData = GetDatfile($"{basePath}.dat");

2
MPF.Modules/Redumper/Parameters.cs
View File

@@ -130,7 +130,7 @@ namespace MPF.Modules.Redumper
string outputDirectory = Path.GetDirectoryName(basePath);
// TODO: Determine if there's a Redumper version anywhere
info.CommonDiscInfo.DumpingProgram = EnumConverter.LongName(this.InternalProgram);
info.DumpingInfo.DumpingProgram = EnumConverter.LongName(this.InternalProgram);
switch (this.Type)
{

2
MPF.Modules/UmdImageCreator/Parameters.cs
View File

@@ -65,7 +65,7 @@ namespace MPF.Modules.UmdImageCreator
public override void GenerateSubmissionInfo(SubmissionInfo info, string basePath, Drive drive, bool includeArtifacts)
{
// TODO: Determine if there's a UMDImageCreator version anywhere
info.CommonDiscInfo.DumpingProgram = EnumConverter.LongName(this.InternalProgram);
info.DumpingInfo.DumpingProgram = EnumConverter.LongName(this.InternalProgram);
// Extract info based generically on MediaType
switch (this.Type)

6
MPF.Test/RedumpLib/SubmissionInfoTests.cs
View File

@@ -51,7 +51,6 @@ namespace MPF.Test.RedumpLib
{
System = RedumpSystem.IBMPCcompatible,
Media = DiscType.CD,
DumpingProgram = "DiscImageCreator 20500101",
Title = "Game Title",
ForeignTitleNonLatin = "Foreign Game Title",
DiscNumberLetter = "1",
@@ -93,6 +92,11 @@ namespace MPF.Test.RedumpLib
},
},
DumpingInfo = new DumpingInfoSection()
{
DumpingProgram = "DiscImageCreator 20500101",
},
VersionAndEditions = new VersionAndEditionsSection()
{
Version = "Original",

6
MPF/ViewModels/MainViewModel.cs
View File

@@ -293,7 +293,6 @@ namespace MPF.UI.ViewModels
{
System = RedumpSystem.IBMPCcompatible,
Media = DiscType.BD128,
DumpingProgram = "DiscImageCreator 20500101",
Title = "Game Title",
ForeignTitleNonLatin = "Foreign Game Title",
DiscNumberLetter = "1",
@@ -335,6 +334,11 @@ namespace MPF.UI.ViewModels
},
},
DumpingInfo = new DumpingInfoSection()
{
DumpingProgram = "DiscImageCreator 20500101",
},
VersionAndEditions = new VersionAndEditionsSection()
{
Version = "Original",

14
RedumpLib/Data/SubmissionInfo.cs
View File

@@ -81,6 +81,7 @@ namespace RedumpLib.Data
Added = this.Added,
LastModified = this.LastModified,
CommonDiscInfo = this.CommonDiscInfo?.Clone() as CommonDiscInfoSection,
DumpingInfo = this.DumpingInfo?.Clone() as DumpingInfoSection,
VersionAndEditions = this.VersionAndEditions?.Clone() as VersionAndEditionsSection,
EDC = this.EDC?.Clone() as EDCSection,
ParentCloneRelationship = this.ParentCloneRelationship?.Clone() as ParentCloneRelationshipSection,
@@ -109,10 +110,6 @@ namespace RedumpLib.Data
[JsonConverter(typeof(DiscTypeConverter))]
public DiscType? Media { get; set; }
// Name not defined by Redump
[JsonProperty(PropertyName = "d_dumping_program", Required = Required.AllowNull)]
public string DumpingProgram { get; set; }
[JsonProperty(PropertyName = "d_title", Required = Required.AllowNull)]
public string Title { get; set; }
@@ -240,7 +237,6 @@ namespace RedumpLib.Data
{
System = this.System,
Media = this.Media,
DumpingProgram = this.DumpingProgram,
Title = this.Title,
ForeignTitleNonLatin = this.ForeignTitleNonLatin,
DiscNumberLetter = this.DiscNumberLetter,
@@ -287,13 +283,17 @@ namespace RedumpLib.Data
/// </summary>
public class DumpingInfoSection : ICloneable
{
// TODO: Add properties here
// Name not defined by Redump
[JsonProperty(PropertyName = "d_dumping_program", Required = Required.AllowNull)]
public string DumpingProgram { get; set; }
// TODO: Add dumping hardware properties here
public object Clone()
{
return new DumpingInfoSection
{
// TODO: Add properties here
DumpingProgram = this.DumpingProgram,
};
}
}