Implement more internal header processing

This commit is contained in:
Matt Nadareski
2024-03-10 23:35:57 -04:00
parent 51ce358e6f
commit d0252d314a
7 changed files with 231 additions and 578 deletions

View File

@@ -1,4 +1,7 @@
using System.Collections.Generic;
using System.Linq;
using SabreTools.Core;
using SabreTools.Core.Tools;
namespace SabreTools.DatFiles
{
@@ -13,7 +16,7 @@ namespace SabreTools.DatFiles
/// <param name="item">Metadata file to convert</param>
/// <param name="filename">Name of the file to be parsed</param>
/// <param name="indexId">Index ID for the DAT</param>
/// <param name="keep">True if full pathnames are to be kept, false otherwise (default)</param>
/// <param name="keep">True if full pathnames are to be kept, false otherwise</param>
/// <param name="statsOnly">True to only add item statistics while parsing, false otherwise</param>
public void ConvertMetadata(Models.Metadata.MetadataFile? item, string filename, int indexId, bool keep, bool statsOnly)
{
@@ -24,7 +27,7 @@ namespace SabreTools.DatFiles
// Get the header from the metadata
var header = item.Read<Models.Metadata.Header>(Models.Metadata.MetadataFile.HeaderKey);
if (header != null)
ConvertHeader(header);
ConvertHeader(header, keep);
// Get the machines from the metadata
var machines = ReadItemArray<Models.Metadata.Machine>(item, Models.Metadata.MetadataFile.MachineKey);
@@ -36,7 +39,8 @@ namespace SabreTools.DatFiles
/// Convert header information
/// </summary>
/// <param name="item">Header to convert</param>
private void ConvertHeader(Models.Metadata.Header? item)
/// <param name="keep">True if full pathnames are to be kept, false otherwise</param>
private void ConvertHeader(Models.Metadata.Header? item, bool keep)
{
// If the header is invalid, we can't do anything
if (item == null || !item.Any())
@@ -48,34 +52,245 @@ namespace SabreTools.DatFiles
// Convert subheader values
if (item.ContainsKey(Models.Metadata.Header.CanOpenKey))
{
// TODO: Implement
var canOpen = item.Read<Models.OfflineList.CanOpen>(Models.Metadata.Header.CanOpenKey);
if (canOpen?.Extension != null)
Header.SetFieldValue<string[]?>(Models.Metadata.Header.CanOpenKey, canOpen.Extension);
}
if (item.ContainsKey(Models.Metadata.Header.ImagesKey))
{
// TODO: Implement
// TODO: Add to internal model
}
if (item.ContainsKey(Models.Metadata.Header.InfosKey))
{
// TODO: Implement
var infos = item.Read<Models.OfflineList.Infos>(Models.Metadata.Header.InfosKey);
if (infos != null)
{
var offlineListInfos = new List<Formats.OfflineListInfo>();
if (infos.Title != null)
{
offlineListInfos.Add(new Formats.OfflineListInfo
{
Name = "title",
Visible = infos.Title.Visible.AsYesNo(),
InNamingOption = infos.Title.InNamingOption.AsYesNo(),
Default = infos.Title.Default.AsYesNo(),
});
}
if (infos.Location != null)
{
offlineListInfos.Add(new Formats.OfflineListInfo
{
Name = "location",
Visible = infos.Location.Visible.AsYesNo(),
InNamingOption = infos.Location.InNamingOption.AsYesNo(),
Default = infos.Location.Default.AsYesNo(),
});
}
if (infos.Publisher != null)
{
offlineListInfos.Add(new Formats.OfflineListInfo
{
Name = "publisher",
Visible = infos.Publisher.Visible.AsYesNo(),
InNamingOption = infos.Publisher.InNamingOption.AsYesNo(),
Default = infos.Publisher.Default.AsYesNo(),
});
}
if (infos.SourceRom != null)
{
offlineListInfos.Add(new Formats.OfflineListInfo
{
Name = "sourceRom",
Visible = infos.SourceRom.Visible.AsYesNo(),
InNamingOption = infos.SourceRom.InNamingOption.AsYesNo(),
Default = infos.SourceRom.Default.AsYesNo(),
});
}
if (infos.SaveType != null)
{
offlineListInfos.Add(new Formats.OfflineListInfo
{
Name = "saveType",
Visible = infos.SaveType.Visible.AsYesNo(),
InNamingOption = infos.SaveType.InNamingOption.AsYesNo(),
Default = infos.SaveType.Default.AsYesNo(),
});
}
if (infos.RomSize != null)
{
offlineListInfos.Add(new Formats.OfflineListInfo
{
Name = "romSize",
Visible = infos.RomSize.Visible.AsYesNo(),
InNamingOption = infos.RomSize.InNamingOption.AsYesNo(),
Default = infos.RomSize.Default.AsYesNo(),
});
}
if (infos.ReleaseNumber != null)
{
offlineListInfos.Add(new Formats.OfflineListInfo
{
Name = "releaseNumber",
Visible = infos.ReleaseNumber.Visible.AsYesNo(),
InNamingOption = infos.ReleaseNumber.InNamingOption.AsYesNo(),
Default = infos.ReleaseNumber.Default.AsYesNo(),
});
}
if (infos.LanguageNumber != null)
{
offlineListInfos.Add(new Formats.OfflineListInfo
{
Name = "languageNumber",
Visible = infos.LanguageNumber.Visible.AsYesNo(),
InNamingOption = infos.LanguageNumber.InNamingOption.AsYesNo(),
Default = infos.LanguageNumber.Default.AsYesNo(),
});
}
if (infos.Comment != null)
{
offlineListInfos.Add(new Formats.OfflineListInfo
{
Name = "comment",
Visible = infos.Comment.Visible.AsYesNo(),
InNamingOption = infos.Comment.InNamingOption.AsYesNo(),
Default = infos.Comment.Default.AsYesNo(),
});
}
if (infos.RomCRC != null)
{
offlineListInfos.Add(new Formats.OfflineListInfo
{
Name = "romCRC",
Visible = infos.RomCRC.Visible.AsYesNo(),
InNamingOption = infos.RomCRC.InNamingOption.AsYesNo(),
Default = infos.RomCRC.Default.AsYesNo(),
});
}
if (infos.Im1CRC != null)
{
offlineListInfos.Add(new Formats.OfflineListInfo
{
Name = "im1CRC",
Visible = infos.Im1CRC.Visible.AsYesNo(),
InNamingOption = infos.Im1CRC.InNamingOption.AsYesNo(),
Default = infos.Im1CRC.Default.AsYesNo(),
});
}
if (infos.Im2CRC != null)
{
offlineListInfos.Add(new Formats.OfflineListInfo
{
Name = "im2CRC",
Visible = infos.Im2CRC.Visible.AsYesNo(),
InNamingOption = infos.Im2CRC.InNamingOption.AsYesNo(),
Default = infos.Im2CRC.Default.AsYesNo(),
});
}
if (infos.Languages != null)
{
offlineListInfos.Add(new Formats.OfflineListInfo
{
Name = "languages",
Visible = infos.Languages.Visible.AsYesNo(),
InNamingOption = infos.Languages.InNamingOption.AsYesNo(),
Default = infos.Languages.Default.AsYesNo(),
});
}
Header.SetFieldValue<Formats.OfflineListInfo[]?>(Models.Metadata.Header.InfosKey, [.. offlineListInfos]);
}
}
if (item.ContainsKey(Models.Metadata.Header.NewDatKey))
{
// TODO: Implement
var newDat = item.Read<Models.OfflineList.NewDat>(Models.Metadata.Header.NewDatKey);
if (newDat != null)
{
Header.SetFieldValue<string?>("DATVERSIONURL", newDat.DatVersionUrl);
//Header.SetFieldValue<Models.OfflineList.DatUrl?>("DATURL", newDat.DatUrl); // TODO: Add to internal model
Header.SetFieldValue<string?>("IMURL", newDat.DatVersionUrl);
}
}
if (item.ContainsKey(Models.Metadata.Header.SearchKey))
{
// TODO: Implement
// TODO: Add to internal model
}
// Get all fields that can be set
var nonItemFields = Filter.TypeHelper.GetConstants(typeof(Models.Metadata.Header));
if (nonItemFields == null)
return;
// Selectively set all possible fields -- TODO: Figure out how to make this less manual
if (Header.GetFieldValue<string?>(Models.Metadata.Header.AuthorKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.AuthorKey, header.GetFieldValue<string?>(Models.Metadata.Header.AuthorKey));
if (Header.GetFieldValue<MergingFlag>(Models.Metadata.Header.BiosModeKey) == MergingFlag.None)
Header.SetFieldValue<MergingFlag>(Models.Metadata.Header.BiosModeKey, header.GetFieldValue<MergingFlag>(Models.Metadata.Header.BiosModeKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.BuildKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.BuildKey, header.GetFieldValue<string?>(Models.Metadata.Header.BuildKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.CategoryKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.CategoryKey, header.GetFieldValue<string?>(Models.Metadata.Header.CategoryKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.CommentKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.CommentKey, header.GetFieldValue<string?>(Models.Metadata.Header.CommentKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.DateKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.DateKey, header.GetFieldValue<string?>(Models.Metadata.Header.DateKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.DatVersionKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.DatVersionKey, header.GetFieldValue<string?>(Models.Metadata.Header.DatVersionKey));
if (Header.GetFieldValue<bool?>(Models.Metadata.Header.DebugKey) == null)
Header.SetFieldValue<bool?>(Models.Metadata.Header.DebugKey, header.GetFieldValue<bool?>(Models.Metadata.Header.DebugKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.DescriptionKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, header.GetFieldValue<string?>(Models.Metadata.Header.DescriptionKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.EmailKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.EmailKey, header.GetFieldValue<string?>(Models.Metadata.Header.EmailKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.EmulatorVersionKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.EmulatorVersionKey, header.GetFieldValue<string?>(Models.Metadata.Header.EmulatorVersionKey));
if (Header.GetFieldValue<MergingFlag>(Models.Metadata.Header.ForceMergingKey) == MergingFlag.None)
Header.SetFieldValue<MergingFlag>(Models.Metadata.Header.ForceMergingKey, header.GetFieldValue<MergingFlag>(Models.Metadata.Header.ForceMergingKey));
if (Header.GetFieldValue<NodumpFlag>(Models.Metadata.Header.ForceNodumpKey) == NodumpFlag.None)
Header.SetFieldValue<NodumpFlag>(Models.Metadata.Header.ForceNodumpKey, header.GetFieldValue<NodumpFlag>(Models.Metadata.Header.ForceNodumpKey));
if (Header.GetFieldValue<PackingFlag>(Models.Metadata.Header.ForcePackingKey) == PackingFlag.None)
Header.SetFieldValue<PackingFlag>(Models.Metadata.Header.ForcePackingKey, header.GetFieldValue<PackingFlag>(Models.Metadata.Header.ForcePackingKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.HeaderKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.HeaderKey, header.GetFieldValue<string?>(Models.Metadata.Header.HeaderKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.HomepageKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.HomepageKey, header.GetFieldValue<string?>(Models.Metadata.Header.HomepageKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.IdKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.IdKey, header.GetFieldValue<string?>(Models.Metadata.Header.IdKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.ImFolderKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.ImFolderKey, header.GetFieldValue<string?>(Models.Metadata.Header.ImFolderKey));
if (Header.GetFieldValue<bool?>(Models.Metadata.Header.LockBiosModeKey) == null)
Header.SetFieldValue<bool?>(Models.Metadata.Header.LockBiosModeKey, header.GetFieldValue<bool?>(Models.Metadata.Header.LockBiosModeKey));
if (Header.GetFieldValue<bool?>(Models.Metadata.Header.LockRomModeKey) == null)
Header.SetFieldValue<bool?>(Models.Metadata.Header.LockRomModeKey, header.GetFieldValue<bool?>(Models.Metadata.Header.LockRomModeKey));
if (Header.GetFieldValue<bool?>(Models.Metadata.Header.LockSampleModeKey) == null)
Header.SetFieldValue<bool?>(Models.Metadata.Header.LockSampleModeKey, header.GetFieldValue<bool?>(Models.Metadata.Header.LockSampleModeKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.NameKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, header.GetFieldValue<string?>(Models.Metadata.Header.NameKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.PluginKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.PluginKey, header.GetFieldValue<string?>(Models.Metadata.Header.PluginKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.RefNameKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.RefNameKey, header.GetFieldValue<string?>(Models.Metadata.Header.RefNameKey));
if (Header.GetFieldValue<MergingFlag>(Models.Metadata.Header.RomModeKey) == MergingFlag.None)
Header.SetFieldValue<MergingFlag>(Models.Metadata.Header.RomModeKey, header.GetFieldValue<MergingFlag>(Models.Metadata.Header.RomModeKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.RomTitleKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.RomTitleKey, header.GetFieldValue<string?>(Models.Metadata.Header.RomTitleKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.RootDirKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.RootDirKey, header.GetFieldValue<string?>(Models.Metadata.Header.RootDirKey));
if (Header.GetFieldValue<MergingFlag>(Models.Metadata.Header.SampleModeKey) == MergingFlag.None)
Header.SetFieldValue<MergingFlag>(Models.Metadata.Header.SampleModeKey, header.GetFieldValue<MergingFlag>(Models.Metadata.Header.SampleModeKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.ScreenshotsHeightKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.ScreenshotsHeightKey, header.GetFieldValue<string?>(Models.Metadata.Header.ScreenshotsHeightKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.ScreenshotsWidthKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.ScreenshotsWidthKey, header.GetFieldValue<string?>(Models.Metadata.Header.ScreenshotsWidthKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.SystemKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.SystemKey, header.GetFieldValue<string?>(Models.Metadata.Header.SystemKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.TypeKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.TypeKey, header.GetFieldValue<string?>(Models.Metadata.Header.TypeKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.UrlKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.UrlKey, header.GetFieldValue<string?>(Models.Metadata.Header.UrlKey));
if (Header.GetFieldValue<string?>(Models.Metadata.Header.VersionKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.VersionKey, header.GetFieldValue<string?>(Models.Metadata.Header.VersionKey));
// Loop through and selectively set all fields
foreach (string field in nonItemFields)
// Handle implied SuperDAT
if (Header.GetFieldValue<string?>(Models.Metadata.Header.NameKey)?.Contains(" - SuperDAT") == true && keep)
{
// TODO: Implement selective setting of all fields in Header
if (Header.GetFieldValue<string?>(Models.Metadata.Header.TypeKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.TypeKey, "SuperDAT");
}
}

View File

@@ -1,6 +1,4 @@
using System;
using SabreTools.Core;
using SabreTools.Core.Tools;
namespace SabreTools.DatFiles.Formats
{
@@ -18,9 +16,6 @@ namespace SabreTools.DatFiles.Formats
var metadataFile = new Serialization.Files.ClrMamePro().Deserialize(filename, this.Quotes);
var metadata = new Serialization.CrossModel.ClrMamePro().Serialize(metadataFile);
// Convert the header to the internal format
ConvertHeader(metadataFile?.ClrMamePro, keep);
// Convert to the internal format
ConvertMetadata(metadata, filename, indexId, keep, statsOnly);
}
@@ -30,59 +25,5 @@ namespace SabreTools.DatFiles.Formats
logger.Error(ex, message);
}
}
#region Converters
/// <summary>
/// Convert header information
/// </summary>
/// <param name="cmp">Deserialized model to convert</param>
/// <param name="keep">True if full pathnames are to be kept, false otherwise (default)</param>
private void ConvertHeader(Models.ClrMamePro.ClrMamePro? cmp, bool keep)
{
// If the header is missing, we can't do anything
if (cmp == null)
return;
if (Header.GetFieldValue<string?>(Models.Metadata.Header.NameKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, cmp.Name);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.DescriptionKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, cmp.Description);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.RootDirKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.RootDirKey, cmp.RootDir);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.CategoryKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.CategoryKey, cmp.Category);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.VersionKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.VersionKey, cmp.Version);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.DateKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.DateKey, cmp.Date);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.AuthorKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.AuthorKey, cmp.Author);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.HomepageKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.HomepageKey, cmp.Homepage);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.UrlKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.UrlKey, cmp.Url);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.CommentKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.CommentKey, cmp.Comment);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.HeaderKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.HeaderKey, cmp.Header);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.TypeKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.TypeKey, cmp.Type);
if (Header.GetFieldValue<MergingFlag>(Models.Metadata.Header.ForceMergingKey) == MergingFlag.None)
Header.SetFieldValue<MergingFlag>(Models.Metadata.Header.ForcePackingKey, cmp.ForceMerging?.AsEnumValue<MergingFlag>() ?? MergingFlag.None);
if (Header.GetFieldValue<PackingFlag>(Models.Metadata.Header.ForcePackingKey) == PackingFlag.None)
Header.SetFieldValue<PackingFlag>(Models.Metadata.Header.ForcePackingKey, cmp.ForceZipping?.AsEnumValue<PackingFlag>() ?? PackingFlag.None);
if (Header.GetFieldValue<PackingFlag>(Models.Metadata.Header.ForcePackingKey) == PackingFlag.None)
Header.SetFieldValue<PackingFlag>(Models.Metadata.Header.ForcePackingKey, cmp.ForcePacking?.AsEnumValue<PackingFlag>() ?? PackingFlag.None);
// Handle implied SuperDAT
if (cmp.Name?.Contains(" - SuperDAT") == true && keep)
{
if (Header.GetFieldValue<string?>(Models.Metadata.Header.TypeKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.TypeKey, "SuperDAT");
}
}
#endregion
}
}

View File

@@ -16,9 +16,6 @@ namespace SabreTools.DatFiles.Formats
var metadataFile = new Serialization.Files.DosCenter().Deserialize(filename);
var metadata = new Serialization.CrossModel.DosCenter().Serialize(metadataFile);
// Convert the header to the internal format
ConvertHeader(metadataFile?.DosCenter, keep);
// Convert to the internal format
ConvertMetadata(metadata, filename, indexId, keep, statsOnly);
}
@@ -28,43 +25,5 @@ namespace SabreTools.DatFiles.Formats
logger.Error(ex, message);
}
}
#region Converters
/// <summary>
/// Convert header information
/// </summary>
/// <param name="doscenter">Deserialized model to convert</param>
/// <param name="keep">True if full pathnames are to be kept, false otherwise (default)</param>
private void ConvertHeader(Models.DosCenter.DosCenter? doscenter, bool keep)
{
// If the header is missing, we can't do anything
if (doscenter == null)
return;
if (Header.GetFieldValue<string?>(Models.Metadata.Header.AuthorKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.AuthorKey, doscenter.Author);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.CommentKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.CommentKey, doscenter.Comment);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.DateKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.DateKey, doscenter.Date);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.DescriptionKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, doscenter.Description);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.HomepageKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.HomepageKey, doscenter.Homepage);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.NameKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, doscenter.Name);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.VersionKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.VersionKey, doscenter.Version);
// Handle implied SuperDAT
if (doscenter.Name?.Contains(" - SuperDAT") == true && keep)
{
if (Header.GetFieldValue<string?>(Models.Metadata.Header.TypeKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.TypeKey, "SuperDAT");
}
}
#endregion
}
}

View File

@@ -5,6 +5,7 @@ using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
// TODO: When Serialization is updated, this should work as there was a bug in the library
namespace SabreTools.DatFiles.Formats
{
/// <summary>

View File

@@ -1,6 +1,4 @@
using System;
using SabreTools.Core;
using SabreTools.Core.Tools;
namespace SabreTools.DatFiles.Formats
{
@@ -18,9 +16,6 @@ namespace SabreTools.DatFiles.Formats
var metadataFile = new Serialization.Files.Logiqx().Deserialize(filename);
var metadata = new Serialization.CrossModel.Logiqx().Serialize(metadataFile);
// Convert the header to the internal format
ConvertHeader(metadataFile, keep);
// Convert to the internal format
ConvertMetadata(metadata, filename, indexId, keep, statsOnly);
}
@@ -30,125 +25,5 @@ namespace SabreTools.DatFiles.Formats
logger.Error(ex, message);
}
}
#region Converters
/// <summary>
/// Convert header information
/// </summary>
/// <param name="datafile">Deserialized model to convert</param>
/// <param name="keep">True if full pathnames are to be kept, false otherwise (default)</param>
private void ConvertHeader(Models.Logiqx.Datafile? datafile, bool keep)
{
// If the datafile is missing, we can't do anything
if (datafile == null)
return;
if (Header.GetFieldValue<string?>(Models.Metadata.Header.BuildKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.BuildKey, datafile.Build);
if (Header.GetFieldValue<bool?>(Models.Metadata.Header.DebugKey) == null)
Header.SetFieldValue<bool?>(Models.Metadata.Header.DebugKey, datafile.Debug.AsYesNo());
// SchemaLocation is specifically skipped
ConvertHeader(datafile.Header, keep);
}
/// <summary>
/// Convert header information
/// </summary>
/// <param name="header">Deserialized model to convert</param>
/// <param name="keep">True if full pathnames are to be kept, false otherwise (default)</param>
private void ConvertHeader(Models.Logiqx.Header? header, bool keep)
{
// If the header is missing, we can't do anything
if (header == null)
return;
if (Header.GetFieldValue<string?>(Models.Metadata.Header.IdKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.IdKey, header.Id);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.NameKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, header.Name);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.DescriptionKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, header.Description);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.RootDirKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.RootDirKey, header.RootDir);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.CategoryKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.CategoryKey, header.Category);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.VersionKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.VersionKey, header.Version);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.DateKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.DateKey, header.Date);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.AuthorKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.AuthorKey, header.Author);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.EmailKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.EmailKey, header.Email);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.HomepageKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.HomepageKey, header.Homepage);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.UrlKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.UrlKey, header.Url);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.CommentKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.CommentKey, header.Comment);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.TypeKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.TypeKey, header.Type);
ConvertSubheader(header.ClrMamePro);
ConvertSubheader(header.RomCenter);
// Handle implied SuperDAT
if (header.Name?.Contains(" - SuperDAT") == true && keep)
{
if (Header.GetFieldValue<string?>(Models.Metadata.Header.TypeKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.TypeKey, "SuperDAT");
}
}
/// <summary>
/// Convert subheader information
/// </summary>
/// <param name="clrMamePro">Deserialized model to convert</param>
private void ConvertSubheader(Models.Logiqx.ClrMamePro? clrMamePro)
{
// If the subheader is missing, we can't do anything
if (clrMamePro == null)
return;
if (Header.GetFieldValue<MergingFlag>(Models.Metadata.Header.ForceMergingKey) == MergingFlag.None)
Header.SetFieldValue<MergingFlag>(Models.Metadata.Header.ForceMergingKey, clrMamePro.ForceMerging.AsEnumValue<MergingFlag>());
if (Header.GetFieldValue<NodumpFlag>(Models.Metadata.Header.ForceNodumpKey) == NodumpFlag.None)
Header.SetFieldValue<NodumpFlag>(Models.Metadata.Header.ForceNodumpKey, clrMamePro.ForceNodump.AsEnumValue<NodumpFlag>());
if (Header.GetFieldValue<PackingFlag>(Models.Metadata.Header.ForcePackingKey) == PackingFlag.None)
Header.SetFieldValue<PackingFlag>(Models.Metadata.Header.ForcePackingKey, clrMamePro.ForcePacking.AsEnumValue<PackingFlag>());
if (Header.GetFieldValue<string?>(Models.Metadata.Header.HeaderKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.HeaderKey, clrMamePro.Header);
}
/// <summary>
/// Convert subheader information
/// </summary>
/// <param name="romCenter">Deserialized model to convert</param>
private void ConvertSubheader(Models.Logiqx.RomCenter? romCenter)
{
// If the subheader is missing, we can't do anything
if (romCenter == null)
return;
if (Header.GetFieldValue<MergingFlag>(Models.Metadata.Header.BiosModeKey) == MergingFlag.None)
Header.SetFieldValue<MergingFlag>(Models.Metadata.Header.BiosModeKey, romCenter.BiosMode.AsEnumValue<MergingFlag>());
if (Header.GetFieldValue<bool?>(Models.Metadata.Header.LockBiosModeKey) == null)
Header.SetFieldValue<bool?>(Models.Metadata.Header.LockBiosModeKey, romCenter.LockBiosMode.AsYesNo());
if (Header.GetFieldValue<bool?>(Models.Metadata.Header.LockRomModeKey) == null)
Header.SetFieldValue<bool?>(Models.Metadata.Header.LockRomModeKey, romCenter.LockRomMode.AsYesNo());
if (Header.GetFieldValue<bool?>(Models.Metadata.Header.LockSampleModeKey) == null)
Header.SetFieldValue<bool?>(Models.Metadata.Header.LockSampleModeKey, romCenter.LockSampleMode.AsYesNo());
if (Header.GetFieldValue<string?>(Models.Metadata.Header.PluginKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.PluginKey, romCenter.Plugin);
if (Header.GetFieldValue<MergingFlag>(Models.Metadata.Header.RomModeKey) == MergingFlag.None)
Header.SetFieldValue<MergingFlag>(Models.Metadata.Header.RomModeKey, romCenter.RomMode.AsEnumValue<MergingFlag>());
if (Header.GetFieldValue<MergingFlag>(Models.Metadata.Header.SampleModeKey) == MergingFlag.None)
Header.SetFieldValue<MergingFlag>(Models.Metadata.Header.SampleModeKey, romCenter.SampleMode.AsEnumValue<MergingFlag>());
}
#endregion
}
}

View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json.Linq;
using SabreTools.Core.Tools;
namespace SabreTools.DatFiles.Formats
{
@@ -20,17 +16,8 @@ namespace SabreTools.DatFiles.Formats
var dat = new Serialization.Files.OfflineList().Deserialize(filename);
var metadata = new Serialization.CrossModel.OfflineList().Serialize(dat);
// Convert the header to the internal format
OfflineList.ConvertHeader(dat);
// Convert the configuration to the internal format
ConvertConfiguration(dat?.Configuration, keep);
// Convert to the internal format
ConvertMetadata(metadata, filename, indexId, keep, statsOnly);
// Convert the GUI to the internal format
ConvertGUI(dat?.GUI);
}
catch (Exception ex) when (!throwOnError)
{
@@ -38,253 +25,5 @@ namespace SabreTools.DatFiles.Formats
logger.Error(ex, message);
}
}
#region Converters
/// <summary>
/// Convert header information
/// </summary>
/// <param name="dat">Deserialized model to convert</param>
private static void ConvertHeader(Models.OfflineList.Dat? dat)
{
// If the datafile is missing, we can't do anything
if (dat == null)
return;
//Header.NoNamespaceSchemaLocation = dat.NoNamespaceSchemaLocation; // TODO: Add to internal model
}
/// <summary>
/// Convert configuration information
/// </summary>
/// <param name="config">Deserialized model to convert</param>
private void ConvertConfiguration(Models.OfflineList.Configuration? config, bool keep)
{
// If the config is missing, we can't do anything
if (config == null)
return;
Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, config.DatName);
Header.SetFieldValue<string?>(Models.Metadata.Header.DatVersionKey, config.DatVersion);
Header.SetFieldValue<string?>(Models.Metadata.Header.ImFolderKey, config.ImFolder);
Header.SetFieldValue<string?>(Models.Metadata.Header.RomTitleKey, config.RomTitle);
Header.SetFieldValue<string?>(Models.Metadata.Header.ScreenshotsHeightKey, config.ScreenshotsHeight);
Header.SetFieldValue<string?>(Models.Metadata.Header.ScreenshotsWidthKey, config.ScreenshotsWidth);
Header.SetFieldValue<string?>(Models.Metadata.Header.SystemKey, config.System);
ConvertCanOpen(config.CanOpen);
ConvertInfos(config.Infos);
ConvertNewDat(config.NewDat);
ConvertSearch(config.Search);
// Handle implied SuperDAT
if (config.DatName?.Contains(" - SuperDAT") == true && keep)
{
if (Header.GetFieldValue<string?>(Models.Metadata.Header.TypeKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.TypeKey, "SuperDAT");
}
}
/// <summary>
/// Convert infos information
/// </summary>
/// <param name="infos">Deserialized model to convert</param>
private void ConvertInfos(Models.OfflineList.Infos? infos)
{
// If the infos is missing, we can't do anything
if (infos == null)
return;
var offlineListInfos = new List<OfflineListInfo>();
if (infos.Title != null)
{
offlineListInfos.Add(new OfflineListInfo
{
Name = "title",
Visible = infos.Title.Visible.AsYesNo(),
InNamingOption = infos.Title.InNamingOption.AsYesNo(),
Default = infos.Title.Default.AsYesNo(),
});
}
if (infos.Location != null)
{
offlineListInfos.Add(new OfflineListInfo
{
Name = "location",
Visible = infos.Location.Visible.AsYesNo(),
InNamingOption = infos.Location.InNamingOption.AsYesNo(),
Default = infos.Location.Default.AsYesNo(),
});
}
if (infos.Publisher != null)
{
offlineListInfos.Add(new OfflineListInfo
{
Name = "publisher",
Visible = infos.Publisher.Visible.AsYesNo(),
InNamingOption = infos.Publisher.InNamingOption.AsYesNo(),
Default = infos.Publisher.Default.AsYesNo(),
});
}
if (infos.SourceRom != null)
{
offlineListInfos.Add(new OfflineListInfo
{
Name = "sourceRom",
Visible = infos.SourceRom.Visible.AsYesNo(),
InNamingOption = infos.SourceRom.InNamingOption.AsYesNo(),
Default = infos.SourceRom.Default.AsYesNo(),
});
}
if (infos.SaveType != null)
{
offlineListInfos.Add(new OfflineListInfo
{
Name = "saveType",
Visible = infos.SaveType.Visible.AsYesNo(),
InNamingOption = infos.SaveType.InNamingOption.AsYesNo(),
Default = infos.SaveType.Default.AsYesNo(),
});
}
if (infos.RomSize != null)
{
offlineListInfos.Add(new OfflineListInfo
{
Name = "romSize",
Visible = infos.RomSize.Visible.AsYesNo(),
InNamingOption = infos.RomSize.InNamingOption.AsYesNo(),
Default = infos.RomSize.Default.AsYesNo(),
});
}
if (infos.ReleaseNumber != null)
{
offlineListInfos.Add(new OfflineListInfo
{
Name = "releaseNumber",
Visible = infos.ReleaseNumber.Visible.AsYesNo(),
InNamingOption = infos.ReleaseNumber.InNamingOption.AsYesNo(),
Default = infos.ReleaseNumber.Default.AsYesNo(),
});
}
if (infos.LanguageNumber != null)
{
offlineListInfos.Add(new OfflineListInfo
{
Name = "languageNumber",
Visible = infos.LanguageNumber.Visible.AsYesNo(),
InNamingOption = infos.LanguageNumber.InNamingOption.AsYesNo(),
Default = infos.LanguageNumber.Default.AsYesNo(),
});
}
if (infos.Comment != null)
{
offlineListInfos.Add(new OfflineListInfo
{
Name = "comment",
Visible = infos.Comment.Visible.AsYesNo(),
InNamingOption = infos.Comment.InNamingOption.AsYesNo(),
Default = infos.Comment.Default.AsYesNo(),
});
}
if (infos.RomCRC != null)
{
offlineListInfos.Add(new OfflineListInfo
{
Name = "romCRC",
Visible = infos.RomCRC.Visible.AsYesNo(),
InNamingOption = infos.RomCRC.InNamingOption.AsYesNo(),
Default = infos.RomCRC.Default.AsYesNo(),
});
}
if (infos.Im1CRC != null)
{
offlineListInfos.Add(new OfflineListInfo
{
Name = "im1CRC",
Visible = infos.Im1CRC.Visible.AsYesNo(),
InNamingOption = infos.Im1CRC.InNamingOption.AsYesNo(),
Default = infos.Im1CRC.Default.AsYesNo(),
});
}
if (infos.Im2CRC != null)
{
offlineListInfos.Add(new OfflineListInfo
{
Name = "im2CRC",
Visible = infos.Im2CRC.Visible.AsYesNo(),
InNamingOption = infos.Im2CRC.InNamingOption.AsYesNo(),
Default = infos.Im2CRC.Default.AsYesNo(),
});
}
if (infos.Languages != null)
{
offlineListInfos.Add(new OfflineListInfo
{
Name = "languages",
Visible = infos.Languages.Visible.AsYesNo(),
InNamingOption = infos.Languages.InNamingOption.AsYesNo(),
Default = infos.Languages.Default.AsYesNo(),
});
}
Header.SetFieldValue<OfflineListInfo[]?>(Models.Metadata.Header.InfosKey, [.. offlineListInfos]);
}
/// <summary>
/// Convert canopen information
/// </summary>
/// <param name="canOpen">Deserialized model to convert</param>
private void ConvertCanOpen(Models.OfflineList.CanOpen? canOpen)
{
// If the canOpen is missing, we can't do anything
if (canOpen?.Extension == null)
return;
Header.SetFieldValue<string[]?>(Models.Metadata.Header.CanOpenKey, canOpen.Extension);
}
/// <summary>
/// Convert newdat information
/// </summary>
/// <param name="newDat">Deserialized model to convert</param>
private void ConvertNewDat(Models.OfflineList.NewDat? newDat)
{
// If the canOpen is missing, we can't do anything
if (newDat == null)
return;
Header.SetFieldValue<string?>("DATVERSIONURL", newDat.DatVersionUrl);
//Header.SetFieldValue<Models.OfflineList.DatUrl?>("DATURL", newDat.DatUrl); // TODO: Add to internal model
Header.SetFieldValue<string?>("IMURL", newDat.DatVersionUrl);
}
/// <summary>
/// Convert search information
/// </summary>
/// <param name="search">Deserialized model to convert</param>
private static void ConvertSearch(Models.OfflineList.Search? search)
{
// If the search or to array is missing, we can't do anything
if (search?.To == null)
return;
// TODO: Add to internal model
}
/// <summary>
/// Convert GUI information
/// </summary>
/// <param name="gui">Deserialized model to convert</param>
private static void ConvertGUI(Models.OfflineList.GUI? gui)
{
// If the gui or Images are missing, we can't do anything
if (gui?.Images?.Image == null || !gui.Images.Image.Any())
return;
// TODO: Add to internal model
}
#endregion
}
}

View File

@@ -1,6 +1,4 @@
using System;
using SabreTools.Core;
using SabreTools.Models.RomCenter;
namespace SabreTools.DatFiles.Formats
{
@@ -18,15 +16,6 @@ namespace SabreTools.DatFiles.Formats
var metadataFile = new Serialization.Files.RomCenter().Deserialize(filename);
var metadata = new Serialization.CrossModel.RomCenter().Serialize(metadataFile);
// Convert the credits data to the internal format
ConvertCredits(metadataFile?.Credits);
// Convert the dat data to the internal format
ConvertDat(metadataFile?.Dat);
// Convert the emulator data to the internal format
ConvertEmulator(metadataFile?.Emulator);
// Convert to the internal format
ConvertMetadata(metadata, filename, indexId, keep, statsOnly);
}
@@ -36,71 +25,5 @@ namespace SabreTools.DatFiles.Formats
logger.Error(ex, message);
}
}
#region Converters
/// <summary>
/// Convert credits information
/// </summary>
/// <param name="credits">Deserialized model to convert</param>
private void ConvertCredits(Models.RomCenter.Credits? credits)
{
// If the credits is missing, we can't do anything
if (credits == null)
return;
if (Header.GetFieldValue<string?>(Models.Metadata.Header.AuthorKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.AuthorKey, credits.Author);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.CommentKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.CommentKey, credits.Comment);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.DateKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.DateKey, credits.Date);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.EmailKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.EmailKey, credits.Email);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.HomepageKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.HomepageKey, credits.Homepage);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.UrlKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.UrlKey, credits.Url);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.VersionKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.VersionKey, credits.Version);
}
/// <summary>
/// Convert dat information
/// </summary>
/// <param name="dat">Deserialized model to convert</param>
private void ConvertDat(Models.RomCenter.Dat? dat)
{
// If the dat is missing, we can't do anything
if (dat == null)
return;
if (Header.GetFieldValue<string?>(Models.Metadata.Header.DatVersionKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.DatVersionKey, dat.Version);
if (Header.GetFieldValue<MergingFlag>(Models.Metadata.Header.ForceMergingKey) == MergingFlag.None && dat.Split == "1")
Header.SetFieldValue<MergingFlag>(Models.Metadata.Header.ForceMergingKey, MergingFlag.Split);
if (Header.GetFieldValue<MergingFlag>(Models.Metadata.Header.ForceMergingKey) == MergingFlag.None && dat.Merge == "1")
Header.SetFieldValue<MergingFlag>(Models.Metadata.Header.ForceMergingKey, MergingFlag.Merged);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.SystemKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.SystemKey, dat.Plugin);
}
/// <summary>
/// Convert emulator information
/// </summary>
/// <param name="games">Deserialized model to convert</param>
private void ConvertEmulator(Models.RomCenter.Emulator? emulator)
{
// If the emulator is missing, we can't do anything
if (emulator == null)
return;
if (Header.GetFieldValue<string?>(Models.Metadata.Header.EmulatorVersionKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.EmulatorVersionKey, emulator.Version);
if (Header.GetFieldValue<string?>(Models.Metadata.Header.RefNameKey) == null)
Header.SetFieldValue<string?>(Models.Metadata.Header.RefNameKey, emulator.RefName);
}
#endregion
}
}