Split header skipper and header row into separate properties

This commit is contained in:
Matt Nadareski
2026-04-04 17:58:09 -04:00
parent b547792799
commit cd49a64c2b
16 changed files with 45 additions and 20 deletions

View File

@@ -33,7 +33,7 @@ namespace SabreTools.Serialization.CrossModel
{
var metadataFile = new MetadataFile
{
Header = item.ReadStringArray(Data.Models.Metadata.Header.HeaderKey),
Header = item.HeaderRow,
};
return metadataFile;
}

View File

@@ -32,7 +32,7 @@ namespace SabreTools.Serialization.CrossModel
{
var header = new Data.Models.Metadata.Header
{
[Data.Models.Metadata.Header.HeaderKey] = item.Header,
HeaderRow = item.Header,
};
return header;
}

View File

@@ -53,7 +53,7 @@ namespace SabreTools.Serialization.CrossModel
Homepage = item.Homepage,
Url = item.Url,
Comment = item.Comment,
Header = item.ReadString(Data.Models.Metadata.Header.HeaderKey),
Header = item.HeaderSkipper,
Type = item.Type,
ForceMerging = item.ForceMerging,
ForceZipping = item.ForceZipping,

View File

@@ -45,7 +45,7 @@ namespace SabreTools.Serialization.CrossModel
Homepage = item.Homepage,
Url = item.Url,
Comment = item.Comment,
[Data.Models.Metadata.Header.HeaderKey] = item.Header,
HeaderSkipper = item.Header,
Type = item.Type,
ForceMerging = item.ForceMerging,
ForceZipping = item.ForceZipping,

View File

@@ -56,16 +56,14 @@ namespace SabreTools.Serialization.CrossModel
Type = item.Type,
};
string? headerVal = item.ReadString(Data.Models.Metadata.Header.HeaderKey);
if (headerVal is not null
if (item.HeaderSkipper is not null
|| item.ForceMerging is not Data.Models.Metadata.MergingFlag.None
|| item.ForceNodump is not Data.Models.Metadata.NodumpFlag.None
|| item.ForcePacking is not Data.Models.Metadata.PackingFlag.None)
{
header.ClrMamePro = new Data.Models.Logiqx.ClrMamePro();
if (headerVal is not null)
header.ClrMamePro.Header = headerVal;
if (item.HeaderSkipper is not null)
header.ClrMamePro.Header = item.HeaderSkipper;
if (item.ForceMerging is not Data.Models.Metadata.MergingFlag.None)
header.ClrMamePro.ForceMerging = item.ForceMerging;
if (item.ForceNodump is not Data.Models.Metadata.NodumpFlag.None)

View File

@@ -70,7 +70,7 @@ namespace SabreTools.Serialization.CrossModel
if (item.ClrMamePro is not null)
{
header[Data.Models.Metadata.Header.HeaderKey] = item.ClrMamePro.Header;
header.HeaderSkipper = item.ClrMamePro.Header;
header.ForceMerging = item.ClrMamePro.ForceMerging;
header.ForceNodump = item.ClrMamePro.ForceNodump;
header.ForcePacking = item.ClrMamePro.ForcePacking;

View File

@@ -33,7 +33,7 @@ namespace SabreTools.Serialization.CrossModel
{
var metadataFile = new MetadataFile
{
Header = item.ReadStringArray(Data.Models.Metadata.Header.HeaderKey),
Header = item.HeaderRow,
};
return metadataFile;
}

View File

@@ -32,7 +32,7 @@ namespace SabreTools.Serialization.CrossModel
{
var header = new Data.Models.Metadata.Header
{
[Data.Models.Metadata.Header.HeaderKey] = item.Header,
HeaderRow = item.Header,
};
if (item.Row is not null && item.Row.Length > 0)