Start simplifying usings

This commit is contained in:
Matt Nadareski
2023-08-09 21:00:02 -04:00
parent 21dcb21a40
commit 3e1b71bddc
14 changed files with 2046 additions and 2032 deletions

View File

@@ -1,4 +1,5 @@
using System.Linq; using System.Linq;
using SabreTools.Models.Internal;
namespace SabreTools.Serialization namespace SabreTools.Serialization
{ {
@@ -10,99 +11,99 @@ namespace SabreTools.Serialization
#region Serialize #region Serialize
/// <summary> /// <summary>
/// Convert from <cref="Models.ArchiveDotOrg.Files"/> to <cref="Models.Internal.Header"/> /// Convert from <cref="Models.ArchiveDotOrg.Files"/> to <cref="Header"/>
/// </summary> /// </summary>
public static Models.Internal.Header ConvertHeaderFromArchiveDotOrg(Models.ArchiveDotOrg.Files item) public static Header ConvertHeaderFromArchiveDotOrg(Models.ArchiveDotOrg.Files item)
{ {
var header = new Models.Internal.Header var header = new Header
{ {
[Models.Internal.Header.NameKey] = "archive.org", [Header.NameKey] = "archive.org",
}; };
return header; return header;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ArchiveDotOrg.File"/> to <cref="Models.Internal.Machine"/> /// Convert from <cref="Models.ArchiveDotOrg.File"/> to <cref="Machine"/>
/// </summary> /// </summary>
public static Models.Internal.Machine ConvertMachineFromArchiveDotOrg(Models.ArchiveDotOrg.File item) public static Machine ConvertMachineFromArchiveDotOrg(Models.ArchiveDotOrg.File item)
{ {
var machine = new Models.Internal.Machine var machine = new Machine
{ {
[Models.Internal.Machine.RomKey] = ConvertFromArchiveDotOrg(item), [Machine.RomKey] = ConvertFromArchiveDotOrg(item),
}; };
return machine; return machine;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ArchiveDotOrg.File"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.ArchiveDotOrg.File"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromArchiveDotOrg(Models.ArchiveDotOrg.File item) public static Rom ConvertFromArchiveDotOrg(Models.ArchiveDotOrg.File item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.NameKey] = item.Name, [Rom.NameKey] = item.Name,
[Models.Internal.Rom.SourceKey] = item.Source, [Rom.SourceKey] = item.Source,
[Models.Internal.Rom.BitTorrentMagnetHashKey] = item.BitTorrentMagnetHash, [Rom.BitTorrentMagnetHashKey] = item.BitTorrentMagnetHash,
[Models.Internal.Rom.LastModifiedTimeKey] = item.LastModifiedTime, [Rom.LastModifiedTimeKey] = item.LastModifiedTime,
[Models.Internal.Rom.SizeKey] = item.Size, [Rom.SizeKey] = item.Size,
[Models.Internal.Rom.MD5Key] = item.MD5, [Rom.MD5Key] = item.MD5,
[Models.Internal.Rom.CRCKey] = item.CRC32, [Rom.CRCKey] = item.CRC32,
[Models.Internal.Rom.SHA1Key] = item.SHA1, [Rom.SHA1Key] = item.SHA1,
[Models.Internal.Rom.FileCountKey] = item.FileCount, [Rom.FileCountKey] = item.FileCount,
[Models.Internal.Rom.FormatKey] = item.Format, [Rom.FormatKey] = item.Format,
[Models.Internal.Rom.OriginalKey] = item.Original, [Rom.OriginalKey] = item.Original,
[Models.Internal.Rom.SummationKey] = item.Summation, [Rom.SummationKey] = item.Summation,
[Models.Internal.Rom.MatrixNumberKey] = item.MatrixNumber, [Rom.MatrixNumberKey] = item.MatrixNumber,
[Models.Internal.Rom.CollectionCatalogNumberKey] = item.CollectionCatalogNumber, [Rom.CollectionCatalogNumberKey] = item.CollectionCatalogNumber,
[Models.Internal.Rom.PublisherKey] = item.Publisher, [Rom.PublisherKey] = item.Publisher,
[Models.Internal.Rom.CommentKey] = item.Comment, [Rom.CommentKey] = item.Comment,
[Models.Internal.Rom.ASRDetectedLangKey] = item.ASRDetectedLang, [Rom.ASRDetectedLangKey] = item.ASRDetectedLang,
[Models.Internal.Rom.ASRDetectedLangConfKey] = item.ASRDetectedLangConf, [Rom.ASRDetectedLangConfKey] = item.ASRDetectedLangConf,
[Models.Internal.Rom.ASRTranscribedLangKey] = item.ASRTranscribedLang, [Rom.ASRTranscribedLangKey] = item.ASRTranscribedLang,
[Models.Internal.Rom.WhisperASRModuleVersionKey] = item.WhisperASRModuleVersion, [Rom.WhisperASRModuleVersionKey] = item.WhisperASRModuleVersion,
[Models.Internal.Rom.WhisperModelHashKey] = item.WhisperModelHash, [Rom.WhisperModelHashKey] = item.WhisperModelHash,
[Models.Internal.Rom.WhisperModelNameKey] = item.WhisperModelName, [Rom.WhisperModelNameKey] = item.WhisperModelName,
[Models.Internal.Rom.WhisperVersionKey] = item.WhisperVersion, [Rom.WhisperVersionKey] = item.WhisperVersion,
[Models.Internal.Rom.ClothCoverDetectionModuleVersionKey] = item.ClothCoverDetectionModuleVersion, [Rom.ClothCoverDetectionModuleVersionKey] = item.ClothCoverDetectionModuleVersion,
[Models.Internal.Rom.hOCRCharToWordhOCRVersionKey] = item.hOCRCharToWordhOCRVersion, [Rom.hOCRCharToWordhOCRVersionKey] = item.hOCRCharToWordhOCRVersion,
[Models.Internal.Rom.hOCRCharToWordModuleVersionKey] = item.hOCRCharToWordModuleVersion, [Rom.hOCRCharToWordModuleVersionKey] = item.hOCRCharToWordModuleVersion,
[Models.Internal.Rom.hOCRFtsTexthOCRVersionKey] = item.hOCRFtsTexthOCRVersion, [Rom.hOCRFtsTexthOCRVersionKey] = item.hOCRFtsTexthOCRVersion,
[Models.Internal.Rom.hOCRFtsTextModuleVersionKey] = item.hOCRFtsTextModuleVersion, [Rom.hOCRFtsTextModuleVersionKey] = item.hOCRFtsTextModuleVersion,
[Models.Internal.Rom.hOCRPageIndexhOCRVersionKey] = item.hOCRPageIndexhOCRVersion, [Rom.hOCRPageIndexhOCRVersionKey] = item.hOCRPageIndexhOCRVersion,
[Models.Internal.Rom.hOCRPageIndexModuleVersionKey] = item.hOCRPageIndexModuleVersion, [Rom.hOCRPageIndexModuleVersionKey] = item.hOCRPageIndexModuleVersion,
[Models.Internal.Rom.TesseractOCRKey] = item.TesseractOCR, [Rom.TesseractOCRKey] = item.TesseractOCR,
[Models.Internal.Rom.TesseractOCRConvertedKey] = item.TesseractOCRConverted, [Rom.TesseractOCRConvertedKey] = item.TesseractOCRConverted,
[Models.Internal.Rom.TesseractOCRDetectedLangKey] = item.TesseractOCRDetectedLang, [Rom.TesseractOCRDetectedLangKey] = item.TesseractOCRDetectedLang,
[Models.Internal.Rom.TesseractOCRDetectedLangConfKey] = item.TesseractOCRDetectedLangConf, [Rom.TesseractOCRDetectedLangConfKey] = item.TesseractOCRDetectedLangConf,
[Models.Internal.Rom.TesseractOCRDetectedScriptKey] = item.TesseractOCRDetectedScript, [Rom.TesseractOCRDetectedScriptKey] = item.TesseractOCRDetectedScript,
[Models.Internal.Rom.TesseractOCRDetectedScriptConfKey] = item.TesseractOCRDetectedScriptConf, [Rom.TesseractOCRDetectedScriptConfKey] = item.TesseractOCRDetectedScriptConf,
[Models.Internal.Rom.TesseractOCRModuleVersionKey] = item.TesseractOCRModuleVersion, [Rom.TesseractOCRModuleVersionKey] = item.TesseractOCRModuleVersion,
[Models.Internal.Rom.TesseractOCRParametersKey] = item.TesseractOCRParameters, [Rom.TesseractOCRParametersKey] = item.TesseractOCRParameters,
[Models.Internal.Rom.PDFModuleVersionKey] = item.PDFModuleVersion, [Rom.PDFModuleVersionKey] = item.PDFModuleVersion,
[Models.Internal.Rom.WordConfidenceInterval0To10Key] = item.WordConfidenceInterval0To10, [Rom.WordConfidenceInterval0To10Key] = item.WordConfidenceInterval0To10,
[Models.Internal.Rom.WordConfidenceInterval11To20Key] = item.WordConfidenceInterval11To20, [Rom.WordConfidenceInterval11To20Key] = item.WordConfidenceInterval11To20,
[Models.Internal.Rom.WordConfidenceInterval21To30Key] = item.WordConfidenceInterval21To30, [Rom.WordConfidenceInterval21To30Key] = item.WordConfidenceInterval21To30,
[Models.Internal.Rom.WordConfidenceInterval31To40Key] = item.WordConfidenceInterval31To40, [Rom.WordConfidenceInterval31To40Key] = item.WordConfidenceInterval31To40,
[Models.Internal.Rom.WordConfidenceInterval41To50Key] = item.WordConfidenceInterval41To50, [Rom.WordConfidenceInterval41To50Key] = item.WordConfidenceInterval41To50,
[Models.Internal.Rom.WordConfidenceInterval51To60Key] = item.WordConfidenceInterval51To60, [Rom.WordConfidenceInterval51To60Key] = item.WordConfidenceInterval51To60,
[Models.Internal.Rom.WordConfidenceInterval61To70Key] = item.WordConfidenceInterval61To70, [Rom.WordConfidenceInterval61To70Key] = item.WordConfidenceInterval61To70,
[Models.Internal.Rom.WordConfidenceInterval71To80Key] = item.WordConfidenceInterval71To80, [Rom.WordConfidenceInterval71To80Key] = item.WordConfidenceInterval71To80,
[Models.Internal.Rom.WordConfidenceInterval81To90Key] = item.WordConfidenceInterval81To90, [Rom.WordConfidenceInterval81To90Key] = item.WordConfidenceInterval81To90,
[Models.Internal.Rom.WordConfidenceInterval91To100Key] = item.WordConfidenceInterval91To100, [Rom.WordConfidenceInterval91To100Key] = item.WordConfidenceInterval91To100,
[Models.Internal.Rom.AlbumKey] = item.Album, [Rom.AlbumKey] = item.Album,
[Models.Internal.Rom.ArtistKey] = item.Artist, [Rom.ArtistKey] = item.Artist,
[Models.Internal.Rom.BitrateKey] = item.Bitrate, [Rom.BitrateKey] = item.Bitrate,
[Models.Internal.Rom.CreatorKey] = item.Creator, [Rom.CreatorKey] = item.Creator,
[Models.Internal.Rom.HeightKey] = item.Height, [Rom.HeightKey] = item.Height,
[Models.Internal.Rom.LengthKey] = item.Length, [Rom.LengthKey] = item.Length,
[Models.Internal.Rom.PreviewImageKey] = item.PreviewImage, [Rom.PreviewImageKey] = item.PreviewImage,
[Models.Internal.Rom.RotationKey] = item.Rotation, [Rom.RotationKey] = item.Rotation,
[Models.Internal.Rom.TitleKey] = item.Title, [Rom.TitleKey] = item.Title,
[Models.Internal.Rom.TrackKey] = item.Track, [Rom.TrackKey] = item.Track,
[Models.Internal.Rom.WidthKey] = item.Width, [Rom.WidthKey] = item.Width,
}; };
return rom; return rom;
} }
@@ -112,89 +113,89 @@ namespace SabreTools.Serialization
#region Deserialize #region Deserialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Machine"/> to an array of <cref="Models.ArchiveDotOrg.File"/> /// Convert from <cref="Machine"/> to an array of <cref="Models.ArchiveDotOrg.File"/>
/// </summary> /// </summary>
public static Models.ArchiveDotOrg.File?[]? ConvertMachineToArchiveDotOrg(Models.Internal.Machine? item) public static Models.ArchiveDotOrg.File?[]? ConvertMachineToArchiveDotOrg(Machine? item)
{ {
if (item == null) if (item == null)
return null; return null;
var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey); var roms = item.Read<Rom[]>(Machine.RomKey);
return roms?.Select(ConvertToArchiveDotOrg)?.ToArray(); return roms?.Select(ConvertToArchiveDotOrg)?.ToArray();
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.ArchiveDotOrg.File"/> /// Convert from <cref="Rom"/> to <cref="Models.ArchiveDotOrg.File"/>
/// </summary> /// </summary>
private static Models.ArchiveDotOrg.File? ConvertToArchiveDotOrg(Models.Internal.Rom? item) private static Models.ArchiveDotOrg.File? ConvertToArchiveDotOrg(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var file = new Models.ArchiveDotOrg.File var file = new Models.ArchiveDotOrg.File
{ {
Name = item.ReadString(Models.Internal.Rom.NameKey), Name = item.ReadString(Rom.NameKey),
Source = item.ReadString(Models.Internal.Rom.SourceKey), Source = item.ReadString(Rom.SourceKey),
BitTorrentMagnetHash = item.ReadString(Models.Internal.Rom.BitTorrentMagnetHashKey), BitTorrentMagnetHash = item.ReadString(Rom.BitTorrentMagnetHashKey),
LastModifiedTime = item.ReadString(Models.Internal.Rom.LastModifiedTimeKey), LastModifiedTime = item.ReadString(Rom.LastModifiedTimeKey),
Size = item.ReadString(Models.Internal.Rom.SizeKey), Size = item.ReadString(Rom.SizeKey),
MD5 = item.ReadString(Models.Internal.Rom.MD5Key), MD5 = item.ReadString(Rom.MD5Key),
CRC32 = item.ReadString(Models.Internal.Rom.CRCKey), CRC32 = item.ReadString(Rom.CRCKey),
SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key), SHA1 = item.ReadString(Rom.SHA1Key),
FileCount = item.ReadString(Models.Internal.Rom.FileCountKey), FileCount = item.ReadString(Rom.FileCountKey),
Format = item.ReadString(Models.Internal.Rom.FormatKey), Format = item.ReadString(Rom.FormatKey),
Original = item.ReadString(Models.Internal.Rom.OriginalKey), Original = item.ReadString(Rom.OriginalKey),
Summation = item.ReadString(Models.Internal.Rom.SummationKey), Summation = item.ReadString(Rom.SummationKey),
MatrixNumber = item.ReadString(Models.Internal.Rom.MatrixNumberKey), MatrixNumber = item.ReadString(Rom.MatrixNumberKey),
CollectionCatalogNumber = item.ReadString(Models.Internal.Rom.CollectionCatalogNumberKey), CollectionCatalogNumber = item.ReadString(Rom.CollectionCatalogNumberKey),
Comment = item.ReadString(Models.Internal.Rom.CommentKey), Comment = item.ReadString(Rom.CommentKey),
ASRDetectedLang = item.ReadString(Models.Internal.Rom.ASRDetectedLangKey), ASRDetectedLang = item.ReadString(Rom.ASRDetectedLangKey),
ASRDetectedLangConf = item.ReadString(Models.Internal.Rom.ASRDetectedLangConfKey), ASRDetectedLangConf = item.ReadString(Rom.ASRDetectedLangConfKey),
ASRTranscribedLang = item.ReadString(Models.Internal.Rom.ASRTranscribedLangKey), ASRTranscribedLang = item.ReadString(Rom.ASRTranscribedLangKey),
WhisperASRModuleVersion = item.ReadString(Models.Internal.Rom.WhisperASRModuleVersionKey), WhisperASRModuleVersion = item.ReadString(Rom.WhisperASRModuleVersionKey),
WhisperModelHash = item.ReadString(Models.Internal.Rom.WhisperModelHashKey), WhisperModelHash = item.ReadString(Rom.WhisperModelHashKey),
WhisperModelName = item.ReadString(Models.Internal.Rom.WhisperModelNameKey), WhisperModelName = item.ReadString(Rom.WhisperModelNameKey),
WhisperVersion = item.ReadString(Models.Internal.Rom.WhisperVersionKey), WhisperVersion = item.ReadString(Rom.WhisperVersionKey),
ClothCoverDetectionModuleVersion = item.ReadString(Models.Internal.Rom.ClothCoverDetectionModuleVersionKey), ClothCoverDetectionModuleVersion = item.ReadString(Rom.ClothCoverDetectionModuleVersionKey),
hOCRCharToWordhOCRVersion = item.ReadString(Models.Internal.Rom.hOCRCharToWordhOCRVersionKey), hOCRCharToWordhOCRVersion = item.ReadString(Rom.hOCRCharToWordhOCRVersionKey),
hOCRCharToWordModuleVersion = item.ReadString(Models.Internal.Rom.hOCRCharToWordModuleVersionKey), hOCRCharToWordModuleVersion = item.ReadString(Rom.hOCRCharToWordModuleVersionKey),
hOCRFtsTexthOCRVersion = item.ReadString(Models.Internal.Rom.hOCRFtsTexthOCRVersionKey), hOCRFtsTexthOCRVersion = item.ReadString(Rom.hOCRFtsTexthOCRVersionKey),
hOCRFtsTextModuleVersion = item.ReadString(Models.Internal.Rom.hOCRFtsTextModuleVersionKey), hOCRFtsTextModuleVersion = item.ReadString(Rom.hOCRFtsTextModuleVersionKey),
hOCRPageIndexhOCRVersion = item.ReadString(Models.Internal.Rom.hOCRPageIndexhOCRVersionKey), hOCRPageIndexhOCRVersion = item.ReadString(Rom.hOCRPageIndexhOCRVersionKey),
hOCRPageIndexModuleVersion = item.ReadString(Models.Internal.Rom.hOCRPageIndexModuleVersionKey), hOCRPageIndexModuleVersion = item.ReadString(Rom.hOCRPageIndexModuleVersionKey),
TesseractOCR = item.ReadString(key: Models.Internal.Rom.TesseractOCRKey), TesseractOCR = item.ReadString(key: Rom.TesseractOCRKey),
TesseractOCRConverted = item.ReadString(Models.Internal.Rom.TesseractOCRConvertedKey), TesseractOCRConverted = item.ReadString(Rom.TesseractOCRConvertedKey),
TesseractOCRDetectedLang = item.ReadString(Models.Internal.Rom.TesseractOCRDetectedLangKey), TesseractOCRDetectedLang = item.ReadString(Rom.TesseractOCRDetectedLangKey),
TesseractOCRDetectedLangConf = item.ReadString(Models.Internal.Rom.TesseractOCRDetectedLangConfKey), TesseractOCRDetectedLangConf = item.ReadString(Rom.TesseractOCRDetectedLangConfKey),
TesseractOCRDetectedScript = item.ReadString(Models.Internal.Rom.TesseractOCRDetectedScriptKey), TesseractOCRDetectedScript = item.ReadString(Rom.TesseractOCRDetectedScriptKey),
TesseractOCRDetectedScriptConf = item.ReadString(Models.Internal.Rom.TesseractOCRDetectedScriptConfKey), TesseractOCRDetectedScriptConf = item.ReadString(Rom.TesseractOCRDetectedScriptConfKey),
TesseractOCRModuleVersion = item.ReadString(Models.Internal.Rom.TesseractOCRModuleVersionKey), TesseractOCRModuleVersion = item.ReadString(Rom.TesseractOCRModuleVersionKey),
TesseractOCRParameters = item.ReadString(Models.Internal.Rom.TesseractOCRParametersKey), TesseractOCRParameters = item.ReadString(Rom.TesseractOCRParametersKey),
PDFModuleVersion = item.ReadString(Models.Internal.Rom.PDFModuleVersionKey), PDFModuleVersion = item.ReadString(Rom.PDFModuleVersionKey),
WordConfidenceInterval0To10 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval0To10Key), WordConfidenceInterval0To10 = item.ReadString(Rom.WordConfidenceInterval0To10Key),
WordConfidenceInterval11To20 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval11To20Key), WordConfidenceInterval11To20 = item.ReadString(Rom.WordConfidenceInterval11To20Key),
WordConfidenceInterval21To30 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval21To30Key), WordConfidenceInterval21To30 = item.ReadString(Rom.WordConfidenceInterval21To30Key),
WordConfidenceInterval31To40 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval31To40Key), WordConfidenceInterval31To40 = item.ReadString(Rom.WordConfidenceInterval31To40Key),
WordConfidenceInterval41To50 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval41To50Key), WordConfidenceInterval41To50 = item.ReadString(Rom.WordConfidenceInterval41To50Key),
WordConfidenceInterval51To60 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval51To60Key), WordConfidenceInterval51To60 = item.ReadString(Rom.WordConfidenceInterval51To60Key),
WordConfidenceInterval61To70 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval61To70Key), WordConfidenceInterval61To70 = item.ReadString(Rom.WordConfidenceInterval61To70Key),
WordConfidenceInterval71To80 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval71To80Key), WordConfidenceInterval71To80 = item.ReadString(Rom.WordConfidenceInterval71To80Key),
WordConfidenceInterval81To90 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval81To90Key), WordConfidenceInterval81To90 = item.ReadString(Rom.WordConfidenceInterval81To90Key),
WordConfidenceInterval91To100 = item.ReadString(Models.Internal.Rom.WordConfidenceInterval91To100Key), WordConfidenceInterval91To100 = item.ReadString(Rom.WordConfidenceInterval91To100Key),
Album = item.ReadString(Models.Internal.Rom.AlbumKey), Album = item.ReadString(Rom.AlbumKey),
Artist = item.ReadString(Models.Internal.Rom.ArtistKey), Artist = item.ReadString(Rom.ArtistKey),
Bitrate = item.ReadString(Models.Internal.Rom.BitrateKey), Bitrate = item.ReadString(Rom.BitrateKey),
Creator = item.ReadString(Models.Internal.Rom.CreatorKey), Creator = item.ReadString(Rom.CreatorKey),
Height = item.ReadString(Models.Internal.Rom.HeightKey), Height = item.ReadString(Rom.HeightKey),
Length = item.ReadString(Models.Internal.Rom.LengthKey), Length = item.ReadString(Rom.LengthKey),
PreviewImage = item.ReadString(Models.Internal.Rom.PreviewImageKey), PreviewImage = item.ReadString(Rom.PreviewImageKey),
Rotation = item.ReadString(Models.Internal.Rom.RotationKey), Rotation = item.ReadString(Rom.RotationKey),
Title = item.ReadString(Models.Internal.Rom.TitleKey), Title = item.ReadString(Rom.TitleKey),
Track = item.ReadString(Models.Internal.Rom.TrackKey), Track = item.ReadString(Rom.TrackKey),
Width = item.ReadString(Models.Internal.Rom.WidthKey), Width = item.ReadString(Rom.WidthKey),
}; };
return file; return file;
} }

View File

@@ -1,4 +1,5 @@
using System.Linq; using System.Linq;
using SabreTools.Models.Internal;
namespace SabreTools.Serialization namespace SabreTools.Serialization
{ {
@@ -10,59 +11,59 @@ namespace SabreTools.Serialization
#region Serialize #region Serialize
/// <summary> /// <summary>
/// Convert from <cref="Models.AttractMode.MetadataFile"/> to <cref="Models.Internal.Header"/> /// Convert from <cref="Models.AttractMode.MetadataFile"/> to <cref="Header"/>
/// </summary> /// </summary>
public static Models.Internal.Header ConvertHeaderFromAttractMode(Models.AttractMode.MetadataFile item) public static Header ConvertHeaderFromAttractMode(Models.AttractMode.MetadataFile item)
{ {
var header = new Models.Internal.Header var header = new Header
{ {
[Models.Internal.Header.HeaderKey] = item.Header, [Header.HeaderKey] = item.Header,
}; };
return header; return header;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.AttractMode.Row"/> to <cref="Models.Internal.Machine"/> /// Convert from <cref="Models.AttractMode.Row"/> to <cref="Machine"/>
/// </summary> /// </summary>
public static Models.Internal.Machine ConvertMachineFromAttractMode(Models.AttractMode.Row item) public static Machine ConvertMachineFromAttractMode(Models.AttractMode.Row item)
{ {
var machine = new Models.Internal.Machine var machine = new Machine
{ {
[Models.Internal.Machine.NameKey] = item.Name, [Machine.NameKey] = item.Name,
[Models.Internal.Machine.EmulatorKey] = item.Emulator, [Machine.EmulatorKey] = item.Emulator,
[Models.Internal.Machine.CloneOfKey] = item.CloneOf, [Machine.CloneOfKey] = item.CloneOf,
[Models.Internal.Machine.YearKey] = item.Year, [Machine.YearKey] = item.Year,
[Models.Internal.Machine.ManufacturerKey] = item.Manufacturer, [Machine.ManufacturerKey] = item.Manufacturer,
[Models.Internal.Machine.CategoryKey] = item.Category, [Machine.CategoryKey] = item.Category,
[Models.Internal.Machine.PlayersKey] = item.Players, [Machine.PlayersKey] = item.Players,
[Models.Internal.Machine.RotationKey] = item.Rotation, [Machine.RotationKey] = item.Rotation,
[Models.Internal.Machine.ControlKey] = item.Control, [Machine.ControlKey] = item.Control,
[Models.Internal.Machine.StatusKey] = item.Status, [Machine.StatusKey] = item.Status,
[Models.Internal.Machine.DisplayCountKey] = item.DisplayCount, [Machine.DisplayCountKey] = item.DisplayCount,
[Models.Internal.Machine.DisplayTypeKey] = item.DisplayType, [Machine.DisplayTypeKey] = item.DisplayType,
[Models.Internal.Machine.ExtraKey] = item.Extra, [Machine.ExtraKey] = item.Extra,
[Models.Internal.Machine.ButtonsKey] = item.Buttons, [Machine.ButtonsKey] = item.Buttons,
[Models.Internal.Machine.FavoriteKey] = item.Favorite, [Machine.FavoriteKey] = item.Favorite,
[Models.Internal.Machine.TagsKey] = item.Tags, [Machine.TagsKey] = item.Tags,
[Models.Internal.Machine.PlayedCountKey] = item.PlayedCount, [Machine.PlayedCountKey] = item.PlayedCount,
[Models.Internal.Machine.PlayedTimeKey] = item.PlayedTime, [Machine.PlayedTimeKey] = item.PlayedTime,
[Models.Internal.Machine.PlayedTimeKey] = item.PlayedTime, [Machine.PlayedTimeKey] = item.PlayedTime,
[Models.Internal.Machine.RomKey] = ConvertFromAttractMode(item), [Machine.RomKey] = ConvertFromAttractMode(item),
}; };
return machine; return machine;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.AttractMode.Row"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.AttractMode.Row"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromAttractMode(Models.AttractMode.Row item) public static Rom ConvertFromAttractMode(Models.AttractMode.Row item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.NameKey] = item.Title, [Rom.NameKey] = item.Title,
[Models.Internal.Rom.AltRomnameKey] = item.AltRomname, [Rom.AltRomnameKey] = item.AltRomname,
[Models.Internal.Rom.AltTitleKey] = item.AltTitle, [Rom.AltTitleKey] = item.AltTitle,
[Models.Internal.Rom.FileIsAvailableKey] = item.FileIsAvailable, [Rom.FileIsAvailableKey] = item.FileIsAvailable,
}; };
return rom; return rom;
} }
@@ -72,29 +73,29 @@ namespace SabreTools.Serialization
#region Deserialize #region Deserialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Header"/> to <cref="Models.AttractMode.MetadataFile"/> /// Convert from <cref="Header"/> to <cref="Models.AttractMode.MetadataFile"/>
/// </summary> /// </summary>
public static Models.AttractMode.MetadataFile? ConvertHeaderToAttractMode(Models.Internal.Header? item) public static Models.AttractMode.MetadataFile? ConvertHeaderToAttractMode(Header? item)
{ {
if (item == null) if (item == null)
return null; return null;
var metadataFile = new Models.AttractMode.MetadataFile var metadataFile = new Models.AttractMode.MetadataFile
{ {
Header = item.ReadStringArray(Models.Internal.Header.HeaderKey), Header = item.ReadStringArray(Header.HeaderKey),
}; };
return metadataFile; return metadataFile;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Machine"/> to an array of <cref="Models.AttractMode.Row"/> /// Convert from <cref="Machine"/> to an array of <cref="Models.AttractMode.Row"/>
/// </summary> /// </summary>
public static Models.AttractMode.Row?[]? ConvertMachineToAttractMode(Models.Internal.Machine? item) public static Models.AttractMode.Row?[]? ConvertMachineToAttractMode(Machine? item)
{ {
if (item == null) if (item == null)
return null; return null;
var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey); var roms = item.Read<Rom[]>(Machine.RomKey);
return roms?.Select(rom => return roms?.Select(rom =>
{ {
if (rom == null) if (rom == null)
@@ -102,43 +103,43 @@ namespace SabreTools.Serialization
var rowItem = ConvertToAttractMode(rom); var rowItem = ConvertToAttractMode(rom);
rowItem.Name = item.ReadString(Models.Internal.Machine.NameKey); rowItem.Name = item.ReadString(Machine.NameKey);
rowItem.Emulator = item.ReadString(Models.Internal.Machine.EmulatorKey); rowItem.Emulator = item.ReadString(Machine.EmulatorKey);
rowItem.CloneOf = item.ReadString(Models.Internal.Machine.CloneOfKey); rowItem.CloneOf = item.ReadString(Machine.CloneOfKey);
rowItem.Year = item.ReadString(Models.Internal.Machine.YearKey); rowItem.Year = item.ReadString(Machine.YearKey);
rowItem.Manufacturer = item.ReadString(Models.Internal.Machine.ManufacturerKey); rowItem.Manufacturer = item.ReadString(Machine.ManufacturerKey);
rowItem.Category = item.ReadString(Models.Internal.Machine.CategoryKey); rowItem.Category = item.ReadString(Machine.CategoryKey);
rowItem.Players = item.ReadString(Models.Internal.Machine.PlayersKey); rowItem.Players = item.ReadString(Machine.PlayersKey);
rowItem.Rotation = item.ReadString(Models.Internal.Machine.RotationKey); rowItem.Rotation = item.ReadString(Machine.RotationKey);
rowItem.Control = item.ReadString(Models.Internal.Machine.ControlKey); rowItem.Control = item.ReadString(Machine.ControlKey);
rowItem.Status = item.ReadString(Models.Internal.Machine.StatusKey); rowItem.Status = item.ReadString(Machine.StatusKey);
rowItem.DisplayCount = item.ReadString(Models.Internal.Machine.DisplayCountKey); rowItem.DisplayCount = item.ReadString(Machine.DisplayCountKey);
rowItem.DisplayType = item.ReadString(Models.Internal.Machine.DisplayTypeKey); rowItem.DisplayType = item.ReadString(Machine.DisplayTypeKey);
rowItem.Extra = item.ReadString(Models.Internal.Machine.ExtraKey); rowItem.Extra = item.ReadString(Machine.ExtraKey);
rowItem.Buttons = item.ReadString(Models.Internal.Machine.ButtonsKey); rowItem.Buttons = item.ReadString(Machine.ButtonsKey);
rowItem.Favorite = item.ReadString(Models.Internal.Machine.FavoriteKey); rowItem.Favorite = item.ReadString(Machine.FavoriteKey);
rowItem.Tags = item.ReadString(Models.Internal.Machine.TagsKey); rowItem.Tags = item.ReadString(Machine.TagsKey);
rowItem.PlayedCount = item.ReadString(Models.Internal.Machine.PlayedCountKey); rowItem.PlayedCount = item.ReadString(Machine.PlayedCountKey);
rowItem.PlayedTime = item.ReadString(Models.Internal.Machine.PlayedTimeKey); rowItem.PlayedTime = item.ReadString(Machine.PlayedTimeKey);
return rowItem; return rowItem;
})?.ToArray(); })?.ToArray();
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.AttractMode.Row"/> /// Convert from <cref="Rom"/> to <cref="Models.AttractMode.Row"/>
/// </summary> /// </summary>
private static Models.AttractMode.Row? ConvertToAttractMode(Models.Internal.Rom? item) private static Models.AttractMode.Row? ConvertToAttractMode(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var row = new Models.AttractMode.Row var row = new Models.AttractMode.Row
{ {
Title = item.ReadString(Models.Internal.Rom.NameKey), Title = item.ReadString(Rom.NameKey),
AltRomname = item.ReadString(Models.Internal.Rom.AltRomnameKey), AltRomname = item.ReadString(Rom.AltRomnameKey),
AltTitle = item.ReadString(Models.Internal.Rom.AltTitleKey), AltTitle = item.ReadString(Rom.AltTitleKey),
FileIsAvailable = item.ReadString(Models.Internal.Rom.FileIsAvailableKey), FileIsAvailable = item.ReadString(Rom.FileIsAvailableKey),
}; };
return row; return row;
} }

View File

@@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using SabreTools.Models.Internal;
namespace SabreTools.Serialization namespace SabreTools.Serialization
{ {
@@ -11,360 +12,360 @@ namespace SabreTools.Serialization
#region Serialize #region Serialize
/// <summary> /// <summary>
/// Convert from <cref="Models.ClrMamePro.ClrMamePro"/> to <cref="Models.Internal.Header"/> /// Convert from <cref="Models.ClrMamePro.ClrMamePro"/> to <cref="Header"/>
/// </summary> /// </summary>
public static Models.Internal.Header ConvertHeaderFromClrMamePro(Models.ClrMamePro.ClrMamePro item) public static Header ConvertHeaderFromClrMamePro(Models.ClrMamePro.ClrMamePro item)
{ {
var header = new Models.Internal.Header var header = new Header
{ {
[Models.Internal.Header.NameKey] = item.Name, [Header.NameKey] = item.Name,
[Models.Internal.Header.DescriptionKey] = item.Description, [Header.DescriptionKey] = item.Description,
[Models.Internal.Header.RootDirKey] = item.RootDir, [Header.RootDirKey] = item.RootDir,
[Models.Internal.Header.CategoryKey] = item.Category, [Header.CategoryKey] = item.Category,
[Models.Internal.Header.VersionKey] = item.Version, [Header.VersionKey] = item.Version,
[Models.Internal.Header.DateKey] = item.Date, [Header.DateKey] = item.Date,
[Models.Internal.Header.AuthorKey] = item.Author, [Header.AuthorKey] = item.Author,
[Models.Internal.Header.HomepageKey] = item.Homepage, [Header.HomepageKey] = item.Homepage,
[Models.Internal.Header.UrlKey] = item.Url, [Header.UrlKey] = item.Url,
[Models.Internal.Header.CommentKey] = item.Comment, [Header.CommentKey] = item.Comment,
[Models.Internal.Header.HeaderKey] = item.Header, [Header.HeaderKey] = item.Header,
[Models.Internal.Header.TypeKey] = item.Type, [Header.TypeKey] = item.Type,
[Models.Internal.Header.ForceMergingKey] = item.ForceMerging, [Header.ForceMergingKey] = item.ForceMerging,
[Models.Internal.Header.ForceZippingKey] = item.ForceZipping, [Header.ForceZippingKey] = item.ForceZipping,
[Models.Internal.Header.ForcePackingKey] = item.ForcePacking, [Header.ForcePackingKey] = item.ForcePacking,
}; };
return header; return header;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ClrMamePro.GameBase"/> to <cref="Models.Internal.Machine"/> /// Convert from <cref="Models.ClrMamePro.GameBase"/> to <cref="Machine"/>
/// </summary> /// </summary>
public static Models.Internal.Machine ConvertMachineFromClrMamePro(Models.ClrMamePro.GameBase item) public static Machine ConvertMachineFromClrMamePro(Models.ClrMamePro.GameBase item)
{ {
var machine = new Models.Internal.Machine var machine = new Machine
{ {
[Models.Internal.Machine.NameKey] = item.Name, [Machine.NameKey] = item.Name,
[Models.Internal.Machine.DescriptionKey] = item.Description, [Machine.DescriptionKey] = item.Description,
[Models.Internal.Machine.YearKey] = item.Year, [Machine.YearKey] = item.Year,
[Models.Internal.Machine.ManufacturerKey] = item.Manufacturer, [Machine.ManufacturerKey] = item.Manufacturer,
[Models.Internal.Machine.CategoryKey] = item.Category, [Machine.CategoryKey] = item.Category,
[Models.Internal.Machine.CloneOfKey] = item.CloneOf, [Machine.CloneOfKey] = item.CloneOf,
[Models.Internal.Machine.RomOfKey] = item.RomOf, [Machine.RomOfKey] = item.RomOf,
[Models.Internal.Machine.SampleOfKey] = item.SampleOf, [Machine.SampleOfKey] = item.SampleOf,
}; };
if (item.Release != null && item.Release.Any()) if (item.Release != null && item.Release.Any())
{ {
var releases = new List<Models.Internal.Release>(); var releases = new List<Release>();
foreach (var release in item.Release) foreach (var release in item.Release)
{ {
releases.Add(ConvertFromClrMamePro(release)); releases.Add(ConvertFromClrMamePro(release));
} }
machine[Models.Internal.Machine.ReleaseKey] = releases.ToArray(); machine[Machine.ReleaseKey] = releases.ToArray();
} }
if (item.BiosSet != null && item.BiosSet.Any()) if (item.BiosSet != null && item.BiosSet.Any())
{ {
var biosSets = new List<Models.Internal.BiosSet>(); var biosSets = new List<BiosSet>();
foreach (var biosSet in item.BiosSet) foreach (var biosSet in item.BiosSet)
{ {
biosSets.Add(ConvertFromClrMamePro(biosSet)); biosSets.Add(ConvertFromClrMamePro(biosSet));
} }
machine[Models.Internal.Machine.BiosSetKey] = biosSets.ToArray(); machine[Machine.BiosSetKey] = biosSets.ToArray();
} }
if (item.Rom != null && item.Rom.Any()) if (item.Rom != null && item.Rom.Any())
{ {
var roms = new List<Models.Internal.Rom>(); var roms = new List<Rom>();
foreach (var rom in item.Rom) foreach (var rom in item.Rom)
{ {
roms.Add(ConvertFromClrMamePro(rom)); roms.Add(ConvertFromClrMamePro(rom));
} }
machine[Models.Internal.Machine.RomKey] = roms.ToArray(); machine[Machine.RomKey] = roms.ToArray();
} }
if (item.Disk != null && item.Disk.Any()) if (item.Disk != null && item.Disk.Any())
{ {
var disks = new List<Models.Internal.Disk>(); var disks = new List<Disk>();
foreach (var disk in item.Disk) foreach (var disk in item.Disk)
{ {
disks.Add(ConvertFromClrMamePro(disk)); disks.Add(ConvertFromClrMamePro(disk));
} }
machine[Models.Internal.Machine.DiskKey] = disks.ToArray(); machine[Machine.DiskKey] = disks.ToArray();
} }
if (item.Media != null && item.Media.Any()) if (item.Media != null && item.Media.Any())
{ {
var medias = new List<Models.Internal.Media>(); var medias = new List<Media>();
foreach (var media in item.Media) foreach (var media in item.Media)
{ {
medias.Add(ConvertFromClrMamePro(media)); medias.Add(ConvertFromClrMamePro(media));
} }
machine[Models.Internal.Machine.MediaKey] = medias.ToArray(); machine[Machine.MediaKey] = medias.ToArray();
} }
if (item.Sample != null && item.Sample.Any()) if (item.Sample != null && item.Sample.Any())
{ {
var samples = new List<Models.Internal.Sample>(); var samples = new List<Sample>();
foreach (var sample in item.Sample) foreach (var sample in item.Sample)
{ {
samples.Add(ConvertFromClrMamePro(sample)); samples.Add(ConvertFromClrMamePro(sample));
} }
machine[Models.Internal.Machine.SampleKey] = samples.ToArray(); machine[Machine.SampleKey] = samples.ToArray();
} }
if (item.Archive != null && item.Archive.Any()) if (item.Archive != null && item.Archive.Any())
{ {
var archives = new List<Models.Internal.Archive>(); var archives = new List<Archive>();
foreach (var archive in item.Archive) foreach (var archive in item.Archive)
{ {
archives.Add(ConvertFromClrMamePro(archive)); archives.Add(ConvertFromClrMamePro(archive));
} }
machine[Models.Internal.Machine.ArchiveKey] = archives.ToArray(); machine[Machine.ArchiveKey] = archives.ToArray();
} }
if (item.Chip != null && item.Chip.Any()) if (item.Chip != null && item.Chip.Any())
{ {
var chips = new List<Models.Internal.Chip>(); var chips = new List<Chip>();
foreach (var chip in item.Chip) foreach (var chip in item.Chip)
{ {
chips.Add(ConvertFromClrMamePro(chip)); chips.Add(ConvertFromClrMamePro(chip));
} }
machine[Models.Internal.Machine.ChipKey] = chips.ToArray(); machine[Machine.ChipKey] = chips.ToArray();
} }
if (item.Video != null) if (item.Video != null)
machine[Models.Internal.Machine.VideoKey] = ConvertFromClrMamePro(item.Video); machine[Machine.VideoKey] = ConvertFromClrMamePro(item.Video);
if (item.Sound != null) if (item.Sound != null)
machine[Models.Internal.Machine.SoundKey] = ConvertFromClrMamePro(item.Sound); machine[Machine.SoundKey] = ConvertFromClrMamePro(item.Sound);
if (item.Input != null) if (item.Input != null)
machine[Models.Internal.Machine.InputKey] = ConvertFromClrMamePro(item.Input); machine[Machine.InputKey] = ConvertFromClrMamePro(item.Input);
if (item.DipSwitch != null && item.DipSwitch.Any()) if (item.DipSwitch != null && item.DipSwitch.Any())
{ {
var dipSwitches = new List<Models.Internal.DipSwitch>(); var dipSwitches = new List<DipSwitch>();
foreach (var dipSwitch in item.DipSwitch) foreach (var dipSwitch in item.DipSwitch)
{ {
dipSwitches.Add(ConvertFromClrMamePro(dipSwitch)); dipSwitches.Add(ConvertFromClrMamePro(dipSwitch));
} }
machine[Models.Internal.Machine.DipSwitchKey] = dipSwitches.ToArray(); machine[Machine.DipSwitchKey] = dipSwitches.ToArray();
} }
if (item.Driver != null) if (item.Driver != null)
machine[Models.Internal.Machine.DriverKey] = ConvertFromClrMamePro(item.Driver); machine[Machine.DriverKey] = ConvertFromClrMamePro(item.Driver);
return machine; return machine;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ClrMamePro.Archive"/> to <cref="Models.Internal.Archive"/> /// Convert from <cref="Models.ClrMamePro.Archive"/> to <cref="Archive"/>
/// </summary> /// </summary>
public static Models.Internal.Archive ConvertFromClrMamePro(Models.ClrMamePro.Archive item) public static Archive ConvertFromClrMamePro(Models.ClrMamePro.Archive item)
{ {
var archive = new Models.Internal.Archive var archive = new Archive
{ {
[Models.Internal.Archive.NameKey] = item.Name, [Archive.NameKey] = item.Name,
}; };
return archive; return archive;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ClrMamePro.BiosSet"/> to <cref="Models.Internal.BiosSet"/> /// Convert from <cref="Models.ClrMamePro.BiosSet"/> to <cref="BiosSet"/>
/// </summary> /// </summary>
public static Models.Internal.BiosSet ConvertFromClrMamePro(Models.ClrMamePro.BiosSet item) public static BiosSet ConvertFromClrMamePro(Models.ClrMamePro.BiosSet item)
{ {
var biosset = new Models.Internal.BiosSet var biosset = new BiosSet
{ {
[Models.Internal.BiosSet.NameKey] = item.Name, [BiosSet.NameKey] = item.Name,
[Models.Internal.BiosSet.DescriptionKey] = item.Description, [BiosSet.DescriptionKey] = item.Description,
[Models.Internal.BiosSet.DefaultKey] = item.Default, [BiosSet.DefaultKey] = item.Default,
}; };
return biosset; return biosset;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ClrMamePro.Chip"/> to <cref="Models.Internal.Chip"/> /// Convert from <cref="Models.ClrMamePro.Chip"/> to <cref="Chip"/>
/// </summary> /// </summary>
public static Models.Internal.Chip ConvertFromClrMamePro(Models.ClrMamePro.Chip item) public static Chip ConvertFromClrMamePro(Models.ClrMamePro.Chip item)
{ {
var chip = new Models.Internal.Chip var chip = new Chip
{ {
[Models.Internal.Chip.ChipTypeKey] = item.Type, [Chip.ChipTypeKey] = item.Type,
[Models.Internal.Chip.NameKey] = item.Name, [Chip.NameKey] = item.Name,
[Models.Internal.Chip.FlagsKey] = item.Flags, [Chip.FlagsKey] = item.Flags,
[Models.Internal.Chip.ClockKey] = item.Clock, [Chip.ClockKey] = item.Clock,
}; };
return chip; return chip;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ClrMamePro.DipSwitch"/> to <cref="Models.Internal.DipSwitch"/> /// Convert from <cref="Models.ClrMamePro.DipSwitch"/> to <cref="DipSwitch"/>
/// </summary> /// </summary>
public static Models.Internal.DipSwitch ConvertFromClrMamePro(Models.ClrMamePro.DipSwitch item) public static DipSwitch ConvertFromClrMamePro(Models.ClrMamePro.DipSwitch item)
{ {
var dipswitch = new Models.Internal.DipSwitch var dipswitch = new DipSwitch
{ {
[Models.Internal.DipSwitch.NameKey] = item.Name, [DipSwitch.NameKey] = item.Name,
[Models.Internal.DipSwitch.EntryKey] = item.Entry, [DipSwitch.EntryKey] = item.Entry,
[Models.Internal.DipSwitch.DefaultKey] = item.Default, [DipSwitch.DefaultKey] = item.Default,
}; };
return dipswitch; return dipswitch;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ClrMamePro.Disk"/> to <cref="Models.Internal.Disk"/> /// Convert from <cref="Models.ClrMamePro.Disk"/> to <cref="Disk"/>
/// </summary> /// </summary>
public static Models.Internal.Disk ConvertFromClrMamePro(Models.ClrMamePro.Disk item) public static Disk ConvertFromClrMamePro(Models.ClrMamePro.Disk item)
{ {
var disk = new Models.Internal.Disk var disk = new Disk
{ {
[Models.Internal.Disk.NameKey] = item.Name, [Disk.NameKey] = item.Name,
[Models.Internal.Disk.MD5Key] = item.MD5, [Disk.MD5Key] = item.MD5,
[Models.Internal.Disk.SHA1Key] = item.SHA1, [Disk.SHA1Key] = item.SHA1,
[Models.Internal.Disk.MergeKey] = item.Merge, [Disk.MergeKey] = item.Merge,
[Models.Internal.Disk.StatusKey] = item.Status, [Disk.StatusKey] = item.Status,
[Models.Internal.Disk.FlagsKey] = item.Flags, [Disk.FlagsKey] = item.Flags,
}; };
return disk; return disk;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ClrMamePro.Driver"/> to <cref="Models.Internal.Driver"/> /// Convert from <cref="Models.ClrMamePro.Driver"/> to <cref="Driver"/>
/// </summary> /// </summary>
public static Models.Internal.Driver ConvertFromClrMamePro(Models.ClrMamePro.Driver item) public static Driver ConvertFromClrMamePro(Models.ClrMamePro.Driver item)
{ {
var driver = new Models.Internal.Driver var driver = new Driver
{ {
[Models.Internal.Driver.StatusKey] = item.Status, [Driver.StatusKey] = item.Status,
[Models.Internal.Driver.ColorKey] = item.Color, [Driver.ColorKey] = item.Color,
[Models.Internal.Driver.SoundKey] = item.Sound, [Driver.SoundKey] = item.Sound,
[Models.Internal.Driver.PaletteSizeKey] = item.PaletteSize, [Driver.PaletteSizeKey] = item.PaletteSize,
[Models.Internal.Driver.BlitKey] = item.Blit, [Driver.BlitKey] = item.Blit,
}; };
return driver; return driver;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ClrMamePro.Input"/> to <cref="Models.Internal.Input"/> /// Convert from <cref="Models.ClrMamePro.Input"/> to <cref="Input"/>
/// </summary> /// </summary>
public static Models.Internal.Input ConvertFromClrMamePro(Models.ClrMamePro.Input item) public static Input ConvertFromClrMamePro(Models.ClrMamePro.Input item)
{ {
var input = new Models.Internal.Input var input = new Input
{ {
[Models.Internal.Input.PlayersKey] = item.Players, [Input.PlayersKey] = item.Players,
[Models.Internal.Input.ControlKey] = item.Control, [Input.ControlKey] = item.Control,
[Models.Internal.Input.ButtonsKey] = item.Buttons, [Input.ButtonsKey] = item.Buttons,
[Models.Internal.Input.CoinsKey] = item.Coins, [Input.CoinsKey] = item.Coins,
[Models.Internal.Input.TiltKey] = item.Tilt, [Input.TiltKey] = item.Tilt,
[Models.Internal.Input.ServiceKey] = item.Service, [Input.ServiceKey] = item.Service,
}; };
return input; return input;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ClrMamePro.Media"/> to <cref="Models.Internal.Media"/> /// Convert from <cref="Models.ClrMamePro.Media"/> to <cref="Media"/>
/// </summary> /// </summary>
public static Models.Internal.Media ConvertFromClrMamePro(Models.ClrMamePro.Media item) public static Media ConvertFromClrMamePro(Models.ClrMamePro.Media item)
{ {
var media = new Models.Internal.Media var media = new Media
{ {
[Models.Internal.Media.NameKey] = item.Name, [Media.NameKey] = item.Name,
[Models.Internal.Media.MD5Key] = item.MD5, [Media.MD5Key] = item.MD5,
[Models.Internal.Media.SHA1Key] = item.SHA1, [Media.SHA1Key] = item.SHA1,
[Models.Internal.Media.SHA256Key] = item.SHA256, [Media.SHA256Key] = item.SHA256,
[Models.Internal.Media.SpamSumKey] = item.SpamSum, [Media.SpamSumKey] = item.SpamSum,
}; };
return media; return media;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ClrMamePro.Release"/> to <cref="Models.Internal.Release"/> /// Convert from <cref="Models.ClrMamePro.Release"/> to <cref="Release"/>
/// </summary> /// </summary>
public static Models.Internal.Release ConvertFromClrMamePro(Models.ClrMamePro.Release item) public static Release ConvertFromClrMamePro(Models.ClrMamePro.Release item)
{ {
var release = new Models.Internal.Release var release = new Release
{ {
[Models.Internal.Release.NameKey] = item.Name, [Release.NameKey] = item.Name,
[Models.Internal.Release.RegionKey] = item.Region, [Release.RegionKey] = item.Region,
[Models.Internal.Release.LanguageKey] = item.Language, [Release.LanguageKey] = item.Language,
[Models.Internal.Release.DateKey] = item.Date, [Release.DateKey] = item.Date,
[Models.Internal.Release.DefaultKey] = item.Default, [Release.DefaultKey] = item.Default,
}; };
return release; return release;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ClrMamePro.Rom"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.ClrMamePro.Rom"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromClrMamePro(Models.ClrMamePro.Rom item) public static Rom ConvertFromClrMamePro(Models.ClrMamePro.Rom item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.NameKey] = item.Name, [Rom.NameKey] = item.Name,
[Models.Internal.Rom.SizeKey] = item.Size, [Rom.SizeKey] = item.Size,
[Models.Internal.Rom.CRCKey] = item.CRC, [Rom.CRCKey] = item.CRC,
[Models.Internal.Rom.MD5Key] = item.MD5, [Rom.MD5Key] = item.MD5,
[Models.Internal.Rom.SHA1Key] = item.SHA1, [Rom.SHA1Key] = item.SHA1,
[Models.Internal.Rom.SHA256Key] = item.SHA256, [Rom.SHA256Key] = item.SHA256,
[Models.Internal.Rom.SHA384Key] = item.SHA384, [Rom.SHA384Key] = item.SHA384,
[Models.Internal.Rom.SHA512Key] = item.SHA512, [Rom.SHA512Key] = item.SHA512,
[Models.Internal.Rom.SpamSumKey] = item.SpamSum, [Rom.SpamSumKey] = item.SpamSum,
[Models.Internal.Rom.xxHash364Key] = item.xxHash364, [Rom.xxHash364Key] = item.xxHash364,
[Models.Internal.Rom.xxHash3128Key] = item.xxHash3128, [Rom.xxHash3128Key] = item.xxHash3128,
[Models.Internal.Rom.MergeKey] = item.Merge, [Rom.MergeKey] = item.Merge,
[Models.Internal.Rom.StatusKey] = item.Status, [Rom.StatusKey] = item.Status,
[Models.Internal.Rom.RegionKey] = item.Region, [Rom.RegionKey] = item.Region,
[Models.Internal.Rom.FlagsKey] = item.Flags, [Rom.FlagsKey] = item.Flags,
[Models.Internal.Rom.OffsetKey] = item.Offs, [Rom.OffsetKey] = item.Offs,
[Models.Internal.Rom.SerialKey] = item.Serial, [Rom.SerialKey] = item.Serial,
[Models.Internal.Rom.HeaderKey] = item.Header, [Rom.HeaderKey] = item.Header,
[Models.Internal.Rom.DateKey] = item.Date, [Rom.DateKey] = item.Date,
[Models.Internal.Rom.InvertedKey] = item.Inverted, [Rom.InvertedKey] = item.Inverted,
[Models.Internal.Rom.MIAKey] = item.MIA, [Rom.MIAKey] = item.MIA,
}; };
return rom; return rom;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ClrMamePro.Sample"/> to <cref="Models.Internal.Sample"/> /// Convert from <cref="Models.ClrMamePro.Sample"/> to <cref="Sample"/>
/// </summary> /// </summary>
public static Models.Internal.Sample ConvertFromClrMamePro(Models.ClrMamePro.Sample item) public static Sample ConvertFromClrMamePro(Models.ClrMamePro.Sample item)
{ {
var sample = new Models.Internal.Sample var sample = new Sample
{ {
[Models.Internal.Sample.NameKey] = item.Name, [Sample.NameKey] = item.Name,
}; };
return sample; return sample;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ClrMamePro.Sound"/> to <cref="Models.Internal.Sound"/> /// Convert from <cref="Models.ClrMamePro.Sound"/> to <cref="Sound"/>
/// </summary> /// </summary>
public static Models.Internal.Sound ConvertFromClrMamePro(Models.ClrMamePro.Sound item) public static Sound ConvertFromClrMamePro(Models.ClrMamePro.Sound item)
{ {
var sound = new Models.Internal.Sound var sound = new Sound
{ {
[Models.Internal.Sound.ChannelsKey] = item.Channels, [Sound.ChannelsKey] = item.Channels,
}; };
return sound; return sound;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.ClrMamePro.Video"/> to <cref="Models.Internal.Video"/> /// Convert from <cref="Models.ClrMamePro.Video"/> to <cref="Video"/>
/// </summary> /// </summary>
public static Models.Internal.Video ConvertFromClrMamePro(Models.ClrMamePro.Video item) public static Video ConvertFromClrMamePro(Models.ClrMamePro.Video item)
{ {
var video = new Models.Internal.Video var video = new Video
{ {
[Models.Internal.Video.ScreenKey] = item.Screen, [Video.ScreenKey] = item.Screen,
[Models.Internal.Video.OrientationKey] = item.Orientation, [Video.OrientationKey] = item.Orientation,
[Models.Internal.Video.WidthKey] = item.X, [Video.WidthKey] = item.X,
[Models.Internal.Video.HeightKey] = item.Y, [Video.HeightKey] = item.Y,
[Models.Internal.Video.AspectXKey] = item.AspectX, [Video.AspectXKey] = item.AspectX,
[Models.Internal.Video.AspectYKey] = item.AspectY, [Video.AspectYKey] = item.AspectY,
[Models.Internal.Video.RefreshKey] = item.Freq, [Video.RefreshKey] = item.Freq,
}; };
return video; return video;
} }
@@ -374,341 +375,341 @@ namespace SabreTools.Serialization
#region Deserialize #region Deserialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Header"/> to <cref="Models.ClrMamePro.ClrMamePro"/> /// Convert from <cref="Header"/> to <cref="Models.ClrMamePro.ClrMamePro"/>
/// </summary> /// </summary>
public static Models.ClrMamePro.ClrMamePro? ConvertHeaderToClrMamePro(Models.Internal.Header? item) public static Models.ClrMamePro.ClrMamePro? ConvertHeaderToClrMamePro(Header? item)
{ {
if (item == null) if (item == null)
return null; return null;
var clrMamePro = new Models.ClrMamePro.ClrMamePro var clrMamePro = new Models.ClrMamePro.ClrMamePro
{ {
Name = item.ReadString(Models.Internal.Header.NameKey), Name = item.ReadString(Header.NameKey),
Description = item.ReadString(Models.Internal.Header.DescriptionKey), Description = item.ReadString(Header.DescriptionKey),
RootDir = item.ReadString(Models.Internal.Header.RootDirKey), RootDir = item.ReadString(Header.RootDirKey),
Category = item.ReadString(Models.Internal.Header.CategoryKey), Category = item.ReadString(Header.CategoryKey),
Version = item.ReadString(Models.Internal.Header.VersionKey), Version = item.ReadString(Header.VersionKey),
Date = item.ReadString(Models.Internal.Header.DateKey), Date = item.ReadString(Header.DateKey),
Author = item.ReadString(Models.Internal.Header.AuthorKey), Author = item.ReadString(Header.AuthorKey),
Homepage = item.ReadString(Models.Internal.Header.HomepageKey), Homepage = item.ReadString(Header.HomepageKey),
Url = item.ReadString(Models.Internal.Header.UrlKey), Url = item.ReadString(Header.UrlKey),
Comment = item.ReadString(Models.Internal.Header.CommentKey), Comment = item.ReadString(Header.CommentKey),
Header = item.ReadString(Models.Internal.Header.HeaderKey), Header = item.ReadString(Header.HeaderKey),
Type = item.ReadString(Models.Internal.Header.TypeKey), Type = item.ReadString(Header.TypeKey),
ForceMerging = item.ReadString(Models.Internal.Header.ForceMergingKey), ForceMerging = item.ReadString(Header.ForceMergingKey),
ForceZipping = item.ReadString(Models.Internal.Header.ForceZippingKey), ForceZipping = item.ReadString(Header.ForceZippingKey),
ForcePacking = item.ReadString(Models.Internal.Header.ForcePackingKey), ForcePacking = item.ReadString(Header.ForcePackingKey),
}; };
return clrMamePro; return clrMamePro;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Archive"/> to <cref="Models.ClrMamePro.Machine"/> /// Convert from <cref="Archive"/> to <cref="Models.ClrMamePro.Machine"/>
/// </summary> /// </summary>
public static Models.ClrMamePro.GameBase? ConvertMachineToClrMamePro(Models.Internal.Machine? item, bool game = false) public static Models.ClrMamePro.GameBase? ConvertMachineToClrMamePro(Machine? item, bool game = false)
{ {
if (item == null) if (item == null)
return null; return null;
Models.ClrMamePro.GameBase gameBase = game ? new Models.ClrMamePro.Game() : new Models.ClrMamePro.Machine(); Models.ClrMamePro.GameBase gameBase = game ? new Models.ClrMamePro.Game() : new Models.ClrMamePro.Machine();
gameBase.Name = item.ReadString(Models.Internal.Machine.NameKey); gameBase.Name = item.ReadString(Machine.NameKey);
gameBase.Description = item.ReadString(Models.Internal.Machine.DescriptionKey); gameBase.Description = item.ReadString(Machine.DescriptionKey);
gameBase.Year = item.ReadString(Models.Internal.Machine.YearKey); gameBase.Year = item.ReadString(Machine.YearKey);
gameBase.Manufacturer = item.ReadString(Models.Internal.Machine.ManufacturerKey); gameBase.Manufacturer = item.ReadString(Machine.ManufacturerKey);
gameBase.Category = item.ReadString(Models.Internal.Machine.CategoryKey); gameBase.Category = item.ReadString(Machine.CategoryKey);
gameBase.CloneOf = item.ReadString(Models.Internal.Machine.CloneOfKey); gameBase.CloneOf = item.ReadString(Machine.CloneOfKey);
gameBase.RomOf = item.ReadString(Models.Internal.Machine.RomOfKey); gameBase.RomOf = item.ReadString(Machine.RomOfKey);
gameBase.SampleOf = item.ReadString(Models.Internal.Machine.SampleOfKey); gameBase.SampleOf = item.ReadString(Machine.SampleOfKey);
var releases = item.Read<Models.Internal.Release[]>(Models.Internal.Machine.ReleaseKey); var releases = item.Read<Release[]>(Machine.ReleaseKey);
gameBase.Release = releases?.Select(ConvertToClrMamePro)?.ToArray(); gameBase.Release = releases?.Select(ConvertToClrMamePro)?.ToArray();
var biosSets = item.Read<Models.Internal.BiosSet[]>(Models.Internal.Machine.BiosSetKey); var biosSets = item.Read<BiosSet[]>(Machine.BiosSetKey);
gameBase.BiosSet = biosSets?.Select(ConvertToClrMamePro)?.ToArray(); gameBase.BiosSet = biosSets?.Select(ConvertToClrMamePro)?.ToArray();
var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey); var roms = item.Read<Rom[]>(Machine.RomKey);
gameBase.Rom = roms?.Select(ConvertToClrMamePro)?.ToArray(); gameBase.Rom = roms?.Select(ConvertToClrMamePro)?.ToArray();
var disks = item.Read<Models.Internal.Disk[]>(Models.Internal.Machine.DiskKey); var disks = item.Read<Disk[]>(Machine.DiskKey);
gameBase.Disk = disks?.Select(ConvertToClrMamePro)?.ToArray(); gameBase.Disk = disks?.Select(ConvertToClrMamePro)?.ToArray();
var medias = item.Read<Models.Internal.Media[]>(Models.Internal.Machine.MediaKey); var medias = item.Read<Media[]>(Machine.MediaKey);
gameBase.Media = medias?.Select(ConvertToClrMamePro)?.ToArray(); gameBase.Media = medias?.Select(ConvertToClrMamePro)?.ToArray();
var samples = item.Read<Models.Internal.Sample[]>(Models.Internal.Machine.SampleKey); var samples = item.Read<Sample[]>(Machine.SampleKey);
gameBase.Sample = samples?.Select(ConvertToClrMamePro)?.ToArray(); gameBase.Sample = samples?.Select(ConvertToClrMamePro)?.ToArray();
var archives = item.Read<Models.Internal.Archive[]>(Models.Internal.Machine.ArchiveKey); var archives = item.Read<Archive[]>(Machine.ArchiveKey);
gameBase.Archive = archives?.Select(ConvertToClrMamePro)?.ToArray(); gameBase.Archive = archives?.Select(ConvertToClrMamePro)?.ToArray();
var chips = item.Read<Models.Internal.Chip[]>(Models.Internal.Machine.ChipKey); var chips = item.Read<Chip[]>(Machine.ChipKey);
gameBase.Chip = chips?.Select(ConvertToClrMamePro)?.ToArray(); gameBase.Chip = chips?.Select(ConvertToClrMamePro)?.ToArray();
var video = item.Read<Models.Internal.Video>(Models.Internal.Machine.VideoKey); var video = item.Read<Video>(Machine.VideoKey);
gameBase.Video = ConvertToClrMamePro(video); gameBase.Video = ConvertToClrMamePro(video);
var sound = item.Read<Models.Internal.Sound>(Models.Internal.Machine.SoundKey); var sound = item.Read<Sound>(Machine.SoundKey);
gameBase.Sound = ConvertToClrMamePro(sound); gameBase.Sound = ConvertToClrMamePro(sound);
var input = item.Read<Models.Internal.Input>(Models.Internal.Machine.InputKey); var input = item.Read<Input>(Machine.InputKey);
gameBase.Input = ConvertToClrMamePro(input); gameBase.Input = ConvertToClrMamePro(input);
var dipSwitches = item.Read<Models.Internal.DipSwitch[]>(Models.Internal.Machine.DipSwitchKey); var dipSwitches = item.Read<DipSwitch[]>(Machine.DipSwitchKey);
gameBase.DipSwitch = dipSwitches?.Select(ConvertToClrMamePro)?.ToArray(); gameBase.DipSwitch = dipSwitches?.Select(ConvertToClrMamePro)?.ToArray();
var driver = item.Read<Models.Internal.Driver>(Models.Internal.Machine.DriverKey); var driver = item.Read<Driver>(Machine.DriverKey);
gameBase.Driver = ConvertToClrMamePro(driver); gameBase.Driver = ConvertToClrMamePro(driver);
return gameBase; return gameBase;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Archive"/> to <cref="Models.ClrMamePro.Archive"/> /// Convert from <cref="Archive"/> to <cref="Models.ClrMamePro.Archive"/>
/// </summary> /// </summary>
private static Models.ClrMamePro.Archive? ConvertToClrMamePro(Models.Internal.Archive? item) private static Models.ClrMamePro.Archive? ConvertToClrMamePro(Archive? item)
{ {
if (item == null) if (item == null)
return null; return null;
var archive = new Models.ClrMamePro.Archive var archive = new Models.ClrMamePro.Archive
{ {
Name = item.ReadString(Models.Internal.Archive.NameKey), Name = item.ReadString(Archive.NameKey),
}; };
return archive; return archive;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.BiosSet"/> to <cref="Models.ClrMamePro.BiosSet"/> /// Convert from <cref="BiosSet"/> to <cref="Models.ClrMamePro.BiosSet"/>
/// </summary> /// </summary>
private static Models.ClrMamePro.BiosSet? ConvertToClrMamePro(Models.Internal.BiosSet? item) private static Models.ClrMamePro.BiosSet? ConvertToClrMamePro(BiosSet? item)
{ {
if (item == null) if (item == null)
return null; return null;
var biosset = new Models.ClrMamePro.BiosSet var biosset = new Models.ClrMamePro.BiosSet
{ {
Name = item.ReadString(Models.Internal.BiosSet.NameKey), Name = item.ReadString(BiosSet.NameKey),
Description = item.ReadString(Models.Internal.BiosSet.DescriptionKey), Description = item.ReadString(BiosSet.DescriptionKey),
Default = item.ReadString(Models.Internal.BiosSet.DefaultKey), Default = item.ReadString(BiosSet.DefaultKey),
}; };
return biosset; return biosset;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Chip"/> to <cref="Models.ClrMamePro.Chip"/> /// Convert from <cref="Chip"/> to <cref="Models.ClrMamePro.Chip"/>
/// </summary> /// </summary>
private static Models.ClrMamePro.Chip? ConvertToClrMamePro(Models.Internal.Chip? item) private static Models.ClrMamePro.Chip? ConvertToClrMamePro(Chip? item)
{ {
if (item == null) if (item == null)
return null; return null;
var chip = new Models.ClrMamePro.Chip var chip = new Models.ClrMamePro.Chip
{ {
Type = item.ReadString(Models.Internal.Chip.ChipTypeKey), Type = item.ReadString(Chip.ChipTypeKey),
Name = item.ReadString(Models.Internal.Chip.NameKey), Name = item.ReadString(Chip.NameKey),
Flags = item.ReadString(Models.Internal.Chip.FlagsKey), Flags = item.ReadString(Chip.FlagsKey),
Clock = item.ReadString(Models.Internal.Chip.ClockKey), Clock = item.ReadString(Chip.ClockKey),
}; };
return chip; return chip;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.DipSwitch"/> to <cref="Models.ClrMamePro.DipSwitch"/> /// Convert from <cref="DipSwitch"/> to <cref="Models.ClrMamePro.DipSwitch"/>
/// </summary> /// </summary>
private static Models.ClrMamePro.DipSwitch? ConvertToClrMamePro(Models.Internal.DipSwitch? item) private static Models.ClrMamePro.DipSwitch? ConvertToClrMamePro(DipSwitch? item)
{ {
if (item == null) if (item == null)
return null; return null;
var dipswitch = new Models.ClrMamePro.DipSwitch var dipswitch = new Models.ClrMamePro.DipSwitch
{ {
Name = item.ReadString(Models.Internal.DipSwitch.NameKey), Name = item.ReadString(DipSwitch.NameKey),
Entry = item[Models.Internal.DipSwitch.EntryKey] as string[], Entry = item[DipSwitch.EntryKey] as string[],
Default = item.ReadString(Models.Internal.DipSwitch.DefaultKey), Default = item.ReadString(DipSwitch.DefaultKey),
}; };
return dipswitch; return dipswitch;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Disk"/> to <cref="Models.ClrMamePro.Disk"/> /// Convert from <cref="Disk"/> to <cref="Models.ClrMamePro.Disk"/>
/// </summary> /// </summary>
private static Models.ClrMamePro.Disk? ConvertToClrMamePro(Models.Internal.Disk? item) private static Models.ClrMamePro.Disk? ConvertToClrMamePro(Disk? item)
{ {
if (item == null) if (item == null)
return null; return null;
var disk = new Models.ClrMamePro.Disk var disk = new Models.ClrMamePro.Disk
{ {
Name = item.ReadString(Models.Internal.Disk.NameKey), Name = item.ReadString(Disk.NameKey),
MD5 = item.ReadString(Models.Internal.Disk.MD5Key), MD5 = item.ReadString(Disk.MD5Key),
SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key), SHA1 = item.ReadString(Disk.SHA1Key),
Merge = item.ReadString(Models.Internal.Disk.MergeKey), Merge = item.ReadString(Disk.MergeKey),
Status = item.ReadString(Models.Internal.Disk.StatusKey), Status = item.ReadString(Disk.StatusKey),
Flags = item.ReadString(Models.Internal.Disk.FlagsKey), Flags = item.ReadString(Disk.FlagsKey),
}; };
return disk; return disk;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Driver"/> to <cref="Models.ClrMamePro.Driver"/> /// Convert from <cref="Driver"/> to <cref="Models.ClrMamePro.Driver"/>
/// </summary> /// </summary>
private static Models.ClrMamePro.Driver? ConvertToClrMamePro(Models.Internal.Driver? item) private static Models.ClrMamePro.Driver? ConvertToClrMamePro(Driver? item)
{ {
if (item == null) if (item == null)
return null; return null;
var driver = new Models.ClrMamePro.Driver var driver = new Models.ClrMamePro.Driver
{ {
Status = item.ReadString(Models.Internal.Driver.StatusKey), Status = item.ReadString(Driver.StatusKey),
Color = item.ReadString(Models.Internal.Driver.ColorKey), Color = item.ReadString(Driver.ColorKey),
Sound = item.ReadString(Models.Internal.Driver.SoundKey), Sound = item.ReadString(Driver.SoundKey),
PaletteSize = item.ReadString(Models.Internal.Driver.PaletteSizeKey), PaletteSize = item.ReadString(Driver.PaletteSizeKey),
Blit = item.ReadString(Models.Internal.Driver.BlitKey), Blit = item.ReadString(Driver.BlitKey),
}; };
return driver; return driver;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Input"/> to <cref="Models.ClrMamePro.Input"/> /// Convert from <cref="Input"/> to <cref="Models.ClrMamePro.Input"/>
/// </summary> /// </summary>
private static Models.ClrMamePro.Input? ConvertToClrMamePro(Models.Internal.Input? item) private static Models.ClrMamePro.Input? ConvertToClrMamePro(Input? item)
{ {
if (item == null) if (item == null)
return null; return null;
var input = new Models.ClrMamePro.Input var input = new Models.ClrMamePro.Input
{ {
Players = item.ReadString(Models.Internal.Input.PlayersKey), Players = item.ReadString(Input.PlayersKey),
Control = item.ReadString(Models.Internal.Input.ControlKey), Control = item.ReadString(Input.ControlKey),
Buttons = item.ReadString(Models.Internal.Input.ButtonsKey), Buttons = item.ReadString(Input.ButtonsKey),
Coins = item.ReadString(Models.Internal.Input.CoinsKey), Coins = item.ReadString(Input.CoinsKey),
Tilt = item.ReadString(Models.Internal.Input.TiltKey), Tilt = item.ReadString(Input.TiltKey),
Service = item.ReadString(Models.Internal.Input.ServiceKey), Service = item.ReadString(Input.ServiceKey),
}; };
return input; return input;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Media"/> to <cref="Models.ClrMamePro.Media"/> /// Convert from <cref="Media"/> to <cref="Models.ClrMamePro.Media"/>
/// </summary> /// </summary>
private static Models.ClrMamePro.Media? ConvertToClrMamePro(Models.Internal.Media? item) private static Models.ClrMamePro.Media? ConvertToClrMamePro(Media? item)
{ {
if (item == null) if (item == null)
return null; return null;
var media = new Models.ClrMamePro.Media var media = new Models.ClrMamePro.Media
{ {
Name = item.ReadString(Models.Internal.Media.NameKey), Name = item.ReadString(Media.NameKey),
MD5 = item.ReadString(Models.Internal.Media.MD5Key), MD5 = item.ReadString(Media.MD5Key),
SHA1 = item.ReadString(Models.Internal.Media.SHA1Key), SHA1 = item.ReadString(Media.SHA1Key),
SHA256 = item.ReadString(Models.Internal.Media.SHA256Key), SHA256 = item.ReadString(Media.SHA256Key),
SpamSum = item.ReadString(Models.Internal.Media.SpamSumKey), SpamSum = item.ReadString(Media.SpamSumKey),
}; };
return media; return media;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Release"/> to <cref="Models.ClrMamePro.Release"/> /// Convert from <cref="Release"/> to <cref="Models.ClrMamePro.Release"/>
/// </summary> /// </summary>
private static Models.ClrMamePro.Release? ConvertToClrMamePro(Models.Internal.Release? item) private static Models.ClrMamePro.Release? ConvertToClrMamePro(Release? item)
{ {
if (item == null) if (item == null)
return null; return null;
var release = new Models.ClrMamePro.Release var release = new Models.ClrMamePro.Release
{ {
Name = item.ReadString(Models.Internal.Release.NameKey), Name = item.ReadString(Release.NameKey),
Region = item.ReadString(Models.Internal.Release.RegionKey), Region = item.ReadString(Release.RegionKey),
Language = item.ReadString(Models.Internal.Release.LanguageKey), Language = item.ReadString(Release.LanguageKey),
Date = item.ReadString(Models.Internal.Release.DateKey), Date = item.ReadString(Release.DateKey),
Default = item.ReadString(Models.Internal.Release.DefaultKey), Default = item.ReadString(Release.DefaultKey),
}; };
return release; return release;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.ClrMamePro.Rom"/> /// Convert from <cref="Rom"/> to <cref="Models.ClrMamePro.Rom"/>
/// </summary> /// </summary>
private static Models.ClrMamePro.Rom? ConvertToClrMamePro(Models.Internal.Rom? item) private static Models.ClrMamePro.Rom? ConvertToClrMamePro(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var rom = new Models.ClrMamePro.Rom var rom = new Models.ClrMamePro.Rom
{ {
Name = item.ReadString(Models.Internal.Rom.NameKey), Name = item.ReadString(Rom.NameKey),
Size = item.ReadString(Models.Internal.Rom.SizeKey), Size = item.ReadString(Rom.SizeKey),
CRC = item.ReadString(Models.Internal.Rom.CRCKey), CRC = item.ReadString(Rom.CRCKey),
MD5 = item.ReadString(Models.Internal.Rom.MD5Key), MD5 = item.ReadString(Rom.MD5Key),
SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key), SHA1 = item.ReadString(Rom.SHA1Key),
SHA256 = item.ReadString(Models.Internal.Rom.SHA256Key), SHA256 = item.ReadString(Rom.SHA256Key),
SHA384 = item.ReadString(Models.Internal.Rom.SHA384Key), SHA384 = item.ReadString(Rom.SHA384Key),
SHA512 = item.ReadString(Models.Internal.Rom.SHA512Key), SHA512 = item.ReadString(Rom.SHA512Key),
SpamSum = item.ReadString(Models.Internal.Rom.SpamSumKey), SpamSum = item.ReadString(Rom.SpamSumKey),
xxHash364 = item.ReadString(Models.Internal.Rom.xxHash364Key), xxHash364 = item.ReadString(Rom.xxHash364Key),
xxHash3128 = item.ReadString(Models.Internal.Rom.xxHash3128Key), xxHash3128 = item.ReadString(Rom.xxHash3128Key),
Merge = item.ReadString(Models.Internal.Rom.MergeKey), Merge = item.ReadString(Rom.MergeKey),
Status = item.ReadString(Models.Internal.Rom.StatusKey), Status = item.ReadString(Rom.StatusKey),
Region = item.ReadString(Models.Internal.Rom.RegionKey), Region = item.ReadString(Rom.RegionKey),
Flags = item.ReadString(Models.Internal.Rom.FlagsKey), Flags = item.ReadString(Rom.FlagsKey),
Offs = item.ReadString(Models.Internal.Rom.OffsetKey), Offs = item.ReadString(Rom.OffsetKey),
Serial = item.ReadString(Models.Internal.Rom.SerialKey), Serial = item.ReadString(Rom.SerialKey),
Header = item.ReadString(Models.Internal.Rom.HeaderKey), Header = item.ReadString(Rom.HeaderKey),
Date = item.ReadString(Models.Internal.Rom.DateKey), Date = item.ReadString(Rom.DateKey),
Inverted = item.ReadString(Models.Internal.Rom.InvertedKey), Inverted = item.ReadString(Rom.InvertedKey),
MIA = item.ReadString(Models.Internal.Rom.MIAKey), MIA = item.ReadString(Rom.MIAKey),
}; };
return rom; return rom;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Sample"/> to <cref="Models.ClrMamePro.Sample"/> /// Convert from <cref="Sample"/> to <cref="Models.ClrMamePro.Sample"/>
/// </summary> /// </summary>
private static Models.ClrMamePro.Sample? ConvertToClrMamePro(Models.Internal.Sample? item) private static Models.ClrMamePro.Sample? ConvertToClrMamePro(Sample? item)
{ {
if (item == null) if (item == null)
return null; return null;
var sample = new Models.ClrMamePro.Sample var sample = new Models.ClrMamePro.Sample
{ {
Name = item.ReadString(Models.Internal.Sample.NameKey), Name = item.ReadString(Sample.NameKey),
}; };
return sample; return sample;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Sound"/> to <cref="Models.ClrMamePro.Sound"/> /// Convert from <cref="Sound"/> to <cref="Models.ClrMamePro.Sound"/>
/// </summary> /// </summary>
private static Models.ClrMamePro.Sound? ConvertToClrMamePro(Models.Internal.Sound? item) private static Models.ClrMamePro.Sound? ConvertToClrMamePro(Sound? item)
{ {
if (item == null) if (item == null)
return null; return null;
var sound = new Models.ClrMamePro.Sound var sound = new Models.ClrMamePro.Sound
{ {
Channels = item.ReadString(Models.Internal.Sound.ChannelsKey), Channels = item.ReadString(Sound.ChannelsKey),
}; };
return sound; return sound;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Video"/> to <cref="Models.ClrMamePro.Video"/> /// Convert from <cref="Video"/> to <cref="Models.ClrMamePro.Video"/>
/// </summary> /// </summary>
private static Models.ClrMamePro.Video? ConvertToClrMamePro(Models.Internal.Video? item) private static Models.ClrMamePro.Video? ConvertToClrMamePro(Video? item)
{ {
if (item == null) if (item == null)
return null; return null;
var video = new Models.ClrMamePro.Video var video = new Models.ClrMamePro.Video
{ {
Screen = item.ReadString(Models.Internal.Video.ScreenKey), Screen = item.ReadString(Video.ScreenKey),
Orientation = item.ReadString(Models.Internal.Video.OrientationKey), Orientation = item.ReadString(Video.OrientationKey),
X = item.ReadString(Models.Internal.Video.WidthKey), X = item.ReadString(Video.WidthKey),
Y = item.ReadString(Models.Internal.Video.HeightKey), Y = item.ReadString(Video.HeightKey),
AspectX = item.ReadString(Models.Internal.Video.AspectXKey), AspectX = item.ReadString(Video.AspectXKey),
AspectY = item.ReadString(Models.Internal.Video.AspectYKey), AspectY = item.ReadString(Video.AspectYKey),
Freq = item.ReadString(Models.Internal.Video.RefreshKey), Freq = item.ReadString(Video.RefreshKey),
}; };
return video; return video;
} }

View File

@@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using SabreTools.Models.Internal;
namespace SabreTools.Serialization namespace SabreTools.Serialization
{ {
@@ -11,57 +12,57 @@ namespace SabreTools.Serialization
#region Serialize #region Serialize
/// <summary> /// <summary>
/// Convert from <cref="Models.DosCenter.DosCenter"/> to <cref="Models.Internal.Header"/> /// Convert from <cref="Models.DosCenter.DosCenter"/> to <cref="Header"/>
/// </summary> /// </summary>
public static Models.Internal.Header ConvertHeaderFromDosCenter(Models.DosCenter.DosCenter item) public static Header ConvertHeaderFromDosCenter(Models.DosCenter.DosCenter item)
{ {
var header = new Models.Internal.Header var header = new Header
{ {
[Models.Internal.Header.NameKey] = item.Name, [Header.NameKey] = item.Name,
[Models.Internal.Header.DescriptionKey] = item.Description, [Header.DescriptionKey] = item.Description,
[Models.Internal.Header.VersionKey] = item.Version, [Header.VersionKey] = item.Version,
[Models.Internal.Header.DateKey] = item.Date, [Header.DateKey] = item.Date,
[Models.Internal.Header.AuthorKey] = item.Author, [Header.AuthorKey] = item.Author,
[Models.Internal.Header.HomepageKey] = item.Homepage, [Header.HomepageKey] = item.Homepage,
[Models.Internal.Header.CommentKey] = item.Comment, [Header.CommentKey] = item.Comment,
}; };
return header; return header;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.DosCenter.Game"/> to <cref="Models.Internal.Machine"/> /// Convert from <cref="Models.DosCenter.Game"/> to <cref="Machine"/>
/// </summary> /// </summary>
public static Models.Internal.Machine ConvertMachineFromDosCenter(Models.DosCenter.Game item) public static Machine ConvertMachineFromDosCenter(Models.DosCenter.Game item)
{ {
var machine = new Models.Internal.Machine var machine = new Machine
{ {
[Models.Internal.Machine.NameKey] = item.Name, [Machine.NameKey] = item.Name,
}; };
if (item.File != null && item.File.Any()) if (item.File != null && item.File.Any())
{ {
var roms = new List<Models.Internal.Rom>(); var roms = new List<Rom>();
foreach (var file in item.File) foreach (var file in item.File)
{ {
roms.Add(ConvertFromDosCenter(file)); roms.Add(ConvertFromDosCenter(file));
} }
machine[Models.Internal.Machine.RomKey] = roms.ToArray(); machine[Machine.RomKey] = roms.ToArray();
} }
return machine; return machine;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.DosCenter.File"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.DosCenter.File"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromDosCenter(Models.DosCenter.File item) public static Rom ConvertFromDosCenter(Models.DosCenter.File item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.NameKey] = item.Name, [Rom.NameKey] = item.Name,
[Models.Internal.Rom.SizeKey] = item.Size, [Rom.SizeKey] = item.Size,
[Models.Internal.Rom.CRCKey] = item.CRC, [Rom.CRCKey] = item.CRC,
[Models.Internal.Rom.DateKey] = item.Date, [Rom.DateKey] = item.Date,
}; };
return rom; return rom;
} }
@@ -71,59 +72,59 @@ namespace SabreTools.Serialization
#region Deserialize #region Deserialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Header"/> to <cref="Models.DosCenter.DosCenter"/> /// Convert from <cref="Header"/> to <cref="Models.DosCenter.DosCenter"/>
/// </summary> /// </summary>
public static Models.DosCenter.DosCenter? ConvertHeaderToDosCenter(Models.Internal.Header? item) public static Models.DosCenter.DosCenter? ConvertHeaderToDosCenter(Header? item)
{ {
if (item == null) if (item == null)
return null; return null;
var dosCenter = new Models.DosCenter.DosCenter var dosCenter = new Models.DosCenter.DosCenter
{ {
Name = item.ReadString(Models.Internal.Header.NameKey), Name = item.ReadString(Header.NameKey),
Description = item.ReadString(Models.Internal.Header.DescriptionKey), Description = item.ReadString(Header.DescriptionKey),
Version = item.ReadString(Models.Internal.Header.VersionKey), Version = item.ReadString(Header.VersionKey),
Date = item.ReadString(Models.Internal.Header.DateKey), Date = item.ReadString(Header.DateKey),
Author = item.ReadString(Models.Internal.Header.AuthorKey), Author = item.ReadString(Header.AuthorKey),
Homepage = item.ReadString(Models.Internal.Header.HomepageKey), Homepage = item.ReadString(Header.HomepageKey),
Comment = item.ReadString(Models.Internal.Header.CommentKey), Comment = item.ReadString(Header.CommentKey),
}; };
return dosCenter; return dosCenter;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Machine"/> to <cref="Models.DosCenter.Game"/> /// Convert from <cref="Machine"/> to <cref="Models.DosCenter.Game"/>
/// </summary> /// </summary>
public static Models.DosCenter.Game? ConvertMachineToDosCenter(Models.Internal.Machine? item) public static Models.DosCenter.Game? ConvertMachineToDosCenter(Machine? item)
{ {
if (item == null) if (item == null)
return null; return null;
var game = new Models.DosCenter.Game var game = new Models.DosCenter.Game
{ {
Name = item.ReadString(Models.Internal.Machine.NameKey), Name = item.ReadString(Machine.NameKey),
}; };
var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey); var roms = item.Read<Rom[]>(Machine.RomKey);
game.File = roms?.Select(ConvertToDosCenter)?.ToArray(); game.File = roms?.Select(ConvertToDosCenter)?.ToArray();
return game; return game;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.DosCenter.File"/> /// Convert from <cref="Rom"/> to <cref="Models.DosCenter.File"/>
/// </summary> /// </summary>
private static Models.DosCenter.File? ConvertToDosCenter(Models.Internal.Rom? item) private static Models.DosCenter.File? ConvertToDosCenter(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var file = new Models.DosCenter.File var file = new Models.DosCenter.File
{ {
Name = item.ReadString(Models.Internal.Rom.NameKey), Name = item.ReadString(Rom.NameKey),
Size = item.ReadString(Models.Internal.Rom.SizeKey), Size = item.ReadString(Rom.SizeKey),
CRC = item.ReadString(Models.Internal.Rom.CRCKey), CRC = item.ReadString(Rom.CRCKey),
Date = item.ReadString(Models.Internal.Rom.DateKey), Date = item.ReadString(Rom.DateKey),
}; };
return file; return file;
} }

View File

@@ -1,4 +1,5 @@
using System.Linq; using System.Linq;
using SabreTools.Models.Internal;
namespace SabreTools.Serialization namespace SabreTools.Serialization
{ {
@@ -10,42 +11,42 @@ namespace SabreTools.Serialization
#region Serialize #region Serialize
/// <summary> /// <summary>
/// Convert from <cref="Models.EverdriveSMDB.MetadataFile"/> to <cref="Models.Internal.Header"/> /// Convert from <cref="Models.EverdriveSMDB.MetadataFile"/> to <cref="Header"/>
/// </summary> /// </summary>
public static Models.Internal.Header ConvertHeaderFromEverdriveSMDB(Models.EverdriveSMDB.MetadataFile item) public static Header ConvertHeaderFromEverdriveSMDB(Models.EverdriveSMDB.MetadataFile item)
{ {
var header = new Models.Internal.Header var header = new Header
{ {
[Models.Internal.Header.NameKey] = "Everdrive SMDB", [Header.NameKey] = "Everdrive SMDB",
}; };
return header; return header;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.EverdriveSMDB.Row"/> to <cref="Models.Internal.Machine"/> /// Convert from <cref="Models.EverdriveSMDB.Row"/> to <cref="Machine"/>
/// </summary> /// </summary>
public static Models.Internal.Machine ConvertMachineFromEverdriveSMDB(Models.EverdriveSMDB.Row item) public static Machine ConvertMachineFromEverdriveSMDB(Models.EverdriveSMDB.Row item)
{ {
var machine = new Models.Internal.Machine var machine = new Machine
{ {
[Models.Internal.Machine.RomKey] = ConvertFromEverdriveSMDB(item), [Machine.RomKey] = ConvertFromEverdriveSMDB(item),
}; };
return machine; return machine;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.EverdriveSMDB.Row"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.EverdriveSMDB.Row"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromEverdriveSMDB(Models.EverdriveSMDB.Row item) public static Rom ConvertFromEverdriveSMDB(Models.EverdriveSMDB.Row item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.SHA256Key] = item.SHA256, [Rom.SHA256Key] = item.SHA256,
[Models.Internal.Rom.NameKey] = item.Name, [Rom.NameKey] = item.Name,
[Models.Internal.Rom.SHA1Key] = item.SHA1, [Rom.SHA1Key] = item.SHA1,
[Models.Internal.Rom.MD5Key] = item.MD5, [Rom.MD5Key] = item.MD5,
[Models.Internal.Rom.CRCKey] = item.CRC32, [Rom.CRCKey] = item.CRC32,
[Models.Internal.Rom.SizeKey] = item.Size, [Rom.SizeKey] = item.Size,
}; };
return rom; return rom;
} }
@@ -55,33 +56,33 @@ namespace SabreTools.Serialization
#region Deserialize #region Deserialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Machine"/> to an array of <cref="Models.EverdriveSMDB.Row"/> /// Convert from <cref="Machine"/> to an array of <cref="Models.EverdriveSMDB.Row"/>
/// </summary> /// </summary>
public static Models.EverdriveSMDB.Row[]? ConvertMachineToEverdriveSMDB(Models.Internal.Machine item) public static Models.EverdriveSMDB.Row[]? ConvertMachineToEverdriveSMDB(Machine item)
{ {
if (item == null) if (item == null)
return null; return null;
var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey); var roms = item.Read<Rom[]>(Machine.RomKey);
return roms?.Select(ConvertToEverdriveSMDB)?.ToArray(); return roms?.Select(ConvertToEverdriveSMDB)?.ToArray();
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.EverdriveSMDB.Row"/> /// Convert from <cref="Rom"/> to <cref="Models.EverdriveSMDB.Row"/>
/// </summary> /// </summary>
private static Models.EverdriveSMDB.Row? ConvertToEverdriveSMDB(Models.Internal.Rom? item) private static Models.EverdriveSMDB.Row? ConvertToEverdriveSMDB(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var row = new Models.EverdriveSMDB.Row var row = new Models.EverdriveSMDB.Row
{ {
SHA256 = item.ReadString(Models.Internal.Rom.SHA256Key), SHA256 = item.ReadString(Rom.SHA256Key),
Name = item.ReadString(Models.Internal.Rom.NameKey), Name = item.ReadString(Rom.NameKey),
SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key), SHA1 = item.ReadString(Rom.SHA1Key),
MD5 = item.ReadString(Models.Internal.Rom.MD5Key), MD5 = item.ReadString(Rom.MD5Key),
CRC32 = item.ReadString(Models.Internal.Rom.CRCKey), CRC32 = item.ReadString(Rom.CRCKey),
Size = item.ReadString(Models.Internal.Rom.SizeKey), Size = item.ReadString(Rom.SizeKey),
}; };
return row; return row;
} }

View File

@@ -1,6 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using SabreTools.Core; using SabreTools.Core;
using SabreTools.Models.Internal;
namespace SabreTools.Serialization namespace SabreTools.Serialization
{ {
@@ -12,184 +13,184 @@ namespace SabreTools.Serialization
#region Serialize #region Serialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Hashfile.Hashfile"/> to <cref="Models.Internal.Header"/> /// Convert from <cref="Models.Hashfile.Hashfile"/> to <cref="Header"/>
/// </summary> /// </summary>
public static Models.Internal.Header ConvertHeaderFromHashfile(Models.Hashfile.Hashfile item) public static Header ConvertHeaderFromHashfile(Models.Hashfile.Hashfile item)
{ {
var header = new Models.Internal.Header var header = new Header
{ {
[Models.Internal.Header.NameKey] = "Hashfile", [Header.NameKey] = "Hashfile",
}; };
return header; return header;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Hashfile.Hashfile"/> to <cref="Models.Internal.Machine"/> /// Convert from <cref="Models.Hashfile.Hashfile"/> to <cref="Machine"/>
/// </summary> /// </summary>
public static Models.Internal.Machine ConvertMachineFromHashfile(Models.Hashfile.Hashfile item) public static Machine ConvertMachineFromHashfile(Models.Hashfile.Hashfile item)
{ {
var machine = new Models.Internal.Machine(); var machine = new Machine();
if (item.SFV != null && item.SFV.Any()) if (item.SFV != null && item.SFV.Any())
{ {
var roms = new List<Models.Internal.Rom>(); var roms = new List<Rom>();
foreach (var sfv in item.SFV) foreach (var sfv in item.SFV)
{ {
roms.Add(ConvertFromSFV(sfv)); roms.Add(ConvertFromSFV(sfv));
} }
machine[Models.Internal.Machine.RomKey] = roms.ToArray(); machine[Machine.RomKey] = roms.ToArray();
} }
else if (item.MD5 != null && item.MD5.Any()) else if (item.MD5 != null && item.MD5.Any())
{ {
var roms = new List<Models.Internal.Rom>(); var roms = new List<Rom>();
foreach (var md5 in item.MD5) foreach (var md5 in item.MD5)
{ {
roms.Add(ConvertFromMD5(md5)); roms.Add(ConvertFromMD5(md5));
} }
machine[Models.Internal.Machine.RomKey] = roms.ToArray(); machine[Machine.RomKey] = roms.ToArray();
} }
else if (item.SHA1 != null && item.SHA1.Any()) else if (item.SHA1 != null && item.SHA1.Any())
{ {
var roms = new List<Models.Internal.Rom>(); var roms = new List<Rom>();
foreach (var sha1 in item.SHA1) foreach (var sha1 in item.SHA1)
{ {
roms.Add(ConvertFromSHA1(sha1)); roms.Add(ConvertFromSHA1(sha1));
} }
machine[Models.Internal.Machine.RomKey] = roms.ToArray(); machine[Machine.RomKey] = roms.ToArray();
} }
else if (item.SHA256 != null && item.SHA256.Any()) else if (item.SHA256 != null && item.SHA256.Any())
{ {
var roms = new List<Models.Internal.Rom>(); var roms = new List<Rom>();
foreach (var sha256 in item.SHA256) foreach (var sha256 in item.SHA256)
{ {
roms.Add(ConvertFromSHA256(sha256)); roms.Add(ConvertFromSHA256(sha256));
} }
machine[Models.Internal.Machine.RomKey] = roms.ToArray(); machine[Machine.RomKey] = roms.ToArray();
} }
else if (item.SHA384 != null && item.SHA384.Any()) else if (item.SHA384 != null && item.SHA384.Any())
{ {
var roms = new List<Models.Internal.Rom>(); var roms = new List<Rom>();
foreach (var sha384 in item.SHA384) foreach (var sha384 in item.SHA384)
{ {
roms.Add(ConvertFromSHA384(sha384)); roms.Add(ConvertFromSHA384(sha384));
} }
machine[Models.Internal.Machine.RomKey] = roms.ToArray(); machine[Machine.RomKey] = roms.ToArray();
} }
else if (item.SHA512 != null && item.SHA512.Any()) else if (item.SHA512 != null && item.SHA512.Any())
{ {
var roms = new List<Models.Internal.Rom>(); var roms = new List<Rom>();
foreach (var sha512 in item.SHA512) foreach (var sha512 in item.SHA512)
{ {
roms.Add(ConvertFromSHA512(sha512)); roms.Add(ConvertFromSHA512(sha512));
} }
machine[Models.Internal.Machine.RomKey] = roms.ToArray(); machine[Machine.RomKey] = roms.ToArray();
} }
else if (item.SpamSum != null && item.SpamSum.Any()) else if (item.SpamSum != null && item.SpamSum.Any())
{ {
var roms = new List<Models.Internal.Rom>(); var roms = new List<Rom>();
foreach (var spamSum in item.SpamSum) foreach (var spamSum in item.SpamSum)
{ {
roms.Add(ConvertFromSpamSum(spamSum)); roms.Add(ConvertFromSpamSum(spamSum));
} }
machine[Models.Internal.Machine.RomKey] = roms.ToArray(); machine[Machine.RomKey] = roms.ToArray();
} }
return machine; return machine;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Hashfile.MD5"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.Hashfile.MD5"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromMD5(Models.Hashfile.MD5 item) public static Rom ConvertFromMD5(Models.Hashfile.MD5 item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.MD5Key] = item.Hash, [Rom.MD5Key] = item.Hash,
[Models.Internal.Rom.NameKey] = item.File, [Rom.NameKey] = item.File,
}; };
return rom; return rom;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Hashfile.SFV"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.Hashfile.SFV"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromSFV(Models.Hashfile.SFV item) public static Rom ConvertFromSFV(Models.Hashfile.SFV item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.NameKey] = item.File, [Rom.NameKey] = item.File,
[Models.Internal.Rom.CRCKey] = item.Hash, [Rom.CRCKey] = item.Hash,
}; };
return rom; return rom;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Hashfile.SHA1"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.Hashfile.SHA1"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromSHA1(Models.Hashfile.SHA1 item) public static Rom ConvertFromSHA1(Models.Hashfile.SHA1 item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.SHA1Key] = item.Hash, [Rom.SHA1Key] = item.Hash,
[Models.Internal.Rom.NameKey] = item.File, [Rom.NameKey] = item.File,
}; };
return rom; return rom;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Hashfile.SHA256"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.Hashfile.SHA256"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromSHA256(Models.Hashfile.SHA256 item) public static Rom ConvertFromSHA256(Models.Hashfile.SHA256 item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.SHA256Key] = item.Hash, [Rom.SHA256Key] = item.Hash,
[Models.Internal.Rom.NameKey] = item.File, [Rom.NameKey] = item.File,
}; };
return rom; return rom;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Hashfile.SHA384"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.Hashfile.SHA384"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromSHA384(Models.Hashfile.SHA384 item) public static Rom ConvertFromSHA384(Models.Hashfile.SHA384 item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.SHA384Key] = item.Hash, [Rom.SHA384Key] = item.Hash,
[Models.Internal.Rom.NameKey] = item.File, [Rom.NameKey] = item.File,
}; };
return rom; return rom;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Hashfile.SHA512"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.Hashfile.SHA512"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromSHA512(Models.Hashfile.SHA512 item) public static Rom ConvertFromSHA512(Models.Hashfile.SHA512 item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.SHA512Key] = item.Hash, [Rom.SHA512Key] = item.Hash,
[Models.Internal.Rom.NameKey] = item.File, [Rom.NameKey] = item.File,
}; };
return rom; return rom;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Hashfile.SpamSum"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.Hashfile.SpamSum"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromSpamSum(Models.Hashfile.SpamSum item) public static Rom ConvertFromSpamSum(Models.Hashfile.SpamSum item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.SpamSumKey] = item.Hash, [Rom.SpamSumKey] = item.Hash,
[Models.Internal.Rom.NameKey] = item.File, [Rom.NameKey] = item.File,
}; };
return rom; return rom;
} }
@@ -199,14 +200,14 @@ namespace SabreTools.Serialization
#region Deserialize #region Deserialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Machine"/> to <cref="Models.Hashfile.Hashfile"/> /// Convert from <cref="Machine"/> to <cref="Models.Hashfile.Hashfile"/>
/// </summary> /// </summary>
public static Models.Hashfile.Hashfile? ConvertMachineToHashfile(Models.Internal.Machine? item, Hash hash) public static Models.Hashfile.Hashfile? ConvertMachineToHashfile(Machine? item, Hash hash)
{ {
if (item == null) if (item == null)
return null; return null;
var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey); var roms = item.Read<Rom[]>(Machine.RomKey);
return new Models.Hashfile.Hashfile return new Models.Hashfile.Hashfile
{ {
SFV = hash == Hash.CRC ? roms?.Select(ConvertToSFV)?.ToArray() : null, SFV = hash == Hash.CRC ? roms?.Select(ConvertToSFV)?.ToArray() : null,
@@ -220,113 +221,113 @@ namespace SabreTools.Serialization
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Hashfile.MD5"/> /// Convert from <cref="Rom"/> to <cref="Models.Hashfile.MD5"/>
/// </summary> /// </summary>
private static Models.Hashfile.MD5? ConvertToMD5(Models.Internal.Rom? item) private static Models.Hashfile.MD5? ConvertToMD5(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var md5 = new Models.Hashfile.MD5 var md5 = new Models.Hashfile.MD5
{ {
Hash = item.ReadString(Models.Internal.Rom.MD5Key), Hash = item.ReadString(Rom.MD5Key),
File = item.ReadString(Models.Internal.Rom.NameKey), File = item.ReadString(Rom.NameKey),
}; };
return md5; return md5;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Hashfile.SFV"/> /// Convert from <cref="Rom"/> to <cref="Models.Hashfile.SFV"/>
/// </summary> /// </summary>
private static Models.Hashfile.SFV? ConvertToSFV(Models.Internal.Rom? item) private static Models.Hashfile.SFV? ConvertToSFV(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var sfv = new Models.Hashfile.SFV var sfv = new Models.Hashfile.SFV
{ {
File = item.ReadString(Models.Internal.Rom.NameKey), File = item.ReadString(Rom.NameKey),
Hash = item.ReadString(Models.Internal.Rom.CRCKey), Hash = item.ReadString(Rom.CRCKey),
}; };
return sfv; return sfv;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Hashfile.SHA1"/> /// Convert from <cref="Rom"/> to <cref="Models.Hashfile.SHA1"/>
/// </summary> /// </summary>
private static Models.Hashfile.SHA1? ConvertToSHA1(Models.Internal.Rom? item) private static Models.Hashfile.SHA1? ConvertToSHA1(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var sha1 = new Models.Hashfile.SHA1 var sha1 = new Models.Hashfile.SHA1
{ {
Hash = item.ReadString(Models.Internal.Rom.SHA1Key), Hash = item.ReadString(Rom.SHA1Key),
File = item.ReadString(Models.Internal.Rom.NameKey), File = item.ReadString(Rom.NameKey),
}; };
return sha1; return sha1;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Hashfile.SHA256"/> /// Convert from <cref="Rom"/> to <cref="Models.Hashfile.SHA256"/>
/// </summary> /// </summary>
private static Models.Hashfile.SHA256? ConvertToSHA256(Models.Internal.Rom? item) private static Models.Hashfile.SHA256? ConvertToSHA256(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var sha256 = new Models.Hashfile.SHA256 var sha256 = new Models.Hashfile.SHA256
{ {
Hash = item.ReadString(Models.Internal.Rom.SHA256Key), Hash = item.ReadString(Rom.SHA256Key),
File = item.ReadString(Models.Internal.Rom.NameKey), File = item.ReadString(Rom.NameKey),
}; };
return sha256; return sha256;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Hashfile.SHA384"/> /// Convert from <cref="Rom"/> to <cref="Models.Hashfile.SHA384"/>
/// </summary> /// </summary>
private static Models.Hashfile.SHA384? ConvertToSHA384(Models.Internal.Rom? item) private static Models.Hashfile.SHA384? ConvertToSHA384(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var sha384 = new Models.Hashfile.SHA384 var sha384 = new Models.Hashfile.SHA384
{ {
Hash = item.ReadString(Models.Internal.Rom.SHA384Key), Hash = item.ReadString(Rom.SHA384Key),
File = item.ReadString(Models.Internal.Rom.NameKey), File = item.ReadString(Rom.NameKey),
}; };
return sha384; return sha384;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Hashfile.SHA512"/> /// Convert from <cref="Rom"/> to <cref="Models.Hashfile.SHA512"/>
/// </summary> /// </summary>
private static Models.Hashfile.SHA512? ConvertToSHA512(Models.Internal.Rom? item) private static Models.Hashfile.SHA512? ConvertToSHA512(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var sha512 = new Models.Hashfile.SHA512 var sha512 = new Models.Hashfile.SHA512
{ {
Hash = item.ReadString(Models.Internal.Rom.SHA512Key), Hash = item.ReadString(Rom.SHA512Key),
File = item.ReadString(Models.Internal.Rom.NameKey), File = item.ReadString(Rom.NameKey),
}; };
return sha512; return sha512;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Hashfile.SpamSum"/> /// Convert from <cref="Rom"/> to <cref="Models.Hashfile.SpamSum"/>
/// </summary> /// </summary>
private static Models.Hashfile.SpamSum? ConvertToSpamSum(Models.Internal.Rom? item) private static Models.Hashfile.SpamSum? ConvertToSpamSum(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var spamsum = new Models.Hashfile.SpamSum var spamsum = new Models.Hashfile.SpamSum
{ {
Hash = item.ReadString(Models.Internal.Rom.SpamSumKey), Hash = item.ReadString(Rom.SpamSumKey),
File = item.ReadString(Models.Internal.Rom.NameKey), File = item.ReadString(Rom.NameKey),
}; };
return spamsum; return spamsum;
} }

View File

@@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using SabreTools.Models.Internal;
namespace SabreTools.Serialization namespace SabreTools.Serialization
{ {
@@ -11,83 +12,83 @@ namespace SabreTools.Serialization
#region Serialize #region Serialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Listrom.MetadataFile"/> to <cref="Models.Internal.Header"/> /// Convert from <cref="Models.Listrom.MetadataFile"/> to <cref="Header"/>
/// </summary> /// </summary>
public static Models.Internal.Header ConvertHeaderFromListrom(Models.Listrom.MetadataFile item) public static Header ConvertHeaderFromListrom(Models.Listrom.MetadataFile item)
{ {
var header = new Models.Internal.Header var header = new Header
{ {
[Models.Internal.Header.NameKey] = "MAME Listrom", [Header.NameKey] = "MAME Listrom",
}; };
return header; return header;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Listrom.Set"/> to <cref="Models.Internal.Machine"/> /// Convert from <cref="Models.Listrom.Set"/> to <cref="Machine"/>
/// </summary> /// </summary>
public static Models.Internal.Machine ConvertMachineFromListrom(Models.Listrom.Set item) public static Machine ConvertMachineFromListrom(Models.Listrom.Set item)
{ {
var machine = new Models.Internal.Machine(); var machine = new Machine();
if (!string.IsNullOrWhiteSpace(item.Device)) if (!string.IsNullOrWhiteSpace(item.Device))
{ {
machine[Models.Internal.Machine.NameKey] = item.Device; machine[Machine.NameKey] = item.Device;
machine[Models.Internal.Machine.IsDeviceKey] = "yes"; machine[Machine.IsDeviceKey] = "yes";
} }
else else
{ {
machine[Models.Internal.Machine.NameKey] = item.Driver; machine[Machine.NameKey] = item.Driver;
} }
if (item.Row != null && item.Row.Any()) if (item.Row != null && item.Row.Any())
{ {
var datItems = new List<Models.Internal.DatItem>(); var datItems = new List<DatItem>();
foreach (var file in item.Row) foreach (var file in item.Row)
{ {
datItems.Add(ConvertFromListrom(file)); datItems.Add(ConvertFromListrom(file));
} }
machine[Models.Internal.Machine.DiskKey] = datItems.Where(i => i.ReadString(Models.Internal.DatItem.TypeKey) == "disk")?.ToArray(); machine[Machine.DiskKey] = datItems.Where(i => i.ReadString(DatItem.TypeKey) == "disk")?.ToArray();
machine[Models.Internal.Machine.RomKey] = datItems.Where(i => i.ReadString(Models.Internal.DatItem.TypeKey) == "rom")?.ToArray(); machine[Machine.RomKey] = datItems.Where(i => i.ReadString(DatItem.TypeKey) == "rom")?.ToArray();
} }
return machine; return machine;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Listrom.Row"/> to <cref="Models.Internal.DatItem"/> /// Convert from <cref="Models.Listrom.Row"/> to <cref="DatItem"/>
/// </summary> /// </summary>
public static Models.Internal.DatItem ConvertFromListrom(Models.Listrom.Row item) public static DatItem ConvertFromListrom(Models.Listrom.Row item)
{ {
if (item.Size == null) if (item.Size == null)
{ {
var disk = new Models.Internal.Disk var disk = new Disk
{ {
[Models.Internal.Disk.NameKey] = item.Name, [Disk.NameKey] = item.Name,
[Models.Internal.Disk.MD5Key] = item.MD5, [Disk.MD5Key] = item.MD5,
[Models.Internal.Disk.SHA1Key] = item.SHA1, [Disk.SHA1Key] = item.SHA1,
}; };
if (item.NoGoodDumpKnown) if (item.NoGoodDumpKnown)
disk[Models.Internal.Disk.StatusKey] = "nodump"; disk[Disk.StatusKey] = "nodump";
else if (item.Bad) else if (item.Bad)
disk[Models.Internal.Disk.StatusKey] = "baddump"; disk[Disk.StatusKey] = "baddump";
return disk; return disk;
} }
else else
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.NameKey] = item.Name, [Rom.NameKey] = item.Name,
[Models.Internal.Rom.SizeKey] = item.Size, [Rom.SizeKey] = item.Size,
[Models.Internal.Rom.CRCKey] = item.CRC, [Rom.CRCKey] = item.CRC,
[Models.Internal.Rom.SHA1Key] = item.SHA1, [Rom.SHA1Key] = item.SHA1,
}; };
if (item.NoGoodDumpKnown) if (item.NoGoodDumpKnown)
rom[Models.Internal.Rom.StatusKey] = "nodump"; rom[Rom.StatusKey] = "nodump";
else if (item.Bad) else if (item.Bad)
rom[Models.Internal.Rom.StatusKey] = "baddump"; rom[Rom.StatusKey] = "baddump";
return rom; return rom;
} }
@@ -98,26 +99,26 @@ namespace SabreTools.Serialization
#region Deserialize #region Deserialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Machine"/> to <cref="Models.Listrom.Set"/> /// Convert from <cref="Machine"/> to <cref="Models.Listrom.Set"/>
/// </summary> /// </summary>
public static Models.Listrom.Set? ConvertMachineToListrom(Models.Internal.Machine? item) public static Models.Listrom.Set? ConvertMachineToListrom(Machine? item)
{ {
if (item == null) if (item == null)
return null; return null;
var set = new Models.Listrom.Set(); var set = new Models.Listrom.Set();
if (item.ReadString(Models.Internal.Machine.IsDeviceKey) == "yes") if (item.ReadString(Machine.IsDeviceKey) == "yes")
set.Device = item.ReadString(Models.Internal.Machine.NameKey); set.Device = item.ReadString(Machine.NameKey);
else else
set.Driver = item.ReadString(Models.Internal.Machine.NameKey); set.Driver = item.ReadString(Machine.NameKey);
var rowItems = new List<Models.Listrom.Row>(); var rowItems = new List<Models.Listrom.Row>();
var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey); var roms = item.Read<Rom[]>(Machine.RomKey);
if (roms != null) if (roms != null)
rowItems.AddRange(roms.Select(ConvertToListrom)); rowItems.AddRange(roms.Select(ConvertToListrom));
var disks = item.Read<Models.Internal.Disk[]>(Models.Internal.Machine.DiskKey); var disks = item.Read<Disk[]>(Machine.DiskKey);
if (disks != null) if (disks != null)
rowItems.AddRange(disks.Select(ConvertToListrom)); rowItems.AddRange(disks.Select(ConvertToListrom));
@@ -126,47 +127,47 @@ namespace SabreTools.Serialization
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Disk"/> to <cref="Models.Listrom.Row"/> /// Convert from <cref="Disk"/> to <cref="Models.Listrom.Row"/>
/// </summary> /// </summary>
private static Models.Listrom.Row? ConvertToListrom(Models.Internal.Disk? item) private static Models.Listrom.Row? ConvertToListrom(Disk? item)
{ {
if (item == null) if (item == null)
return null; return null;
var row = new Models.Listrom.Row var row = new Models.Listrom.Row
{ {
Name = item.ReadString(Models.Internal.Disk.NameKey), Name = item.ReadString(Disk.NameKey),
MD5 = item.ReadString(Models.Internal.Disk.MD5Key), MD5 = item.ReadString(Disk.MD5Key),
SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key), SHA1 = item.ReadString(Disk.SHA1Key),
}; };
if (item[Models.Internal.Disk.StatusKey] as string == "nodump") if (item[Disk.StatusKey] as string == "nodump")
row.NoGoodDumpKnown = true; row.NoGoodDumpKnown = true;
else if (item[Models.Internal.Disk.StatusKey] as string == "baddump") else if (item[Disk.StatusKey] as string == "baddump")
row.Bad = true; row.Bad = true;
return row; return row;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Listrom.Row"/> /// Convert from <cref="Rom"/> to <cref="Models.Listrom.Row"/>
/// </summary> /// </summary>
private static Models.Listrom.Row? ConvertToListrom(Models.Internal.Rom? item) private static Models.Listrom.Row? ConvertToListrom(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var row = new Models.Listrom.Row var row = new Models.Listrom.Row
{ {
Name = item.ReadString(Models.Internal.Rom.NameKey), Name = item.ReadString(Rom.NameKey),
Size = item.ReadString(Models.Internal.Rom.SizeKey), Size = item.ReadString(Rom.SizeKey),
CRC = item.ReadString(Models.Internal.Rom.CRCKey), CRC = item.ReadString(Rom.CRCKey),
SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key), SHA1 = item.ReadString(Rom.SHA1Key),
}; };
if (item[Models.Internal.Rom.StatusKey] as string == "nodump") if (item[Rom.StatusKey] as string == "nodump")
row.NoGoodDumpKnown = true; row.NoGoodDumpKnown = true;
else if (item[Models.Internal.Rom.StatusKey] as string == "baddump") else if (item[Rom.StatusKey] as string == "baddump")
row.Bad = true; row.Bad = true;
return row; return row;

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using SabreTools.Models.Internal;
namespace SabreTools.Serialization namespace SabreTools.Serialization
{ {
@@ -11,339 +12,339 @@ namespace SabreTools.Serialization
#region Serialize #region Serialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Logiqx.Header"/> to <cref="Models.Internal.Header"/> /// Convert from <cref="Models.Logiqx.Header"/> to <cref="Header"/>
/// </summary> /// </summary>
public static Models.Internal.Header ConvertHeaderFromLogiqx(Models.Logiqx.Header item) public static Header ConvertHeaderFromLogiqx(Models.Logiqx.Header item)
{ {
var header = new Models.Internal.Header var header = new Header
{ {
[Models.Internal.Header.IdKey] = item.Id, [Header.IdKey] = item.Id,
[Models.Internal.Header.NameKey] = item.Name, [Header.NameKey] = item.Name,
[Models.Internal.Header.DescriptionKey] = item.Description, [Header.DescriptionKey] = item.Description,
[Models.Internal.Header.RootDirKey] = item.RootDir, [Header.RootDirKey] = item.RootDir,
[Models.Internal.Header.CategoryKey] = item.Category, [Header.CategoryKey] = item.Category,
[Models.Internal.Header.VersionKey] = item.Version, [Header.VersionKey] = item.Version,
[Models.Internal.Header.DateKey] = item.Date, [Header.DateKey] = item.Date,
[Models.Internal.Header.AuthorKey] = item.Author, [Header.AuthorKey] = item.Author,
[Models.Internal.Header.EmailKey] = item.Email, [Header.EmailKey] = item.Email,
[Models.Internal.Header.HomepageKey] = item.Homepage, [Header.HomepageKey] = item.Homepage,
[Models.Internal.Header.UrlKey] = item.Url, [Header.UrlKey] = item.Url,
[Models.Internal.Header.CommentKey] = item.Comment, [Header.CommentKey] = item.Comment,
[Models.Internal.Header.TypeKey] = item.Type, [Header.TypeKey] = item.Type,
}; };
if (item.ClrMamePro != null) if (item.ClrMamePro != null)
{ {
header[Models.Internal.Header.HeaderKey] = item.ClrMamePro.Header; header[Header.HeaderKey] = item.ClrMamePro.Header;
header[Models.Internal.Header.ForceMergingKey] = item.ClrMamePro.ForceMerging; header[Header.ForceMergingKey] = item.ClrMamePro.ForceMerging;
header[Models.Internal.Header.ForceNodumpKey] = item.ClrMamePro.ForceNodump; header[Header.ForceNodumpKey] = item.ClrMamePro.ForceNodump;
header[Models.Internal.Header.ForcePackingKey] = item.ClrMamePro.ForcePacking; header[Header.ForcePackingKey] = item.ClrMamePro.ForcePacking;
} }
if (item.RomCenter != null) if (item.RomCenter != null)
{ {
header[Models.Internal.Header.PluginKey] = item.RomCenter.Plugin; header[Header.PluginKey] = item.RomCenter.Plugin;
header[Models.Internal.Header.RomModeKey] = item.RomCenter.RomMode; header[Header.RomModeKey] = item.RomCenter.RomMode;
header[Models.Internal.Header.BiosModeKey] = item.RomCenter.BiosMode; header[Header.BiosModeKey] = item.RomCenter.BiosMode;
header[Models.Internal.Header.SampleModeKey] = item.RomCenter.SampleMode; header[Header.SampleModeKey] = item.RomCenter.SampleMode;
header[Models.Internal.Header.LockRomModeKey] = item.RomCenter.LockRomMode; header[Header.LockRomModeKey] = item.RomCenter.LockRomMode;
header[Models.Internal.Header.LockBiosModeKey] = item.RomCenter.LockBiosMode; header[Header.LockBiosModeKey] = item.RomCenter.LockBiosMode;
header[Models.Internal.Header.LockSampleModeKey] = item.RomCenter.LockSampleMode; header[Header.LockSampleModeKey] = item.RomCenter.LockSampleMode;
} }
return header; return header;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Logiqx.GameBase"/> to <cref="Models.Internal.Machine"/> /// Convert from <cref="Models.Logiqx.GameBase"/> to <cref="Machine"/>
/// </summary> /// </summary>
public static Models.Internal.Machine ConvertMachineFromLogiqx(Models.Logiqx.GameBase item) public static Machine ConvertMachineFromLogiqx(Models.Logiqx.GameBase item)
{ {
var machine = new Models.Internal.Machine var machine = new Machine
{ {
[Models.Internal.Machine.NameKey] = item.Name, [Machine.NameKey] = item.Name,
[Models.Internal.Machine.SourceFileKey] = item.SourceFile, [Machine.SourceFileKey] = item.SourceFile,
[Models.Internal.Machine.IsBiosKey] = item.IsBios, [Machine.IsBiosKey] = item.IsBios,
[Models.Internal.Machine.IsDeviceKey] = item.IsDevice, [Machine.IsDeviceKey] = item.IsDevice,
[Models.Internal.Machine.IsMechanicalKey] = item.IsMechanical, [Machine.IsMechanicalKey] = item.IsMechanical,
[Models.Internal.Machine.CloneOfKey] = item.CloneOf, [Machine.CloneOfKey] = item.CloneOf,
[Models.Internal.Machine.RomOfKey] = item.RomOf, [Machine.RomOfKey] = item.RomOf,
[Models.Internal.Machine.SampleOfKey] = item.SampleOf, [Machine.SampleOfKey] = item.SampleOf,
[Models.Internal.Machine.BoardKey] = item.Board, [Machine.BoardKey] = item.Board,
[Models.Internal.Machine.RebuildToKey] = item.RebuildTo, [Machine.RebuildToKey] = item.RebuildTo,
[Models.Internal.Machine.IdKey] = item.Id, [Machine.IdKey] = item.Id,
[Models.Internal.Machine.CloneOfIdKey] = item.CloneOfId, [Machine.CloneOfIdKey] = item.CloneOfId,
[Models.Internal.Machine.RunnableKey] = item.Runnable, [Machine.RunnableKey] = item.Runnable,
[Models.Internal.Machine.CommentKey] = item.Comment, [Machine.CommentKey] = item.Comment,
[Models.Internal.Machine.DescriptionKey] = item.Description, [Machine.DescriptionKey] = item.Description,
[Models.Internal.Machine.YearKey] = item.Year, [Machine.YearKey] = item.Year,
[Models.Internal.Machine.ManufacturerKey] = item.Manufacturer, [Machine.ManufacturerKey] = item.Manufacturer,
[Models.Internal.Machine.PublisherKey] = item.Publisher, [Machine.PublisherKey] = item.Publisher,
[Models.Internal.Machine.CategoryKey] = item.Category, [Machine.CategoryKey] = item.Category,
[Models.Internal.Machine.TruripKey] = item.Trurip, [Machine.TruripKey] = item.Trurip,
}; };
if (item.Release != null && item.Release.Any()) if (item.Release != null && item.Release.Any())
{ {
var releases = new List<Models.Internal.Release>(); var releases = new List<Release>();
foreach (var release in item.Release) foreach (var release in item.Release)
{ {
releases.Add(ConvertFromLogiqx(release)); releases.Add(ConvertFromLogiqx(release));
} }
machine[Models.Internal.Machine.ReleaseKey] = releases.ToArray(); machine[Machine.ReleaseKey] = releases.ToArray();
} }
if (item.BiosSet != null && item.BiosSet.Any()) if (item.BiosSet != null && item.BiosSet.Any())
{ {
var biosSets = new List<Models.Internal.BiosSet>(); var biosSets = new List<BiosSet>();
foreach (var biosSet in item.BiosSet) foreach (var biosSet in item.BiosSet)
{ {
biosSets.Add(ConvertFromLogiqx(biosSet)); biosSets.Add(ConvertFromLogiqx(biosSet));
} }
machine[Models.Internal.Machine.BiosSetKey] = biosSets.ToArray(); machine[Machine.BiosSetKey] = biosSets.ToArray();
} }
if (item.Rom != null && item.Rom.Any()) if (item.Rom != null && item.Rom.Any())
{ {
var roms = new List<Models.Internal.Rom>(); var roms = new List<Rom>();
foreach (var rom in item.Rom) foreach (var rom in item.Rom)
{ {
roms.Add(ConvertFromLogiqx(rom)); roms.Add(ConvertFromLogiqx(rom));
} }
machine[Models.Internal.Machine.RomKey] = roms.ToArray(); machine[Machine.RomKey] = roms.ToArray();
} }
if (item.Disk != null && item.Disk.Any()) if (item.Disk != null && item.Disk.Any())
{ {
var disks = new List<Models.Internal.Disk>(); var disks = new List<Disk>();
foreach (var disk in item.Disk) foreach (var disk in item.Disk)
{ {
disks.Add(ConvertFromLogiqx(disk)); disks.Add(ConvertFromLogiqx(disk));
} }
machine[Models.Internal.Machine.DiskKey] = disks.ToArray(); machine[Machine.DiskKey] = disks.ToArray();
} }
if (item.Media != null && item.Media.Any()) if (item.Media != null && item.Media.Any())
{ {
var medias = new List<Models.Internal.Media>(); var medias = new List<Media>();
foreach (var media in item.Media) foreach (var media in item.Media)
{ {
medias.Add(ConvertFromLogiqx(media)); medias.Add(ConvertFromLogiqx(media));
} }
machine[Models.Internal.Machine.MediaKey] = medias.ToArray(); machine[Machine.MediaKey] = medias.ToArray();
} }
if (item.DeviceRef != null && item.DeviceRef.Any()) if (item.DeviceRef != null && item.DeviceRef.Any())
{ {
var deviceRefs = new List<Models.Internal.DeviceRef>(); var deviceRefs = new List<DeviceRef>();
foreach (var deviceRef in item.DeviceRef) foreach (var deviceRef in item.DeviceRef)
{ {
deviceRefs.Add(ConvertFromLogiqx(deviceRef)); deviceRefs.Add(ConvertFromLogiqx(deviceRef));
} }
machine[Models.Internal.Machine.DeviceRefKey] = deviceRefs.ToArray(); machine[Machine.DeviceRefKey] = deviceRefs.ToArray();
} }
if (item.Sample != null && item.Sample.Any()) if (item.Sample != null && item.Sample.Any())
{ {
var samples = new List<Models.Internal.Sample>(); var samples = new List<Sample>();
foreach (var sample in item.Sample) foreach (var sample in item.Sample)
{ {
samples.Add(ConvertFromLogiqx(sample)); samples.Add(ConvertFromLogiqx(sample));
} }
machine[Models.Internal.Machine.SampleKey] = samples.ToArray(); machine[Machine.SampleKey] = samples.ToArray();
} }
if (item.Archive != null && item.Archive.Any()) if (item.Archive != null && item.Archive.Any())
{ {
var archives = new List<Models.Internal.Archive>(); var archives = new List<Archive>();
foreach (var archive in item.Archive) foreach (var archive in item.Archive)
{ {
archives.Add(ConvertFromLogiqx(archive)); archives.Add(ConvertFromLogiqx(archive));
} }
machine[Models.Internal.Machine.ArchiveKey] = archives.ToArray(); machine[Machine.ArchiveKey] = archives.ToArray();
} }
if (item.Driver != null && item.Driver.Any()) if (item.Driver != null && item.Driver.Any())
{ {
var drivers = new List<Models.Internal.Driver>(); var drivers = new List<Driver>();
foreach (var driver in item.Driver) foreach (var driver in item.Driver)
{ {
drivers.Add(ConvertFromLogiqx(driver)); drivers.Add(ConvertFromLogiqx(driver));
} }
machine[Models.Internal.Machine.DriverKey] = drivers.ToArray(); machine[Machine.DriverKey] = drivers.ToArray();
} }
if (item.SoftwareList != null && item.SoftwareList.Any()) if (item.SoftwareList != null && item.SoftwareList.Any())
{ {
var softwareLists = new List<Models.Internal.SoftwareList>(); var softwareLists = new List<SoftwareList>();
foreach (var softwareList in item.SoftwareList) foreach (var softwareList in item.SoftwareList)
{ {
softwareLists.Add(ConvertFromLogiqx(softwareList)); softwareLists.Add(ConvertFromLogiqx(softwareList));
} }
machine[Models.Internal.Machine.SoftwareListKey] = softwareLists.ToArray(); machine[Machine.SoftwareListKey] = softwareLists.ToArray();
} }
return machine; return machine;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Logiqx.Archive"/> to <cref="Models.Internal.Archive"/> /// Convert from <cref="Models.Logiqx.Archive"/> to <cref="Archive"/>
/// </summary> /// </summary>
public static Models.Internal.Archive ConvertFromLogiqx(Models.Logiqx.Archive item) public static Archive ConvertFromLogiqx(Models.Logiqx.Archive item)
{ {
var archive = new Models.Internal.Archive var archive = new Archive
{ {
[Models.Internal.Archive.NameKey] = item.Name, [Archive.NameKey] = item.Name,
}; };
return archive; return archive;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Logiqx.BiosSet"/> to <cref="Models.Internal.BiosSet"/> /// Convert from <cref="Models.Logiqx.BiosSet"/> to <cref="BiosSet"/>
/// </summary> /// </summary>
public static Models.Internal.BiosSet ConvertFromLogiqx(Models.Logiqx.BiosSet item) public static BiosSet ConvertFromLogiqx(Models.Logiqx.BiosSet item)
{ {
var biosset = new Models.Internal.BiosSet var biosset = new BiosSet
{ {
[Models.Internal.BiosSet.NameKey] = item.Name, [BiosSet.NameKey] = item.Name,
[Models.Internal.BiosSet.DescriptionKey] = item.Description, [BiosSet.DescriptionKey] = item.Description,
[Models.Internal.BiosSet.DefaultKey] = item.Default, [BiosSet.DefaultKey] = item.Default,
}; };
return biosset; return biosset;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Logiqx.DeviceRef"/> to <cref="Models.Internal.DeviceRef"/> /// Convert from <cref="Models.Logiqx.DeviceRef"/> to <cref="DeviceRef"/>
/// </summary> /// </summary>
public static Models.Internal.DeviceRef ConvertFromLogiqx(Models.Logiqx.DeviceRef item) public static DeviceRef ConvertFromLogiqx(Models.Logiqx.DeviceRef item)
{ {
var deviceRef = new Models.Internal.DeviceRef var deviceRef = new DeviceRef
{ {
[Models.Internal.DeviceRef.NameKey] = item.Name, [DeviceRef.NameKey] = item.Name,
}; };
return deviceRef; return deviceRef;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Logiqx.Disk"/> to <cref="Models.Internal.Disk"/> /// Convert from <cref="Models.Logiqx.Disk"/> to <cref="Disk"/>
/// </summary> /// </summary>
public static Models.Internal.Disk ConvertFromLogiqx(Models.Logiqx.Disk item) public static Disk ConvertFromLogiqx(Models.Logiqx.Disk item)
{ {
var disk = new Models.Internal.Disk var disk = new Disk
{ {
[Models.Internal.Disk.NameKey] = item.Name, [Disk.NameKey] = item.Name,
[Models.Internal.Disk.MD5Key] = item.MD5, [Disk.MD5Key] = item.MD5,
[Models.Internal.Disk.SHA1Key] = item.SHA1, [Disk.SHA1Key] = item.SHA1,
[Models.Internal.Disk.MergeKey] = item.Merge, [Disk.MergeKey] = item.Merge,
[Models.Internal.Disk.StatusKey] = item.Status, [Disk.StatusKey] = item.Status,
[Models.Internal.Disk.RegionKey] = item.Region, [Disk.RegionKey] = item.Region,
}; };
return disk; return disk;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Logiqx.Driver"/> to <cref="Models.Internal.Driver"/> /// Convert from <cref="Models.Logiqx.Driver"/> to <cref="Driver"/>
/// </summary> /// </summary>
public static Models.Internal.Driver ConvertFromLogiqx(Models.Logiqx.Driver item) public static Driver ConvertFromLogiqx(Models.Logiqx.Driver item)
{ {
var driver = new Models.Internal.Driver var driver = new Driver
{ {
[Models.Internal.Driver.StatusKey] = item.Status, [Driver.StatusKey] = item.Status,
[Models.Internal.Driver.EmulationKey] = item.Emulation, [Driver.EmulationKey] = item.Emulation,
[Models.Internal.Driver.CocktailKey] = item.Cocktail, [Driver.CocktailKey] = item.Cocktail,
[Models.Internal.Driver.SaveStateKey] = item.SaveState, [Driver.SaveStateKey] = item.SaveState,
[Models.Internal.Driver.RequiresArtworkKey] = item.RequiresArtwork, [Driver.RequiresArtworkKey] = item.RequiresArtwork,
[Models.Internal.Driver.UnofficialKey] = item.Unofficial, [Driver.UnofficialKey] = item.Unofficial,
[Models.Internal.Driver.NoSoundHardwareKey] = item.NoSoundHardware, [Driver.NoSoundHardwareKey] = item.NoSoundHardware,
[Models.Internal.Driver.IncompleteKey] = item.Incomplete, [Driver.IncompleteKey] = item.Incomplete,
}; };
return driver; return driver;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Logiqx.Media"/> to <cref="Models.Internal.Media"/> /// Convert from <cref="Models.Logiqx.Media"/> to <cref="Media"/>
/// </summary> /// </summary>
public static Models.Internal.Media ConvertFromLogiqx(Models.Logiqx.Media item) public static Media ConvertFromLogiqx(Models.Logiqx.Media item)
{ {
var media = new Models.Internal.Media var media = new Media
{ {
[Models.Internal.Media.NameKey] = item.Name, [Media.NameKey] = item.Name,
[Models.Internal.Media.MD5Key] = item.MD5, [Media.MD5Key] = item.MD5,
[Models.Internal.Media.SHA1Key] = item.SHA1, [Media.SHA1Key] = item.SHA1,
[Models.Internal.Media.SHA256Key] = item.SHA256, [Media.SHA256Key] = item.SHA256,
[Models.Internal.Media.SpamSumKey] = item.SpamSum, [Media.SpamSumKey] = item.SpamSum,
}; };
return media; return media;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Logiqx.Release"/> to <cref="Models.Internal.Release"/> /// Convert from <cref="Models.Logiqx.Release"/> to <cref="Release"/>
/// </summary> /// </summary>
public static Models.Internal.Release ConvertFromLogiqx(Models.Logiqx.Release item) public static Release ConvertFromLogiqx(Models.Logiqx.Release item)
{ {
var release = new Models.Internal.Release var release = new Release
{ {
[Models.Internal.Release.NameKey] = item.Name, [Release.NameKey] = item.Name,
[Models.Internal.Release.RegionKey] = item.Region, [Release.RegionKey] = item.Region,
[Models.Internal.Release.LanguageKey] = item.Language, [Release.LanguageKey] = item.Language,
[Models.Internal.Release.DateKey] = item.Date, [Release.DateKey] = item.Date,
[Models.Internal.Release.DefaultKey] = item.Default, [Release.DefaultKey] = item.Default,
}; };
return release; return release;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Logiqx.Rom"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.Logiqx.Rom"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromLogiqx(Models.Logiqx.Rom item) public static Rom ConvertFromLogiqx(Models.Logiqx.Rom item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.NameKey] = item.Name, [Rom.NameKey] = item.Name,
[Models.Internal.Rom.SizeKey] = item.Size, [Rom.SizeKey] = item.Size,
[Models.Internal.Rom.CRCKey] = item.CRC, [Rom.CRCKey] = item.CRC,
[Models.Internal.Rom.MD5Key] = item.MD5, [Rom.MD5Key] = item.MD5,
[Models.Internal.Rom.SHA1Key] = item.SHA1, [Rom.SHA1Key] = item.SHA1,
[Models.Internal.Rom.SHA256Key] = item.SHA256, [Rom.SHA256Key] = item.SHA256,
[Models.Internal.Rom.SHA384Key] = item.SHA384, [Rom.SHA384Key] = item.SHA384,
[Models.Internal.Rom.SHA512Key] = item.SHA512, [Rom.SHA512Key] = item.SHA512,
[Models.Internal.Rom.SpamSumKey] = item.SpamSum, [Rom.SpamSumKey] = item.SpamSum,
[Models.Internal.Rom.xxHash364Key] = item.xxHash364, [Rom.xxHash364Key] = item.xxHash364,
[Models.Internal.Rom.xxHash3128Key] = item.xxHash3128, [Rom.xxHash3128Key] = item.xxHash3128,
[Models.Internal.Rom.MergeKey] = item.Merge, [Rom.MergeKey] = item.Merge,
[Models.Internal.Rom.StatusKey] = item.Status, [Rom.StatusKey] = item.Status,
[Models.Internal.Rom.SerialKey] = item.Serial, [Rom.SerialKey] = item.Serial,
[Models.Internal.Rom.HeaderKey] = item.Header, [Rom.HeaderKey] = item.Header,
[Models.Internal.Rom.DateKey] = item.Date, [Rom.DateKey] = item.Date,
[Models.Internal.Rom.InvertedKey] = item.Inverted, [Rom.InvertedKey] = item.Inverted,
[Models.Internal.Rom.MIAKey] = item.MIA, [Rom.MIAKey] = item.MIA,
}; };
return rom; return rom;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Logiqx.Sample"/> to <cref="Models.Internal.Sample"/> /// Convert from <cref="Models.Logiqx.Sample"/> to <cref="Sample"/>
/// </summary> /// </summary>
public static Models.Internal.Sample ConvertFromLogiqx(Models.Logiqx.Sample item) public static Sample ConvertFromLogiqx(Models.Logiqx.Sample item)
{ {
var sample = new Models.Internal.Sample var sample = new Sample
{ {
[Models.Internal.Sample.NameKey] = item.Name, [Sample.NameKey] = item.Name,
}; };
return sample; return sample;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Logiqx.SoftwareList"/> to <cref="Models.Internal.SoftwareList"/> /// Convert from <cref="Models.Logiqx.SoftwareList"/> to <cref="SoftwareList"/>
/// </summary> /// </summary>
public static Models.Internal.SoftwareList ConvertFromLogiqx(Models.Logiqx.SoftwareList item) public static SoftwareList ConvertFromLogiqx(Models.Logiqx.SoftwareList item)
{ {
var softwareList = new Models.Internal.SoftwareList var softwareList = new SoftwareList
{ {
[Models.Internal.SoftwareList.TagKey] = item.Tag, [SoftwareList.TagKey] = item.Tag,
[Models.Internal.SoftwareList.NameKey] = item.Name, [SoftwareList.NameKey] = item.Name,
[Models.Internal.SoftwareList.StatusKey] = item.Status, [SoftwareList.StatusKey] = item.Status,
[Models.Internal.SoftwareList.FilterKey] = item.Filter, [SoftwareList.FilterKey] = item.Filter,
}; };
return softwareList; return softwareList;
} }
@@ -353,61 +354,61 @@ namespace SabreTools.Serialization
#region Deserialize #region Deserialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Header"/> to <cref="Models.Logiqx.Header"/> /// Convert from <cref="Header"/> to <cref="Models.Logiqx.Header"/>
/// </summary> /// </summary>
public static Models.Logiqx.Header? ConvertHeaderToLogiqx(Models.Internal.Header? item) public static Models.Logiqx.Header? ConvertHeaderToLogiqx(Header? item)
{ {
if (item == null) if (item == null)
return null; return null;
var header = new Models.Logiqx.Header var header = new Models.Logiqx.Header
{ {
Id = item.ReadString(Models.Internal.Header.IdKey), Id = item.ReadString(Header.IdKey),
Name = item.ReadString(Models.Internal.Header.NameKey), Name = item.ReadString(Header.NameKey),
Description = item.ReadString(Models.Internal.Header.DescriptionKey), Description = item.ReadString(Header.DescriptionKey),
RootDir = item.ReadString(Models.Internal.Header.RootDirKey), RootDir = item.ReadString(Header.RootDirKey),
Category = item.ReadString(Models.Internal.Header.CategoryKey), Category = item.ReadString(Header.CategoryKey),
Version = item.ReadString(Models.Internal.Header.VersionKey), Version = item.ReadString(Header.VersionKey),
Date = item.ReadString(Models.Internal.Header.DateKey), Date = item.ReadString(Header.DateKey),
Author = item.ReadString(Models.Internal.Header.AuthorKey), Author = item.ReadString(Header.AuthorKey),
Email = item.ReadString(Models.Internal.Header.EmailKey), Email = item.ReadString(Header.EmailKey),
Homepage = item.ReadString(Models.Internal.Header.HomepageKey), Homepage = item.ReadString(Header.HomepageKey),
Url = item.ReadString(Models.Internal.Header.UrlKey), Url = item.ReadString(Header.UrlKey),
Comment = item.ReadString(Models.Internal.Header.CommentKey), Comment = item.ReadString(Header.CommentKey),
Type = item.ReadString(Models.Internal.Header.TypeKey), Type = item.ReadString(Header.TypeKey),
}; };
if (item.ContainsKey(Models.Internal.Header.HeaderKey) if (item.ContainsKey(Header.HeaderKey)
|| item.ContainsKey(Models.Internal.Header.ForceMergingKey) || item.ContainsKey(Header.ForceMergingKey)
|| item.ContainsKey(Models.Internal.Header.ForceNodumpKey) || item.ContainsKey(Header.ForceNodumpKey)
|| item.ContainsKey(Models.Internal.Header.ForcePackingKey)) || item.ContainsKey(Header.ForcePackingKey))
{ {
header.ClrMamePro = new Models.Logiqx.ClrMamePro header.ClrMamePro = new Models.Logiqx.ClrMamePro
{ {
Header = item.ReadString(Models.Internal.Header.HeaderKey), Header = item.ReadString(Header.HeaderKey),
ForceMerging = item.ReadString(Models.Internal.Header.ForceMergingKey), ForceMerging = item.ReadString(Header.ForceMergingKey),
ForceNodump = item.ReadString(Models.Internal.Header.ForceNodumpKey), ForceNodump = item.ReadString(Header.ForceNodumpKey),
ForcePacking = item.ReadString(Models.Internal.Header.ForcePackingKey), ForcePacking = item.ReadString(Header.ForcePackingKey),
}; };
} }
if (item.ContainsKey(Models.Internal.Header.PluginKey) if (item.ContainsKey(Header.PluginKey)
|| item.ContainsKey(Models.Internal.Header.RomModeKey) || item.ContainsKey(Header.RomModeKey)
|| item.ContainsKey(Models.Internal.Header.BiosModeKey) || item.ContainsKey(Header.BiosModeKey)
|| item.ContainsKey(Models.Internal.Header.SampleModeKey) || item.ContainsKey(Header.SampleModeKey)
|| item.ContainsKey(Models.Internal.Header.LockRomModeKey) || item.ContainsKey(Header.LockRomModeKey)
|| item.ContainsKey(Models.Internal.Header.LockBiosModeKey) || item.ContainsKey(Header.LockBiosModeKey)
|| item.ContainsKey(Models.Internal.Header.LockSampleModeKey)) || item.ContainsKey(Header.LockSampleModeKey))
{ {
header.RomCenter = new Models.Logiqx.RomCenter header.RomCenter = new Models.Logiqx.RomCenter
{ {
Plugin = item.ReadString(Models.Internal.Header.PluginKey), Plugin = item.ReadString(Header.PluginKey),
RomMode = item.ReadString(Models.Internal.Header.RomModeKey), RomMode = item.ReadString(Header.RomModeKey),
BiosMode = item.ReadString(Models.Internal.Header.BiosModeKey), BiosMode = item.ReadString(Header.BiosModeKey),
SampleMode = item.ReadString(Models.Internal.Header.SampleModeKey), SampleMode = item.ReadString(Header.SampleModeKey),
LockRomMode = item.ReadString(Models.Internal.Header.LockRomModeKey), LockRomMode = item.ReadString(Header.LockRomModeKey),
LockBiosMode = item.ReadString(Models.Internal.Header.LockBiosModeKey), LockBiosMode = item.ReadString(Header.LockBiosModeKey),
LockSampleMode = item.ReadString(Models.Internal.Header.LockSampleModeKey), LockSampleMode = item.ReadString(Header.LockSampleModeKey),
}; };
} }
@@ -415,259 +416,259 @@ namespace SabreTools.Serialization
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Archive"/> to <cref="Models.Logiqx.Archive"/> /// Convert from <cref="Archive"/> to <cref="Models.Logiqx.Archive"/>
/// </summary> /// </summary>
public static Models.Logiqx.GameBase? ConvertMachineToLogiqx(Models.Internal.Machine? item, bool game = false) public static Models.Logiqx.GameBase? ConvertMachineToLogiqx(Machine? item, bool game = false)
{ {
if (item == null) if (item == null)
return null; return null;
Models.Logiqx.GameBase gameBase = game ? new Models.Logiqx.Game() : new Models.Logiqx.Machine(); Models.Logiqx.GameBase gameBase = game ? new Models.Logiqx.Game() : new Models.Logiqx.Machine();
gameBase.Name = item.ReadString(Models.Internal.Machine.NameKey); gameBase.Name = item.ReadString(Machine.NameKey);
gameBase.SourceFile = item.ReadString(Models.Internal.Machine.SourceFileKey); gameBase.SourceFile = item.ReadString(Machine.SourceFileKey);
gameBase.IsBios = item.ReadString(Models.Internal.Machine.IsBiosKey); gameBase.IsBios = item.ReadString(Machine.IsBiosKey);
gameBase.IsDevice = item.ReadString(Models.Internal.Machine.IsDeviceKey); gameBase.IsDevice = item.ReadString(Machine.IsDeviceKey);
gameBase.IsMechanical = item.ReadString(Models.Internal.Machine.IsMechanicalKey); gameBase.IsMechanical = item.ReadString(Machine.IsMechanicalKey);
gameBase.CloneOf = item.ReadString(Models.Internal.Machine.CloneOfKey); gameBase.CloneOf = item.ReadString(Machine.CloneOfKey);
gameBase.RomOf = item.ReadString(Models.Internal.Machine.RomOfKey); gameBase.RomOf = item.ReadString(Machine.RomOfKey);
gameBase.SampleOf = item.ReadString(Models.Internal.Machine.SampleOfKey); gameBase.SampleOf = item.ReadString(Machine.SampleOfKey);
gameBase.Board = item.ReadString(Models.Internal.Machine.BoardKey); gameBase.Board = item.ReadString(Machine.BoardKey);
gameBase.RebuildTo = item.ReadString(Models.Internal.Machine.RebuildToKey); gameBase.RebuildTo = item.ReadString(Machine.RebuildToKey);
gameBase.Id = item.ReadString(Models.Internal.Machine.IdKey); gameBase.Id = item.ReadString(Machine.IdKey);
gameBase.CloneOfId = item.ReadString(Models.Internal.Machine.CloneOfIdKey); gameBase.CloneOfId = item.ReadString(Machine.CloneOfIdKey);
gameBase.Runnable = item.ReadString(Models.Internal.Machine.RunnableKey); gameBase.Runnable = item.ReadString(Machine.RunnableKey);
gameBase.Comment = item.ReadStringArray(Models.Internal.Machine.CommentKey); gameBase.Comment = item.ReadStringArray(Machine.CommentKey);
gameBase.Description = item.ReadString(Models.Internal.Machine.DescriptionKey); gameBase.Description = item.ReadString(Machine.DescriptionKey);
gameBase.Year = item.ReadString(Models.Internal.Machine.YearKey); gameBase.Year = item.ReadString(Machine.YearKey);
gameBase.Manufacturer = item.ReadString(Models.Internal.Machine.ManufacturerKey); gameBase.Manufacturer = item.ReadString(Machine.ManufacturerKey);
gameBase.Publisher = item.ReadString(Models.Internal.Machine.PublisherKey); gameBase.Publisher = item.ReadString(Machine.PublisherKey);
gameBase.Category = item.ReadStringArray(Models.Internal.Machine.CategoryKey); gameBase.Category = item.ReadStringArray(Machine.CategoryKey);
var trurip = item.Read<Models.Logiqx.Trurip>(Models.Internal.Machine.TruripKey); var trurip = item.Read<Models.Logiqx.Trurip>(Machine.TruripKey);
gameBase.Trurip = trurip; gameBase.Trurip = trurip;
var releases = item.Read<Models.Internal.Release[]>(Models.Internal.Machine.ReleaseKey); var releases = item.Read<Release[]>(Machine.ReleaseKey);
gameBase.Release = releases?.Select(ConvertToLogiqx)?.ToArray(); gameBase.Release = releases?.Select(ConvertToLogiqx)?.ToArray();
var biosSets = item.Read<Models.Internal.BiosSet[]>(Models.Internal.Machine.BiosSetKey); var biosSets = item.Read<BiosSet[]>(Machine.BiosSetKey);
gameBase.BiosSet = biosSets?.Select(ConvertToLogiqx)?.ToArray(); gameBase.BiosSet = biosSets?.Select(ConvertToLogiqx)?.ToArray();
var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey); var roms = item.Read<Rom[]>(Machine.RomKey);
gameBase.Rom = roms?.Select(ConvertToLogiqx)?.ToArray(); gameBase.Rom = roms?.Select(ConvertToLogiqx)?.ToArray();
var disks = item.Read<Models.Internal.Disk[]>(Models.Internal.Machine.DiskKey); var disks = item.Read<Disk[]>(Machine.DiskKey);
gameBase.Disk = disks?.Select(ConvertToLogiqx)?.ToArray(); gameBase.Disk = disks?.Select(ConvertToLogiqx)?.ToArray();
var medias = item.Read<Models.Internal.Media[]>(Models.Internal.Machine.MediaKey); var medias = item.Read<Media[]>(Machine.MediaKey);
gameBase.Media = medias?.Select(ConvertToLogiqx)?.ToArray(); gameBase.Media = medias?.Select(ConvertToLogiqx)?.ToArray();
var deviceRefs = item.Read<Models.Internal.DeviceRef[]>(Models.Internal.Machine.DeviceRefKey); var deviceRefs = item.Read<DeviceRef[]>(Machine.DeviceRefKey);
gameBase.DeviceRef = deviceRefs?.Select(ConvertToLogiqx)?.ToArray(); gameBase.DeviceRef = deviceRefs?.Select(ConvertToLogiqx)?.ToArray();
var samples = item.Read<Models.Internal.Sample[]>(Models.Internal.Machine.SampleKey); var samples = item.Read<Sample[]>(Machine.SampleKey);
gameBase.Sample = samples?.Select(ConvertToLogiqx)?.ToArray(); gameBase.Sample = samples?.Select(ConvertToLogiqx)?.ToArray();
var archives = item.Read<Models.Internal.Archive[]>(Models.Internal.Machine.ArchiveKey); var archives = item.Read<Archive[]>(Machine.ArchiveKey);
gameBase.Archive = archives?.Select(ConvertToLogiqx)?.ToArray(); gameBase.Archive = archives?.Select(ConvertToLogiqx)?.ToArray();
var drivers = item.Read<Models.Internal.Driver[]>(Models.Internal.Machine.DriverKey); var drivers = item.Read<Driver[]>(Machine.DriverKey);
gameBase.Driver = drivers?.Select(ConvertToLogiqx)?.ToArray(); gameBase.Driver = drivers?.Select(ConvertToLogiqx)?.ToArray();
var softwareLists = item.Read<Models.Internal.SoftwareList[]>(Models.Internal.Machine.SoftwareListKey); var softwareLists = item.Read<SoftwareList[]>(Machine.SoftwareListKey);
gameBase.SoftwareList = softwareLists?.Select(ConvertToLogiqx)?.ToArray(); gameBase.SoftwareList = softwareLists?.Select(ConvertToLogiqx)?.ToArray();
return gameBase; return gameBase;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Archive"/> to <cref="Models.Logiqx.Archive"/> /// Convert from <cref="Archive"/> to <cref="Models.Logiqx.Archive"/>
/// </summary> /// </summary>
private static Models.Logiqx.Archive? ConvertToLogiqx(Models.Internal.Archive? item) private static Models.Logiqx.Archive? ConvertToLogiqx(Archive? item)
{ {
if (item == null) if (item == null)
return null; return null;
var archive = new Models.Logiqx.Archive var archive = new Models.Logiqx.Archive
{ {
Name = item.ReadString(Models.Internal.Archive.NameKey), Name = item.ReadString(Archive.NameKey),
}; };
return archive; return archive;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.BiosSet"/> to <cref="Models.Logiqx.BiosSet"/> /// Convert from <cref="BiosSet"/> to <cref="Models.Logiqx.BiosSet"/>
/// </summary> /// </summary>
private static Models.Logiqx.BiosSet? ConvertToLogiqx(Models.Internal.BiosSet? item) private static Models.Logiqx.BiosSet? ConvertToLogiqx(BiosSet? item)
{ {
if (item == null) if (item == null)
return null; return null;
var biosset = new Models.Logiqx.BiosSet var biosset = new Models.Logiqx.BiosSet
{ {
Name = item.ReadString(Models.Internal.BiosSet.NameKey), Name = item.ReadString(BiosSet.NameKey),
Description = item.ReadString(Models.Internal.BiosSet.DescriptionKey), Description = item.ReadString(BiosSet.DescriptionKey),
Default = item.ReadString(Models.Internal.BiosSet.DefaultKey), Default = item.ReadString(BiosSet.DefaultKey),
}; };
return biosset; return biosset;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.DeviceRef"/> to <cref="Models.Logiqx.DeviceRef"/> /// Convert from <cref="DeviceRef"/> to <cref="Models.Logiqx.DeviceRef"/>
/// </summary> /// </summary>
private static Models.Logiqx.DeviceRef? ConvertToLogiqx(Models.Internal.DeviceRef? item) private static Models.Logiqx.DeviceRef? ConvertToLogiqx(DeviceRef? item)
{ {
if (item == null) if (item == null)
return null; return null;
var deviceRef = new Models.Logiqx.DeviceRef var deviceRef = new Models.Logiqx.DeviceRef
{ {
Name = item.ReadString(Models.Internal.DipSwitch.NameKey), Name = item.ReadString(DipSwitch.NameKey),
}; };
return deviceRef; return deviceRef;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Disk"/> to <cref="Models.Logiqx.Disk"/> /// Convert from <cref="Disk"/> to <cref="Models.Logiqx.Disk"/>
/// </summary> /// </summary>
private static Models.Logiqx.Disk? ConvertToLogiqx(Models.Internal.Disk? item) private static Models.Logiqx.Disk? ConvertToLogiqx(Disk? item)
{ {
if (item == null) if (item == null)
return null; return null;
var disk = new Models.Logiqx.Disk var disk = new Models.Logiqx.Disk
{ {
Name = item.ReadString(Models.Internal.Disk.NameKey), Name = item.ReadString(Disk.NameKey),
MD5 = item.ReadString(Models.Internal.Disk.MD5Key), MD5 = item.ReadString(Disk.MD5Key),
SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key), SHA1 = item.ReadString(Disk.SHA1Key),
Merge = item.ReadString(Models.Internal.Disk.MergeKey), Merge = item.ReadString(Disk.MergeKey),
Status = item.ReadString(Models.Internal.Disk.StatusKey), Status = item.ReadString(Disk.StatusKey),
Region = item.ReadString(Models.Internal.Disk.RegionKey), Region = item.ReadString(Disk.RegionKey),
}; };
return disk; return disk;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Driver"/> to <cref="Models.Logiqx.Driver"/> /// Convert from <cref="Driver"/> to <cref="Models.Logiqx.Driver"/>
/// </summary> /// </summary>
private static Models.Logiqx.Driver? ConvertToLogiqx(Models.Internal.Driver? item) private static Models.Logiqx.Driver? ConvertToLogiqx(Driver? item)
{ {
if (item == null) if (item == null)
return null; return null;
var driver = new Models.Logiqx.Driver var driver = new Models.Logiqx.Driver
{ {
Status = item.ReadString(Models.Internal.Driver.StatusKey), Status = item.ReadString(Driver.StatusKey),
Emulation = item.ReadString(Models.Internal.Driver.EmulationKey), Emulation = item.ReadString(Driver.EmulationKey),
Cocktail = item.ReadString(Models.Internal.Driver.CocktailKey), Cocktail = item.ReadString(Driver.CocktailKey),
SaveState = item.ReadString(Models.Internal.Driver.SaveStateKey), SaveState = item.ReadString(Driver.SaveStateKey),
RequiresArtwork = item.ReadString(Models.Internal.Driver.RequiresArtworkKey), RequiresArtwork = item.ReadString(Driver.RequiresArtworkKey),
Unofficial = item.ReadString(Models.Internal.Driver.UnofficialKey), Unofficial = item.ReadString(Driver.UnofficialKey),
NoSoundHardware = item.ReadString(Models.Internal.Driver.NoSoundHardwareKey), NoSoundHardware = item.ReadString(Driver.NoSoundHardwareKey),
Incomplete = item.ReadString(Models.Internal.Driver.IncompleteKey), Incomplete = item.ReadString(Driver.IncompleteKey),
}; };
return driver; return driver;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Media"/> to <cref="Models.Logiqx.Media"/> /// Convert from <cref="Media"/> to <cref="Models.Logiqx.Media"/>
/// </summary> /// </summary>
private static Models.Logiqx.Media? ConvertToLogiqx(Models.Internal.Media? item) private static Models.Logiqx.Media? ConvertToLogiqx(Media? item)
{ {
if (item == null) if (item == null)
return null; return null;
var media = new Models.Logiqx.Media var media = new Models.Logiqx.Media
{ {
Name = item.ReadString(Models.Internal.Media.NameKey), Name = item.ReadString(Media.NameKey),
MD5 = item.ReadString(Models.Internal.Media.MD5Key), MD5 = item.ReadString(Media.MD5Key),
SHA1 = item.ReadString(Models.Internal.Media.SHA1Key), SHA1 = item.ReadString(Media.SHA1Key),
SHA256 = item.ReadString(Models.Internal.Media.SHA256Key), SHA256 = item.ReadString(Media.SHA256Key),
SpamSum = item.ReadString(Models.Internal.Media.SpamSumKey), SpamSum = item.ReadString(Media.SpamSumKey),
}; };
return media; return media;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Release"/> to <cref="Models.Logiqx.Release"/> /// Convert from <cref="Release"/> to <cref="Models.Logiqx.Release"/>
/// </summary> /// </summary>
private static Models.Logiqx.Release? ConvertToLogiqx(Models.Internal.Release? item) private static Models.Logiqx.Release? ConvertToLogiqx(Release? item)
{ {
if (item == null) if (item == null)
return null; return null;
var release = new Models.Logiqx.Release var release = new Models.Logiqx.Release
{ {
Name = item.ReadString(Models.Internal.Release.NameKey), Name = item.ReadString(Release.NameKey),
Region = item.ReadString(Models.Internal.Release.RegionKey), Region = item.ReadString(Release.RegionKey),
Language = item.ReadString(Models.Internal.Release.LanguageKey), Language = item.ReadString(Release.LanguageKey),
Date = item.ReadString(Models.Internal.Release.DateKey), Date = item.ReadString(Release.DateKey),
Default = item.ReadString(Models.Internal.Release.DefaultKey), Default = item.ReadString(Release.DefaultKey),
}; };
return release; return release;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.Logiqx.Rom"/> /// Convert from <cref="Rom"/> to <cref="Models.Logiqx.Rom"/>
/// </summary> /// </summary>
private static Models.Logiqx.Rom? ConvertToLogiqx(Models.Internal.Rom? item) private static Models.Logiqx.Rom? ConvertToLogiqx(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var rom = new Models.Logiqx.Rom var rom = new Models.Logiqx.Rom
{ {
Name = item.ReadString(Models.Internal.Rom.NameKey), Name = item.ReadString(Rom.NameKey),
Size = item.ReadString(Models.Internal.Rom.SizeKey), Size = item.ReadString(Rom.SizeKey),
CRC = item.ReadString(Models.Internal.Rom.CRCKey), CRC = item.ReadString(Rom.CRCKey),
MD5 = item.ReadString(Models.Internal.Rom.MD5Key), MD5 = item.ReadString(Rom.MD5Key),
SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key), SHA1 = item.ReadString(Rom.SHA1Key),
SHA256 = item.ReadString(Models.Internal.Rom.SHA256Key), SHA256 = item.ReadString(Rom.SHA256Key),
SHA384 = item.ReadString(Models.Internal.Rom.SHA384Key), SHA384 = item.ReadString(Rom.SHA384Key),
SHA512 = item.ReadString(Models.Internal.Rom.SHA512Key), SHA512 = item.ReadString(Rom.SHA512Key),
SpamSum = item.ReadString(Models.Internal.Rom.SpamSumKey), SpamSum = item.ReadString(Rom.SpamSumKey),
xxHash364 = item.ReadString(Models.Internal.Rom.xxHash364Key), xxHash364 = item.ReadString(Rom.xxHash364Key),
xxHash3128 = item.ReadString(Models.Internal.Rom.xxHash3128Key), xxHash3128 = item.ReadString(Rom.xxHash3128Key),
Merge = item.ReadString(Models.Internal.Rom.MergeKey), Merge = item.ReadString(Rom.MergeKey),
Status = item.ReadString(Models.Internal.Rom.StatusKey), Status = item.ReadString(Rom.StatusKey),
Serial = item.ReadString(Models.Internal.Rom.SerialKey), Serial = item.ReadString(Rom.SerialKey),
Header = item.ReadString(Models.Internal.Rom.HeaderKey), Header = item.ReadString(Rom.HeaderKey),
Date = item.ReadString(Models.Internal.Rom.DateKey), Date = item.ReadString(Rom.DateKey),
Inverted = item.ReadString(Models.Internal.Rom.InvertedKey), Inverted = item.ReadString(Rom.InvertedKey),
MIA = item.ReadString(Models.Internal.Rom.MIAKey), MIA = item.ReadString(Rom.MIAKey),
}; };
return rom; return rom;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Sample"/> to <cref="Models.Logiqx.Sample"/> /// Convert from <cref="Sample"/> to <cref="Models.Logiqx.Sample"/>
/// </summary> /// </summary>
private static Models.Logiqx.Sample? ConvertToLogiqx(Models.Internal.Sample? item) private static Models.Logiqx.Sample? ConvertToLogiqx(Sample? item)
{ {
if (item == null) if (item == null)
return null; return null;
var sample = new Models.Logiqx.Sample var sample = new Models.Logiqx.Sample
{ {
Name = item.ReadString(Models.Internal.Sample.NameKey), Name = item.ReadString(Sample.NameKey),
}; };
return sample; return sample;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.SoftwareList"/> to <cref="Models.Logiqx.SoftwareList"/> /// Convert from <cref="SoftwareList"/> to <cref="Models.Logiqx.SoftwareList"/>
/// </summary> /// </summary>
private static Models.Logiqx.SoftwareList? ConvertToLogiqx(Models.Internal.SoftwareList? item) private static Models.Logiqx.SoftwareList? ConvertToLogiqx(SoftwareList? item)
{ {
if (item == null) if (item == null)
return null; return null;
var softwareList = new Models.Logiqx.SoftwareList var softwareList = new Models.Logiqx.SoftwareList
{ {
Tag = item.ReadString(Models.Internal.SoftwareList.TagKey), Tag = item.ReadString(SoftwareList.TagKey),
Name = item.ReadString(Models.Internal.SoftwareList.NameKey), Name = item.ReadString(SoftwareList.NameKey),
Status = item.ReadString(Models.Internal.SoftwareList.StatusKey), Status = item.ReadString(SoftwareList.StatusKey),
Filter = item.ReadString(Models.Internal.SoftwareList.FilterKey), Filter = item.ReadString(SoftwareList.FilterKey),
}; };
return softwareList; return softwareList;
} }

View File

@@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using SabreTools.Models.Internal;
namespace SabreTools.Serialization namespace SabreTools.Serialization
{ {
@@ -11,80 +12,80 @@ namespace SabreTools.Serialization
#region Serialize #region Serialize
/// <summary> /// <summary>
/// Convert from <cref="Models.OfflineList.Dat"/> to <cref="Models.Internal.Header"/> /// Convert from <cref="Models.OfflineList.Dat"/> to <cref="Header"/>
/// </summary> /// </summary>
public static Models.Internal.Header ConvertHeaderFromOfflineList(Models.OfflineList.Dat item) public static Header ConvertHeaderFromOfflineList(Models.OfflineList.Dat item)
{ {
var header = new Models.Internal.Header var header = new Header
{ {
[Models.Internal.Header.NoNamespaceSchemaLocationKey] = item.NoNamespaceSchemaLocation, [Header.NoNamespaceSchemaLocationKey] = item.NoNamespaceSchemaLocation,
}; };
if (item.Configuration != null) if (item.Configuration != null)
{ {
header[Models.Internal.Header.NameKey] = item.Configuration.DatName; header[Header.NameKey] = item.Configuration.DatName;
header[Models.Internal.Header.ImFolderKey] = item.Configuration.ImFolder; header[Header.ImFolderKey] = item.Configuration.ImFolder;
header[Models.Internal.Header.DatVersionKey] = item.Configuration.DatVersion; header[Header.DatVersionKey] = item.Configuration.DatVersion;
header[Models.Internal.Header.SystemKey] = item.Configuration.System; header[Header.SystemKey] = item.Configuration.System;
header[Models.Internal.Header.ScreenshotsWidthKey] = item.Configuration.ScreenshotsWidth; header[Header.ScreenshotsWidthKey] = item.Configuration.ScreenshotsWidth;
header[Models.Internal.Header.ScreenshotsHeightKey] = item.Configuration.ScreenshotsHeight; header[Header.ScreenshotsHeightKey] = item.Configuration.ScreenshotsHeight;
header[Models.Internal.Header.InfosKey] = item.Configuration.Infos; header[Header.InfosKey] = item.Configuration.Infos;
header[Models.Internal.Header.CanOpenKey] = item.Configuration.CanOpen; header[Header.CanOpenKey] = item.Configuration.CanOpen;
header[Models.Internal.Header.NewDatKey] = item.Configuration.NewDat; header[Header.NewDatKey] = item.Configuration.NewDat;
header[Models.Internal.Header.SearchKey] = item.Configuration.Search; header[Header.SearchKey] = item.Configuration.Search;
header[Models.Internal.Header.RomTitleKey] = item.Configuration.RomTitle; header[Header.RomTitleKey] = item.Configuration.RomTitle;
} }
if (item.GUI != null) if (item.GUI != null)
{ {
header[Models.Internal.Header.ImagesKey] = item.GUI.Images; header[Header.ImagesKey] = item.GUI.Images;
} }
return header; return header;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.OfflineList.Game"/> to <cref="Models.Internal.Machine"/> /// Convert from <cref="Models.OfflineList.Game"/> to <cref="Machine"/>
/// </summary> /// </summary>
public static Models.Internal.Machine ConvertMachineFromOfflineList(Models.OfflineList.Game item) public static Machine ConvertMachineFromOfflineList(Models.OfflineList.Game item)
{ {
var machine = new Models.Internal.Machine var machine = new Machine
{ {
[Models.Internal.Machine.ImageNumberKey] = item.ImageNumber, [Machine.ImageNumberKey] = item.ImageNumber,
[Models.Internal.Machine.ReleaseNumberKey] = item.ReleaseNumber, [Machine.ReleaseNumberKey] = item.ReleaseNumber,
[Models.Internal.Machine.NameKey] = item.Title, [Machine.NameKey] = item.Title,
[Models.Internal.Machine.SaveTypeKey] = item.SaveType, [Machine.SaveTypeKey] = item.SaveType,
[Models.Internal.Machine.PublisherKey] = item.Publisher, [Machine.PublisherKey] = item.Publisher,
[Models.Internal.Machine.LocationKey] = item.Location, [Machine.LocationKey] = item.Location,
[Models.Internal.Machine.SourceRomKey] = item.SourceRom, [Machine.SourceRomKey] = item.SourceRom,
[Models.Internal.Machine.LanguageKey] = item.Language, [Machine.LanguageKey] = item.Language,
[Models.Internal.Machine.Im1CRCKey] = item.Im1CRC, [Machine.Im1CRCKey] = item.Im1CRC,
[Models.Internal.Machine.Im2CRCKey] = item.Im2CRC, [Machine.Im2CRCKey] = item.Im2CRC,
[Models.Internal.Machine.CommentKey] = item.Comment, [Machine.CommentKey] = item.Comment,
[Models.Internal.Machine.DuplicateIDKey] = item.DuplicateID, [Machine.DuplicateIDKey] = item.DuplicateID,
}; };
if (item.Files?.RomCRC != null && item.Files.RomCRC.Any()) if (item.Files?.RomCRC != null && item.Files.RomCRC.Any())
{ {
var roms = new List<Models.Internal.Rom>(); var roms = new List<Rom>();
foreach (var file in item.Files.RomCRC) foreach (var file in item.Files.RomCRC)
{ {
var rom = ConvertFromOfflineList(file); var rom = ConvertFromOfflineList(file);
rom[Models.Internal.Rom.SizeKey] = item.RomSize; rom[Rom.SizeKey] = item.RomSize;
roms.Add(rom); roms.Add(rom);
} }
machine[Models.Internal.Machine.RomKey] = roms.ToArray(); machine[Machine.RomKey] = roms.ToArray();
} }
return machine; return machine;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.OfflineList.Files"/> to an array of <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.OfflineList.Files"/> to an array of <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom[] ConvertFromOfflineList(Models.OfflineList.Files item) public static Rom[] ConvertFromOfflineList(Models.OfflineList.Files item)
{ {
var roms = new List<Models.Internal.Rom>(); var roms = new List<Rom>();
foreach (var romCRC in item.RomCRC) foreach (var romCRC in item.RomCRC)
{ {
roms.Add(ConvertFromOfflineList(romCRC)); roms.Add(ConvertFromOfflineList(romCRC));
@@ -93,14 +94,14 @@ namespace SabreTools.Serialization
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.OfflineList.FileRomCRC"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.OfflineList.FileRomCRC"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromOfflineList(Models.OfflineList.FileRomCRC item) public static Rom ConvertFromOfflineList(Models.OfflineList.FileRomCRC item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.ExtensionKey] = item.Extension, [Rom.ExtensionKey] = item.Extension,
[Models.Internal.Rom.CRCKey] = item.Content, [Rom.CRCKey] = item.Content,
}; };
return rom; return rom;
} }
@@ -110,51 +111,51 @@ namespace SabreTools.Serialization
#region Deserialize #region Deserialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Header"/> to <cref="Models.OfflineList.Dat"/> /// Convert from <cref="Header"/> to <cref="Models.OfflineList.Dat"/>
/// </summary> /// </summary>
public static Models.OfflineList.Dat? ConvertHeaderToOfflineList(Models.Internal.Header? item) public static Models.OfflineList.Dat? ConvertHeaderToOfflineList(Header? item)
{ {
if (item == null) if (item == null)
return null; return null;
var dat = new Models.OfflineList.Dat var dat = new Models.OfflineList.Dat
{ {
NoNamespaceSchemaLocation = item.ReadString(Models.Internal.Header.NoNamespaceSchemaLocationKey), NoNamespaceSchemaLocation = item.ReadString(Header.NoNamespaceSchemaLocationKey),
}; };
if (item.ContainsKey(Models.Internal.Header.NameKey) if (item.ContainsKey(Header.NameKey)
|| item.ContainsKey(Models.Internal.Header.ImFolderKey) || item.ContainsKey(Header.ImFolderKey)
|| item.ContainsKey(Models.Internal.Header.DatVersionKey) || item.ContainsKey(Header.DatVersionKey)
|| item.ContainsKey(Models.Internal.Header.SystemKey) || item.ContainsKey(Header.SystemKey)
|| item.ContainsKey(Models.Internal.Header.ScreenshotsWidthKey) || item.ContainsKey(Header.ScreenshotsWidthKey)
|| item.ContainsKey(Models.Internal.Header.ScreenshotsHeightKey) || item.ContainsKey(Header.ScreenshotsHeightKey)
|| item.ContainsKey(Models.Internal.Header.InfosKey) || item.ContainsKey(Header.InfosKey)
|| item.ContainsKey(Models.Internal.Header.CanOpenKey) || item.ContainsKey(Header.CanOpenKey)
|| item.ContainsKey(Models.Internal.Header.NewDatKey) || item.ContainsKey(Header.NewDatKey)
|| item.ContainsKey(Models.Internal.Header.SearchKey) || item.ContainsKey(Header.SearchKey)
|| item.ContainsKey(Models.Internal.Header.RomTitleKey)) || item.ContainsKey(Header.RomTitleKey))
{ {
dat.Configuration = new Models.OfflineList.Configuration dat.Configuration = new Models.OfflineList.Configuration
{ {
DatName = item.ReadString(Models.Internal.Header.NameKey), DatName = item.ReadString(Header.NameKey),
ImFolder = item.ReadString(Models.Internal.Header.ImFolderKey), ImFolder = item.ReadString(Header.ImFolderKey),
DatVersion = item.ReadString(Models.Internal.Header.DatVersionKey), DatVersion = item.ReadString(Header.DatVersionKey),
System = item.ReadString(Models.Internal.Header.SystemKey), System = item.ReadString(Header.SystemKey),
ScreenshotsWidth = item.ReadString(Models.Internal.Header.ScreenshotsWidthKey), ScreenshotsWidth = item.ReadString(Header.ScreenshotsWidthKey),
ScreenshotsHeight = item.ReadString(Models.Internal.Header.ScreenshotsHeightKey), ScreenshotsHeight = item.ReadString(Header.ScreenshotsHeightKey),
Infos = item.Read<Models.OfflineList.Infos>(Models.Internal.Header.InfosKey), Infos = item.Read<Models.OfflineList.Infos>(Header.InfosKey),
CanOpen = item.Read<Models.OfflineList.CanOpen>(Models.Internal.Header.CanOpenKey), CanOpen = item.Read<Models.OfflineList.CanOpen>(Header.CanOpenKey),
NewDat = item.Read<Models.OfflineList.NewDat>(Models.Internal.Header.NewDatKey), NewDat = item.Read<Models.OfflineList.NewDat>(Header.NewDatKey),
Search = item.Read<Models.OfflineList.Search>(Models.Internal.Header.SearchKey), Search = item.Read<Models.OfflineList.Search>(Header.SearchKey),
RomTitle = item.ReadString(Models.Internal.Header.RomTitleKey), RomTitle = item.ReadString(Header.RomTitleKey),
}; };
} }
if (item.ContainsKey(Models.Internal.Header.ImagesKey)) if (item.ContainsKey(Header.ImagesKey))
{ {
dat.GUI = new Models.OfflineList.GUI dat.GUI = new Models.OfflineList.GUI
{ {
Images = item.Read<Models.OfflineList.Images>(Models.Internal.Header.ImagesKey), Images = item.Read<Models.OfflineList.Images>(Header.ImagesKey),
}; };
} }
@@ -162,32 +163,32 @@ namespace SabreTools.Serialization
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Machine"/> to <cref="Models.OfflineList.Game"/> /// Convert from <cref="Machine"/> to <cref="Models.OfflineList.Game"/>
/// </summary> /// </summary>
public static Models.OfflineList.Game? ConvertMachineToOfflineList(Models.Internal.Machine? item) public static Models.OfflineList.Game? ConvertMachineToOfflineList(Machine? item)
{ {
if (item == null) if (item == null)
return null; return null;
var game = new Models.OfflineList.Game var game = new Models.OfflineList.Game
{ {
ImageNumber = item.ReadString(Models.Internal.Machine.ImageNumberKey), ImageNumber = item.ReadString(Machine.ImageNumberKey),
ReleaseNumber = item.ReadString(Models.Internal.Machine.ReleaseNumberKey), ReleaseNumber = item.ReadString(Machine.ReleaseNumberKey),
Title = item.ReadString(Models.Internal.Machine.NameKey), Title = item.ReadString(Machine.NameKey),
SaveType = item.ReadString(Models.Internal.Machine.SaveTypeKey), SaveType = item.ReadString(Machine.SaveTypeKey),
Publisher = item.ReadString(Models.Internal.Machine.PublisherKey), Publisher = item.ReadString(Machine.PublisherKey),
Location = item.ReadString(Models.Internal.Machine.LocationKey), Location = item.ReadString(Machine.LocationKey),
SourceRom = item.ReadString(Models.Internal.Machine.SourceRomKey), SourceRom = item.ReadString(Machine.SourceRomKey),
Language = item.ReadString(Models.Internal.Machine.LanguageKey), Language = item.ReadString(Machine.LanguageKey),
Im1CRC = item.ReadString(Models.Internal.Machine.Im1CRCKey), Im1CRC = item.ReadString(Machine.Im1CRCKey),
Im2CRC = item.ReadString(Models.Internal.Machine.Im2CRCKey), Im2CRC = item.ReadString(Machine.Im2CRCKey),
Comment = item.ReadString(Models.Internal.Machine.CommentKey), Comment = item.ReadString(Machine.CommentKey),
DuplicateID = item.ReadString(Models.Internal.Machine.DuplicateIDKey), DuplicateID = item.ReadString(Machine.DuplicateIDKey),
}; };
var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey); var roms = item.Read<Rom[]>(Machine.RomKey);
game.RomSize = roms? game.RomSize = roms?
.Select(rom => rom.ReadString(Models.Internal.Rom.SizeKey))? .Select(rom => rom.ReadString(Rom.SizeKey))?
.FirstOrDefault(s => s != null); .FirstOrDefault(s => s != null);
var romCRCs = roms?.Select(ConvertToOfflineList).ToArray(); var romCRCs = roms?.Select(ConvertToOfflineList).ToArray();
game.Files = new Models.OfflineList.Files { RomCRC = romCRCs }; game.Files = new Models.OfflineList.Files { RomCRC = romCRCs };
@@ -196,17 +197,17 @@ namespace SabreTools.Serialization
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.OfflineList.FileRomCRC"/> /// Convert from <cref="Rom"/> to <cref="Models.OfflineList.FileRomCRC"/>
/// </summary> /// </summary>
private static Models.OfflineList.FileRomCRC? ConvertToOfflineList(Models.Internal.Rom? item) private static Models.OfflineList.FileRomCRC? ConvertToOfflineList(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var fileRomCRC = new Models.OfflineList.FileRomCRC var fileRomCRC = new Models.OfflineList.FileRomCRC
{ {
Extension = item.ReadString(Models.Internal.Rom.ExtensionKey), Extension = item.ReadString(Rom.ExtensionKey),
Content = item.ReadString(Models.Internal.Rom.CRCKey), Content = item.ReadString(Rom.CRCKey),
}; };
return fileRomCRC; return fileRomCRC;
} }

View File

@@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using SabreTools.Models.Internal;
namespace SabreTools.Serialization namespace SabreTools.Serialization
{ {
@@ -11,67 +12,67 @@ namespace SabreTools.Serialization
#region Serialize #region Serialize
/// <summary> /// <summary>
/// Convert from <cref="Models.OpenMSX.SoftwareDb"/> to <cref="Models.Internal.Header"/> /// Convert from <cref="Models.OpenMSX.SoftwareDb"/> to <cref="Header"/>
/// </summary> /// </summary>
public static Models.Internal.Header ConvertHeaderFromOpenMSX(Models.OpenMSX.SoftwareDb item) public static Header ConvertHeaderFromOpenMSX(Models.OpenMSX.SoftwareDb item)
{ {
var header = new Models.Internal.Header var header = new Header
{ {
[Models.Internal.Header.TimestampKey] = item.Timestamp, [Header.TimestampKey] = item.Timestamp,
}; };
return header; return header;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.OpenMSX.Software"/> to <cref="Models.Internal.Machine"/> /// Convert from <cref="Models.OpenMSX.Software"/> to <cref="Machine"/>
/// </summary> /// </summary>
public static Models.Internal.Machine ConvertMachineFromOpenMSX(Models.OpenMSX.Software item) public static Machine ConvertMachineFromOpenMSX(Models.OpenMSX.Software item)
{ {
var machine = new Models.Internal.Machine var machine = new Machine
{ {
[Models.Internal.Machine.NameKey] = item.Title, [Machine.NameKey] = item.Title,
[Models.Internal.Machine.GenMSXIDKey] = item.GenMSXID, [Machine.GenMSXIDKey] = item.GenMSXID,
[Models.Internal.Machine.SystemKey] = item.System, [Machine.SystemKey] = item.System,
[Models.Internal.Machine.CompanyKey] = item.Company, [Machine.CompanyKey] = item.Company,
[Models.Internal.Machine.YearKey] = item.Year, [Machine.YearKey] = item.Year,
[Models.Internal.Machine.CountryKey] = item.Country, [Machine.CountryKey] = item.Country,
}; };
if (item.Dump != null && item.Dump.Any()) if (item.Dump != null && item.Dump.Any())
{ {
var dumps = new List<Models.Internal.Dump>(); var dumps = new List<Dump>();
foreach (var dump in item.Dump) foreach (var dump in item.Dump)
{ {
dumps.Add(ConvertFromOpenMSX(dump)); dumps.Add(ConvertFromOpenMSX(dump));
} }
machine[Models.Internal.Machine.DumpKey] = dumps.ToArray(); machine[Machine.DumpKey] = dumps.ToArray();
} }
return machine; return machine;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.OpenMSX.Dump"/> to <cref="Models.Internal.Dump"/> /// Convert from <cref="Models.OpenMSX.Dump"/> to <cref="Dump"/>
/// </summary> /// </summary>
public static Models.Internal.Dump ConvertFromOpenMSX(Models.OpenMSX.Dump item) public static Dump ConvertFromOpenMSX(Models.OpenMSX.Dump item)
{ {
var dump = new Models.Internal.Dump(); var dump = new Dump();
if (item.Original != null) if (item.Original != null)
dump[Models.Internal.Dump.OriginalKey] = ConvertFromOpenMSX(item.Original); dump[Dump.OriginalKey] = ConvertFromOpenMSX(item.Original);
switch (item.Rom) switch (item.Rom)
{ {
case Models.OpenMSX.Rom rom: case Models.OpenMSX.Rom rom:
dump[Models.Internal.Dump.RomKey] = ConvertFromOpenMSX(rom); dump[Dump.RomKey] = ConvertFromOpenMSX(rom);
break; break;
case Models.OpenMSX.MegaRom megaRom: case Models.OpenMSX.MegaRom megaRom:
dump[Models.Internal.Dump.MegaRomKey] = ConvertFromOpenMSX(megaRom); dump[Dump.MegaRomKey] = ConvertFromOpenMSX(megaRom);
break; break;
case Models.OpenMSX.SCCPlusCart sccPlusCart: case Models.OpenMSX.SCCPlusCart sccPlusCart:
dump[Models.Internal.Dump.SCCPlusCartKey] = ConvertFromOpenMSX(sccPlusCart); dump[Dump.SCCPlusCartKey] = ConvertFromOpenMSX(sccPlusCart);
break; break;
} }
@@ -79,29 +80,29 @@ namespace SabreTools.Serialization
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.OpenMSX.Original"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.OpenMSX.Original"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Original ConvertFromOpenMSX(Models.OpenMSX.Original item) public static Original ConvertFromOpenMSX(Models.OpenMSX.Original item)
{ {
var original = new Models.Internal.Original var original = new Original
{ {
[Models.Internal.Original.ValueKey] = item.Value, [Original.ValueKey] = item.Value,
[Models.Internal.Original.ContentKey] = item.Content, [Original.ContentKey] = item.Content,
}; };
return original; return original;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.OpenMSX.RomBase"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.OpenMSX.RomBase"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromOpenMSX(Models.OpenMSX.RomBase item) public static Rom ConvertFromOpenMSX(Models.OpenMSX.RomBase item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.StartKey] = item.Start, [Rom.StartKey] = item.Start,
[Models.Internal.Rom.TypeKey] = item.Type, [Rom.TypeKey] = item.Type,
[Models.Internal.Rom.SHA1Key] = item.Hash, [Rom.SHA1Key] = item.Hash,
[Models.Internal.Rom.RemarkKey] = item.Remark, [Rom.RemarkKey] = item.Remark,
}; };
return rom; return rom;
} }
@@ -111,135 +112,135 @@ namespace SabreTools.Serialization
#region Deserialize #region Deserialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Header"/> to <cref="Models.OpenMSX.SoftwareDb"/> /// Convert from <cref="Header"/> to <cref="Models.OpenMSX.SoftwareDb"/>
/// </summary> /// </summary>
public static Models.OpenMSX.SoftwareDb? ConvertHeaderToOpenMSX(Models.Internal.Header? item) public static Models.OpenMSX.SoftwareDb? ConvertHeaderToOpenMSX(Header? item)
{ {
if (item == null) if (item == null)
return null; return null;
var softwareDb = new Models.OpenMSX.SoftwareDb var softwareDb = new Models.OpenMSX.SoftwareDb
{ {
Timestamp = item.ReadString(Models.Internal.Header.TimestampKey), Timestamp = item.ReadString(Header.TimestampKey),
}; };
return softwareDb; return softwareDb;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Machine"/> to <cref="Models.OpenMSX.Software"/> /// Convert from <cref="Machine"/> to <cref="Models.OpenMSX.Software"/>
/// </summary> /// </summary>
public static Models.OpenMSX.Software? ConvertMachineToOpenMSX(Models.Internal.Machine? item) public static Models.OpenMSX.Software? ConvertMachineToOpenMSX(Machine? item)
{ {
if (item == null) if (item == null)
return null; return null;
var game = new Models.OpenMSX.Software var game = new Models.OpenMSX.Software
{ {
Title = item.ReadString(Models.Internal.Machine.NameKey), Title = item.ReadString(Machine.NameKey),
GenMSXID = item.ReadString(Models.Internal.Machine.GenMSXIDKey), GenMSXID = item.ReadString(Machine.GenMSXIDKey),
System = item.ReadString(Models.Internal.Machine.SystemKey), System = item.ReadString(Machine.SystemKey),
Company = item.ReadString(Models.Internal.Machine.CompanyKey), Company = item.ReadString(Machine.CompanyKey),
Year = item.ReadString(Models.Internal.Machine.YearKey), Year = item.ReadString(Machine.YearKey),
Country = item.ReadString(Models.Internal.Machine.CountryKey), Country = item.ReadString(Machine.CountryKey),
}; };
var dumps = item.Read<Models.Internal.Dump[]>(Models.Internal.Machine.DumpKey); var dumps = item.Read<Dump[]>(Machine.DumpKey);
game.Dump = dumps?.Select(ConvertToOpenMSX)?.ToArray(); game.Dump = dumps?.Select(ConvertToOpenMSX)?.ToArray();
return game; return game;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Dump"/> to <cref="Models.OpenMSX.Dump"/> /// Convert from <cref="Dump"/> to <cref="Models.OpenMSX.Dump"/>
/// </summary> /// </summary>
private static Models.OpenMSX.Dump? ConvertToOpenMSX(Models.Internal.Dump? item) private static Models.OpenMSX.Dump? ConvertToOpenMSX(Dump? item)
{ {
if (item == null) if (item == null)
return null; return null;
var dump = new Models.OpenMSX.Dump(); var dump = new Models.OpenMSX.Dump();
var original = item.Read<Models.Internal.Original>(Models.Internal.Dump.OriginalKey); var original = item.Read<Original>(Dump.OriginalKey);
dump.Original = ConvertToOpenMSX(original); dump.Original = ConvertToOpenMSX(original);
var rom = item.Read<Models.Internal.Rom>(Models.Internal.Dump.RomKey); var rom = item.Read<Rom>(Dump.RomKey);
dump.Rom = ConvertToOpenMSXRom(rom); dump.Rom = ConvertToOpenMSXRom(rom);
var megaRom = item.Read<Models.Internal.Rom>(Models.Internal.Dump.MegaRomKey); var megaRom = item.Read<Rom>(Dump.MegaRomKey);
dump.Rom = ConvertToOpenMSXMegaRom(megaRom); dump.Rom = ConvertToOpenMSXMegaRom(megaRom);
var sccPlusCart = item.Read<Models.Internal.Rom>(Models.Internal.Dump.SCCPlusCartKey); var sccPlusCart = item.Read<Rom>(Dump.SCCPlusCartKey);
dump.Rom = ConvertToOpenMSXSCCPlusCart(sccPlusCart); dump.Rom = ConvertToOpenMSXSCCPlusCart(sccPlusCart);
return dump; return dump;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.OpenMSX.MegaRom"/> /// Convert from <cref="Rom"/> to <cref="Models.OpenMSX.MegaRom"/>
/// </summary> /// </summary>
private static Models.OpenMSX.MegaRom? ConvertToOpenMSXMegaRom(Models.Internal.Rom? item) private static Models.OpenMSX.MegaRom? ConvertToOpenMSXMegaRom(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var megaRom = new Models.OpenMSX.MegaRom var megaRom = new Models.OpenMSX.MegaRom
{ {
Start = item.ReadString(Models.Internal.Rom.StartKey), Start = item.ReadString(Rom.StartKey),
Type = item.ReadString(Models.Internal.Rom.TypeKey), Type = item.ReadString(Rom.TypeKey),
Hash = item.ReadString(Models.Internal.Rom.SHA1Key), Hash = item.ReadString(Rom.SHA1Key),
Remark = item.ReadString(Models.Internal.Rom.RemarkKey), Remark = item.ReadString(Rom.RemarkKey),
}; };
return megaRom; return megaRom;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Original"/> to <cref="Models.OpenMSX.Original"/> /// Convert from <cref="Original"/> to <cref="Models.OpenMSX.Original"/>
/// </summary> /// </summary>
private static Models.OpenMSX.Original? ConvertToOpenMSX(Models.Internal.Original? item) private static Models.OpenMSX.Original? ConvertToOpenMSX(Original? item)
{ {
if (item == null) if (item == null)
return null; return null;
var original = new Models.OpenMSX.Original var original = new Models.OpenMSX.Original
{ {
Value = item.ReadString(Models.Internal.Original.ValueKey), Value = item.ReadString(Original.ValueKey),
Content = item.ReadString(Models.Internal.Original.ContentKey), Content = item.ReadString(Original.ContentKey),
}; };
return original; return original;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.OpenMSX.Rom"/> /// Convert from <cref="Rom"/> to <cref="Models.OpenMSX.Rom"/>
/// </summary> /// </summary>
private static Models.OpenMSX.Rom? ConvertToOpenMSXRom(Models.Internal.Rom? item) private static Models.OpenMSX.Rom? ConvertToOpenMSXRom(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var rom = new Models.OpenMSX.Rom var rom = new Models.OpenMSX.Rom
{ {
Start = item.ReadString(Models.Internal.Rom.StartKey), Start = item.ReadString(Rom.StartKey),
Type = item.ReadString(Models.Internal.Rom.TypeKey), Type = item.ReadString(Rom.TypeKey),
Hash = item.ReadString(Models.Internal.Rom.SHA1Key), Hash = item.ReadString(Rom.SHA1Key),
Remark = item.ReadString(Models.Internal.Rom.RemarkKey), Remark = item.ReadString(Rom.RemarkKey),
}; };
return rom; return rom;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.OpenMSX.SCCPlusCart"/> /// Convert from <cref="Rom"/> to <cref="Models.OpenMSX.SCCPlusCart"/>
/// </summary> /// </summary>
private static Models.OpenMSX.SCCPlusCart? ConvertToOpenMSXSCCPlusCart(Models.Internal.Rom? item) private static Models.OpenMSX.SCCPlusCart? ConvertToOpenMSXSCCPlusCart(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var sccPlusCart = new Models.OpenMSX.SCCPlusCart var sccPlusCart = new Models.OpenMSX.SCCPlusCart
{ {
Start = item.ReadString(Models.Internal.Rom.StartKey), Start = item.ReadString(Rom.StartKey),
Type = item.ReadString(Models.Internal.Rom.TypeKey), Type = item.ReadString(Rom.TypeKey),
Hash = item.ReadString(Models.Internal.Rom.SHA1Key), Hash = item.ReadString(Rom.SHA1Key),
Remark = item.ReadString(Models.Internal.Rom.RemarkKey), Remark = item.ReadString(Rom.RemarkKey),
}; };
return sccPlusCart; return sccPlusCart;
} }

View File

@@ -1,4 +1,5 @@
using System.Linq; using System.Linq;
using SabreTools.Models.Internal;
namespace SabreTools.Serialization namespace SabreTools.Serialization
{ {
@@ -10,71 +11,71 @@ namespace SabreTools.Serialization
#region Serialize #region Serialize
/// <summary> /// <summary>
/// Convert from <cref="Models.RomCenter.MetadataFile"/> to <cref="Models.Internal.Header"/> /// Convert from <cref="Models.RomCenter.MetadataFile"/> to <cref="Header"/>
/// </summary> /// </summary>
public static Models.Internal.Header ConvertHeaderFromRomCenter(Models.RomCenter.MetadataFile item) public static Header ConvertHeaderFromRomCenter(Models.RomCenter.MetadataFile item)
{ {
var header = new Models.Internal.Header(); var header = new Header();
if (item.Credits != null) if (item.Credits != null)
{ {
header[Models.Internal.Header.AuthorKey] = item.Credits.Author; header[Header.AuthorKey] = item.Credits.Author;
header[Models.Internal.Header.VersionKey] = item.Credits.Version; header[Header.VersionKey] = item.Credits.Version;
header[Models.Internal.Header.EmailKey] = item.Credits.Email; header[Header.EmailKey] = item.Credits.Email;
header[Models.Internal.Header.HomepageKey] = item.Credits.Homepage; header[Header.HomepageKey] = item.Credits.Homepage;
header[Models.Internal.Header.UrlKey] = item.Credits.Url; header[Header.UrlKey] = item.Credits.Url;
header[Models.Internal.Header.DateKey] = item.Credits.Date; header[Header.DateKey] = item.Credits.Date;
header[Models.Internal.Header.CommentKey] = item.Credits.Comment; header[Header.CommentKey] = item.Credits.Comment;
} }
if (item.Dat != null) if (item.Dat != null)
{ {
header[Models.Internal.Header.DatVersionKey] = item.Dat.Version; header[Header.DatVersionKey] = item.Dat.Version;
header[Models.Internal.Header.PluginKey] = item.Dat.Plugin; header[Header.PluginKey] = item.Dat.Plugin;
if (item.Dat.Split == "yes" || item.Dat.Split == "1") if (item.Dat.Split == "yes" || item.Dat.Split == "1")
header[Models.Internal.Header.ForceMergingKey] = "split"; header[Header.ForceMergingKey] = "split";
else if (item.Dat.Merge == "yes" || item.Dat.Merge == "1") else if (item.Dat.Merge == "yes" || item.Dat.Merge == "1")
header[Models.Internal.Header.ForceMergingKey] = "merge"; header[Header.ForceMergingKey] = "merge";
} }
if (item.Emulator != null) if (item.Emulator != null)
{ {
header[Models.Internal.Header.RefNameKey] = item.Emulator.RefName; header[Header.RefNameKey] = item.Emulator.RefName;
header[Models.Internal.Header.EmulatorVersionKey] = item.Emulator.Version; header[Header.EmulatorVersionKey] = item.Emulator.Version;
} }
return header; return header;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.RomCenter.Game"/> to <cref="Models.Internal.Machine"/> /// Convert from <cref="Models.RomCenter.Game"/> to <cref="Machine"/>
/// </summary> /// </summary>
public static Models.Internal.Machine ConvertMachineFromRomCenter(Models.RomCenter.Rom item) public static Machine ConvertMachineFromRomCenter(Models.RomCenter.Rom item)
{ {
var machine = new Models.Internal.Machine var machine = new Machine
{ {
[Models.Internal.Machine.RomOfKey] = item.ParentName, [Machine.RomOfKey] = item.ParentName,
//[Models.Internal.Machine.ParentDescriptionKey] = item.ParentDescription, // This is unmappable //[Machine.ParentDescriptionKey] = item.ParentDescription, // This is unmappable
[Models.Internal.Machine.NameKey] = item.GameName, [Machine.NameKey] = item.GameName,
[Models.Internal.Machine.DescriptionKey] = item.GameDescription, [Machine.DescriptionKey] = item.GameDescription,
[Models.Internal.Machine.RomKey] = new Models.Internal.Rom[] { ConvertFromRomCenter(item) }, [Machine.RomKey] = new Rom[] { ConvertFromRomCenter(item) },
}; };
return machine; return machine;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.RomCenter.Rom"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.RomCenter.Rom"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromRomCenter(Models.RomCenter.Rom item) public static Rom ConvertFromRomCenter(Models.RomCenter.Rom item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.NameKey] = item.RomName, [Rom.NameKey] = item.RomName,
[Models.Internal.Rom.CRCKey] = item.RomCRC, [Rom.CRCKey] = item.RomCRC,
[Models.Internal.Rom.SizeKey] = item.RomSize, [Rom.SizeKey] = item.RomSize,
[Models.Internal.Rom.MergeKey] = item.MergeName, [Rom.MergeKey] = item.MergeName,
}; };
return rom; return rom;
} }
@@ -84,55 +85,55 @@ namespace SabreTools.Serialization
#region Deserialize #region Deserialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Header"/> to <cref="Models.RomCenter.MetadataFile"/> /// Convert from <cref="Header"/> to <cref="Models.RomCenter.MetadataFile"/>
/// </summary> /// </summary>
public static Models.RomCenter.MetadataFile? ConvertHeaderToRomCenter(Models.Internal.Header? item) public static Models.RomCenter.MetadataFile? ConvertHeaderToRomCenter(Header? item)
{ {
if (item == null) if (item == null)
return null; return null;
var metadataFile = new Models.RomCenter.MetadataFile(); var metadataFile = new Models.RomCenter.MetadataFile();
if (item.ContainsKey(Models.Internal.Header.AuthorKey) if (item.ContainsKey(Header.AuthorKey)
|| item.ContainsKey(Models.Internal.Header.VersionKey) || item.ContainsKey(Header.VersionKey)
|| item.ContainsKey(Models.Internal.Header.EmailKey) || item.ContainsKey(Header.EmailKey)
|| item.ContainsKey(Models.Internal.Header.HomepageKey) || item.ContainsKey(Header.HomepageKey)
|| item.ContainsKey(Models.Internal.Header.UrlKey) || item.ContainsKey(Header.UrlKey)
|| item.ContainsKey(Models.Internal.Header.DateKey) || item.ContainsKey(Header.DateKey)
|| item.ContainsKey(Models.Internal.Header.CommentKey)) || item.ContainsKey(Header.CommentKey))
{ {
metadataFile.Credits = new Models.RomCenter.Credits metadataFile.Credits = new Models.RomCenter.Credits
{ {
Author = item.ReadString(Models.Internal.Header.AuthorKey), Author = item.ReadString(Header.AuthorKey),
Version = item.ReadString(Models.Internal.Header.VersionKey), Version = item.ReadString(Header.VersionKey),
Email = item.ReadString(Models.Internal.Header.EmailKey), Email = item.ReadString(Header.EmailKey),
Homepage = item.ReadString(Models.Internal.Header.HomepageKey), Homepage = item.ReadString(Header.HomepageKey),
Url = item.ReadString(Models.Internal.Header.UrlKey), Url = item.ReadString(Header.UrlKey),
Date = item.ReadString(Models.Internal.Header.DateKey), Date = item.ReadString(Header.DateKey),
Comment = item.ReadString(Models.Internal.Header.CommentKey), Comment = item.ReadString(Header.CommentKey),
}; };
} }
if (item.ContainsKey(Models.Internal.Header.DatVersionKey) if (item.ContainsKey(Header.DatVersionKey)
|| item.ContainsKey(Models.Internal.Header.PluginKey) || item.ContainsKey(Header.PluginKey)
|| item.ContainsKey(Models.Internal.Header.ForceMergingKey)) || item.ContainsKey(Header.ForceMergingKey))
{ {
metadataFile.Dat = new Models.RomCenter.Dat metadataFile.Dat = new Models.RomCenter.Dat
{ {
Version = item.ReadString(Models.Internal.Header.DatVersionKey), Version = item.ReadString(Header.DatVersionKey),
Plugin = item.ReadString(Models.Internal.Header.PluginKey), Plugin = item.ReadString(Header.PluginKey),
Split = item.ReadString(Models.Internal.Header.ForceMergingKey) == "split" ? "yes" : "no", Split = item.ReadString(Header.ForceMergingKey) == "split" ? "yes" : "no",
Merge = item.ReadString(Models.Internal.Header.ForceMergingKey) == "merge" ? "yes" : "no", Merge = item.ReadString(Header.ForceMergingKey) == "merge" ? "yes" : "no",
}; };
} }
if (item.ContainsKey(Models.Internal.Header.RefNameKey) if (item.ContainsKey(Header.RefNameKey)
|| item.ContainsKey(Models.Internal.Header.EmulatorVersionKey)) || item.ContainsKey(Header.EmulatorVersionKey))
{ {
metadataFile.Emulator = new Models.RomCenter.Emulator metadataFile.Emulator = new Models.RomCenter.Emulator
{ {
RefName = item.ReadString(Models.Internal.Header.RefNameKey), RefName = item.ReadString(Header.RefNameKey),
Version = item.ReadString(Models.Internal.Header.EmulatorVersionKey), Version = item.ReadString(Header.EmulatorVersionKey),
}; };
} }
@@ -140,36 +141,36 @@ namespace SabreTools.Serialization
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Machine"/> to an array of <cref="Models.RomCenter.Rom"/> /// Convert from <cref="Machine"/> to an array of <cref="Models.RomCenter.Rom"/>
/// </summary> /// </summary>
public static Models.RomCenter.Rom?[]? ConvertMachineToRomCenter(Models.Internal.Machine? item) public static Models.RomCenter.Rom?[]? ConvertMachineToRomCenter(Machine? item)
{ {
if (item == null) if (item == null)
return null; return null;
var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey); var roms = item.Read<Rom[]>(Machine.RomKey);
return roms?.Select(rom => ConvertToRomCenter(rom, item))?.ToArray(); return roms?.Select(rom => ConvertToRomCenter(rom, item))?.ToArray();
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.RomCenter.Rom"/> /// Convert from <cref="Rom"/> to <cref="Models.RomCenter.Rom"/>
/// </summary> /// </summary>
private static Models.RomCenter.Rom? ConvertToRomCenter(Models.Internal.Rom? item, Models.Internal.Machine? parent) private static Models.RomCenter.Rom? ConvertToRomCenter(Rom? item, Machine? parent)
{ {
if (item == null) if (item == null)
return null; return null;
var row = new Models.RomCenter.Rom var row = new Models.RomCenter.Rom
{ {
RomName = item.ReadString(Models.Internal.Rom.NameKey), RomName = item.ReadString(Rom.NameKey),
RomCRC = item.ReadString(Models.Internal.Rom.CRCKey), RomCRC = item.ReadString(Rom.CRCKey),
RomSize = item.ReadString(Models.Internal.Rom.SizeKey), RomSize = item.ReadString(Rom.SizeKey),
MergeName = item.ReadString(Models.Internal.Rom.MergeKey), MergeName = item.ReadString(Rom.MergeKey),
ParentName = parent?.ReadString(Models.Internal.Machine.RomOfKey), ParentName = parent?.ReadString(Machine.RomOfKey),
//ParentDescription = parent?.ReadString(Models.Internal.Machine.ParentDescriptionKey), // This is unmappable //ParentDescription = parent?.ReadString(Machine.ParentDescriptionKey), // This is unmappable
GameName = parent?.ReadString(Models.Internal.Machine.NameKey), GameName = parent?.ReadString(Machine.NameKey),
GameDescription = parent?.ReadString(Models.Internal.Machine.DescriptionKey), GameDescription = parent?.ReadString(Machine.DescriptionKey),
}; };
return row; return row;
} }

View File

@@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using SabreTools.Models.Internal;
namespace SabreTools.Serialization namespace SabreTools.Serialization
{ {
@@ -11,50 +12,50 @@ namespace SabreTools.Serialization
#region Serialize #region Serialize
/// <summary> /// <summary>
/// Convert from <cref="Models.SeparatedValue.MetadataFile"/> to <cref="Models.Internal.Header"/> /// Convert from <cref="Models.SeparatedValue.MetadataFile"/> to <cref="Header"/>
/// </summary> /// </summary>
public static Models.Internal.Header ConvertHeaderFromSeparatedValue(Models.SeparatedValue.MetadataFile item) public static Header ConvertHeaderFromSeparatedValue(Models.SeparatedValue.MetadataFile item)
{ {
var header = new Models.Internal.Header var header = new Header
{ {
[Models.Internal.Header.HeaderKey] = item.Header, [Header.HeaderKey] = item.Header,
}; };
if (item.Row != null && item.Row.Any()) if (item.Row != null && item.Row.Any())
{ {
var first = item.Row[0]; var first = item.Row[0];
//header[Models.Internal.Header.FileNameKey] = first.FileName; // Not possible to map //header[Header.FileNameKey] = first.FileName; // Not possible to map
header[Models.Internal.Header.NameKey] = first.FileName; header[Header.NameKey] = first.FileName;
header[Models.Internal.Header.DescriptionKey] = first.Description; header[Header.DescriptionKey] = first.Description;
} }
return header; return header;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.SeparatedValue.Row"/> to <cref="Models.Internal.Machine"/> /// Convert from <cref="Models.SeparatedValue.Row"/> to <cref="Machine"/>
/// </summary> /// </summary>
public static Models.Internal.Machine ConvertMachineFromSeparatedValue(Models.SeparatedValue.Row item) public static Machine ConvertMachineFromSeparatedValue(Models.SeparatedValue.Row item)
{ {
var machine = new Models.Internal.Machine var machine = new Machine
{ {
[Models.Internal.Machine.NameKey] = item.GameName, [Machine.NameKey] = item.GameName,
[Models.Internal.Machine.DescriptionKey] = item.GameDescription, [Machine.DescriptionKey] = item.GameDescription,
}; };
var datItem = ConvertFromSeparatedValue(item); var datItem = ConvertFromSeparatedValue(item);
switch (datItem) switch (datItem)
{ {
case Models.Internal.Disk disk: case Disk disk:
machine[Models.Internal.Machine.DiskKey] = new Models.Internal.Disk[] { disk }; machine[Machine.DiskKey] = new Disk[] { disk };
break; break;
case Models.Internal.Media media: case Media media:
machine[Models.Internal.Machine.MediaKey] = new Models.Internal.Media[] { media }; machine[Machine.MediaKey] = new Media[] { media };
break; break;
case Models.Internal.Rom rom: case Rom rom:
machine[Models.Internal.Machine.RomKey] = new Models.Internal.Rom[] { rom }; machine[Machine.RomKey] = new Rom[] { rom };
break; break;
} }
@@ -62,39 +63,39 @@ namespace SabreTools.Serialization
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.SeparatedValue.Row"/> to <cref="Models.Internal.DatItem"/> /// Convert from <cref="Models.SeparatedValue.Row"/> to <cref="DatItem"/>
/// </summary> /// </summary>
public static Models.Internal.DatItem? ConvertFromSeparatedValue(Models.SeparatedValue.Row item) public static DatItem? ConvertFromSeparatedValue(Models.SeparatedValue.Row item)
{ {
return item.Type switch return item.Type switch
{ {
"disk" => new Models.Internal.Disk "disk" => new Disk
{ {
[Models.Internal.Disk.NameKey] = item.DiskName, [Disk.NameKey] = item.DiskName,
[Models.Internal.Disk.MD5Key] = item.MD5, [Disk.MD5Key] = item.MD5,
[Models.Internal.Disk.SHA1Key] = item.SHA1, [Disk.SHA1Key] = item.SHA1,
[Models.Internal.Disk.StatusKey] = item.Status, [Disk.StatusKey] = item.Status,
}, },
"media" => new Models.Internal.Media "media" => new Media
{ {
[Models.Internal.Media.NameKey] = item.DiskName, [Media.NameKey] = item.DiskName,
[Models.Internal.Media.MD5Key] = item.MD5, [Media.MD5Key] = item.MD5,
[Models.Internal.Media.SHA1Key] = item.SHA1, [Media.SHA1Key] = item.SHA1,
[Models.Internal.Media.SHA256Key] = item.SHA256, [Media.SHA256Key] = item.SHA256,
[Models.Internal.Media.SpamSumKey] = item.SpamSum, [Media.SpamSumKey] = item.SpamSum,
}, },
"rom" => new Models.Internal.Rom "rom" => new Rom
{ {
[Models.Internal.Rom.NameKey] = item.RomName, [Rom.NameKey] = item.RomName,
[Models.Internal.Rom.SizeKey] = item.Size, [Rom.SizeKey] = item.Size,
[Models.Internal.Rom.CRCKey] = item.CRC, [Rom.CRCKey] = item.CRC,
[Models.Internal.Rom.MD5Key] = item.MD5, [Rom.MD5Key] = item.MD5,
[Models.Internal.Rom.SHA1Key] = item.SHA1, [Rom.SHA1Key] = item.SHA1,
[Models.Internal.Rom.SHA256Key] = item.SHA256, [Rom.SHA256Key] = item.SHA256,
[Models.Internal.Rom.SHA384Key] = item.SHA384, [Rom.SHA384Key] = item.SHA384,
[Models.Internal.Rom.SHA512Key] = item.SHA512, [Rom.SHA512Key] = item.SHA512,
[Models.Internal.Rom.SpamSumKey] = item.SpamSum, [Rom.SpamSumKey] = item.SpamSum,
[Models.Internal.Rom.StatusKey] = item.Status, [Rom.StatusKey] = item.Status,
}, },
_ => null, _ => null,
}; };
@@ -105,39 +106,39 @@ namespace SabreTools.Serialization
#region Deserialize #region Deserialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Header"/> to <cref="Models.SeparatedValue.MetadataFile"/> /// Convert from <cref="Header"/> to <cref="Models.SeparatedValue.MetadataFile"/>
/// </summary> /// </summary>
public static Models.SeparatedValue.MetadataFile? ConvertHeaderToSeparatedValue(Models.Internal.Header? item) public static Models.SeparatedValue.MetadataFile? ConvertHeaderToSeparatedValue(Header? item)
{ {
if (item == null) if (item == null)
return null; return null;
var metadataFile = new Models.SeparatedValue.MetadataFile var metadataFile = new Models.SeparatedValue.MetadataFile
{ {
Header = item.ReadStringArray(Models.Internal.Header.HeaderKey), Header = item.ReadStringArray(Header.HeaderKey),
}; };
return metadataFile; return metadataFile;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Machine"/> to an array of <cref="Models.SeparatedValue.Row"/> /// Convert from <cref="Machine"/> to an array of <cref="Models.SeparatedValue.Row"/>
/// </summary> /// </summary>
public static Models.SeparatedValue.Row[]? ConvertMachineToSeparatedValue(Models.Internal.Machine? item) public static Models.SeparatedValue.Row[]? ConvertMachineToSeparatedValue(Machine? item)
{ {
if (item == null) if (item == null)
return null; return null;
var rowItems = new List<Models.SeparatedValue.Row>(); var rowItems = new List<Models.SeparatedValue.Row>();
var disks = item.Read<Models.Internal.Disk[]>(Models.Internal.Machine.DiskKey); var disks = item.Read<Disk[]>(Machine.DiskKey);
if (disks != null) if (disks != null)
rowItems.AddRange(disks.Select(disk => ConvertToSeparatedValue(disk, item))); rowItems.AddRange(disks.Select(disk => ConvertToSeparatedValue(disk, item)));
var media = item.Read<Models.Internal.Media[]>(Models.Internal.Machine.MediaKey); var media = item.Read<Media[]>(Machine.MediaKey);
if (media != null) if (media != null)
rowItems.AddRange(media.Select(medium => ConvertToSeparatedValue(medium, item))); rowItems.AddRange(media.Select(medium => ConvertToSeparatedValue(medium, item)));
var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey); var roms = item.Read<Rom[]>(Machine.RomKey);
if (roms != null) if (roms != null)
rowItems.AddRange(roms.Select(rom => ConvertToSeparatedValue(rom, item))); rowItems.AddRange(roms.Select(rom => ConvertToSeparatedValue(rom, item)));
@@ -145,71 +146,71 @@ namespace SabreTools.Serialization
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Disk"/> to <cref="Models.SeparatedValue.Row"/> /// Convert from <cref="Disk"/> to <cref="Models.SeparatedValue.Row"/>
/// </summary> /// </summary>
private static Models.SeparatedValue.Row? ConvertToSeparatedValue(Models.Internal.Disk? item, Models.Internal.Machine? parent) private static Models.SeparatedValue.Row? ConvertToSeparatedValue(Disk? item, Machine? parent)
{ {
if (item == null) if (item == null)
return null; return null;
var row = new Models.SeparatedValue.Row var row = new Models.SeparatedValue.Row
{ {
GameName = parent?.ReadString(Models.Internal.Machine.NameKey), GameName = parent?.ReadString(Machine.NameKey),
Description = parent?.ReadString(Models.Internal.Machine.DescriptionKey), Description = parent?.ReadString(Machine.DescriptionKey),
Type = "disk", Type = "disk",
DiskName = item.ReadString(Models.Internal.Disk.NameKey), DiskName = item.ReadString(Disk.NameKey),
MD5 = item.ReadString(Models.Internal.Disk.MD5Key), MD5 = item.ReadString(Disk.MD5Key),
SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key), SHA1 = item.ReadString(Disk.SHA1Key),
Status = item.ReadString(Models.Internal.Disk.StatusKey), Status = item.ReadString(Disk.StatusKey),
}; };
return row; return row;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Media"/> to <cref="Models.SeparatedValue.Row"/> /// Convert from <cref="Media"/> to <cref="Models.SeparatedValue.Row"/>
/// </summary> /// </summary>
private static Models.SeparatedValue.Row? ConvertToSeparatedValue(Models.Internal.Media? item, Models.Internal.Machine? parent) private static Models.SeparatedValue.Row? ConvertToSeparatedValue(Media? item, Machine? parent)
{ {
if (item == null) if (item == null)
return null; return null;
var row = new Models.SeparatedValue.Row var row = new Models.SeparatedValue.Row
{ {
GameName = parent?.ReadString(Models.Internal.Machine.NameKey), GameName = parent?.ReadString(Machine.NameKey),
Description = parent?.ReadString(Models.Internal.Machine.DescriptionKey), Description = parent?.ReadString(Machine.DescriptionKey),
Type = "media", Type = "media",
DiskName = item.ReadString(Models.Internal.Media.NameKey), DiskName = item.ReadString(Media.NameKey),
MD5 = item.ReadString(Models.Internal.Media.MD5Key), MD5 = item.ReadString(Media.MD5Key),
SHA1 = item.ReadString(Models.Internal.Media.SHA1Key), SHA1 = item.ReadString(Media.SHA1Key),
SHA256 = item.ReadString(Models.Internal.Media.SHA256Key), SHA256 = item.ReadString(Media.SHA256Key),
SpamSum = item.ReadString(Models.Internal.Media.SpamSumKey), SpamSum = item.ReadString(Media.SpamSumKey),
}; };
return row; return row;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.SeparatedValue.Row"/> /// Convert from <cref="Rom"/> to <cref="Models.SeparatedValue.Row"/>
/// </summary> /// </summary>
private static Models.SeparatedValue.Row? ConvertToSeparatedValue(Models.Internal.Rom? item, Models.Internal.Machine? parent) private static Models.SeparatedValue.Row? ConvertToSeparatedValue(Rom? item, Machine? parent)
{ {
if (item == null) if (item == null)
return null; return null;
var row = new Models.SeparatedValue.Row var row = new Models.SeparatedValue.Row
{ {
GameName = parent?.ReadString(Models.Internal.Machine.NameKey), GameName = parent?.ReadString(Machine.NameKey),
Description = parent?.ReadString(Models.Internal.Machine.DescriptionKey), Description = parent?.ReadString(Machine.DescriptionKey),
Type = "rom", Type = "rom",
RomName = item.ReadString(Models.Internal.Rom.NameKey), RomName = item.ReadString(Rom.NameKey),
Size = item.ReadString(Models.Internal.Rom.SizeKey), Size = item.ReadString(Rom.SizeKey),
CRC = item.ReadString(Models.Internal.Rom.CRCKey), CRC = item.ReadString(Rom.CRCKey),
MD5 = item.ReadString(Models.Internal.Rom.MD5Key), MD5 = item.ReadString(Rom.MD5Key),
SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key), SHA1 = item.ReadString(Rom.SHA1Key),
SHA256 = item.ReadString(Models.Internal.Rom.SHA256Key), SHA256 = item.ReadString(Rom.SHA256Key),
SHA384 = item.ReadString(Models.Internal.Rom.SHA384Key), SHA384 = item.ReadString(Rom.SHA384Key),
SHA512 = item.ReadString(Models.Internal.Rom.SHA512Key), SHA512 = item.ReadString(Rom.SHA512Key),
SpamSum = item.ReadString(Models.Internal.Rom.SpamSumKey), SpamSum = item.ReadString(Rom.SpamSumKey),
Status = item.ReadString(Models.Internal.Rom.StatusKey), Status = item.ReadString(Rom.StatusKey),
}; };
return row; return row;
} }

View File

@@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using SabreTools.Models.Internal;
namespace SabreTools.Serialization namespace SabreTools.Serialization
{ {
@@ -11,281 +12,281 @@ namespace SabreTools.Serialization
#region Serialize #region Serialize
/// <summary> /// <summary>
/// Convert from <cref="Models.SoftwareList.SoftwareList"/> to <cref="Models.Internal.Header"/> /// Convert from <cref="Models.SoftwareList.SoftwareList"/> to <cref="Header"/>
/// </summary> /// </summary>
public static Models.Internal.Header ConvertHeaderFromSoftwareList(Models.SoftwareList.SoftwareList item) public static Header ConvertHeaderFromSoftwareList(Models.SoftwareList.SoftwareList item)
{ {
var header = new Models.Internal.Header var header = new Header
{ {
[Models.Internal.Header.NameKey] = item.Name, [Header.NameKey] = item.Name,
[Models.Internal.Header.DescriptionKey] = item.Description, [Header.DescriptionKey] = item.Description,
[Models.Internal.Header.NotesKey] = item.Notes, [Header.NotesKey] = item.Notes,
}; };
return header; return header;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.SoftwareList.Software"/> to <cref="Models.Internal.Machine"/> /// Convert from <cref="Models.SoftwareList.Software"/> to <cref="Machine"/>
/// </summary> /// </summary>
public static Models.Internal.Machine ConvertMachineFromSoftwareList(Models.SoftwareList.Software item) public static Machine ConvertMachineFromSoftwareList(Models.SoftwareList.Software item)
{ {
var machine = new Models.Internal.Machine var machine = new Machine
{ {
[Models.Internal.Machine.NameKey] = item.Name, [Machine.NameKey] = item.Name,
[Models.Internal.Machine.CloneOfKey] = item.CloneOf, [Machine.CloneOfKey] = item.CloneOf,
[Models.Internal.Machine.SupportedKey] = item.Supported, [Machine.SupportedKey] = item.Supported,
[Models.Internal.Machine.DescriptionKey] = item.Description, [Machine.DescriptionKey] = item.Description,
[Models.Internal.Machine.YearKey] = item.Year, [Machine.YearKey] = item.Year,
[Models.Internal.Machine.PublisherKey] = item.Publisher, [Machine.PublisherKey] = item.Publisher,
[Models.Internal.Machine.NotesKey] = item.Notes, [Machine.NotesKey] = item.Notes,
}; };
if (item.Info != null && item.Info.Any()) if (item.Info != null && item.Info.Any())
{ {
var infos = new List<Models.Internal.Info>(); var infos = new List<Info>();
foreach (var info in item.Info) foreach (var info in item.Info)
{ {
infos.Add(ConvertFromSoftwareList(info)); infos.Add(ConvertFromSoftwareList(info));
} }
machine[Models.Internal.Machine.InfoKey] = infos.ToArray(); machine[Machine.InfoKey] = infos.ToArray();
} }
if (item.SharedFeat != null && item.SharedFeat.Any()) if (item.SharedFeat != null && item.SharedFeat.Any())
{ {
var sharedFeats = new List<Models.Internal.SharedFeat>(); var sharedFeats = new List<SharedFeat>();
foreach (var sharedFeat in item.SharedFeat) foreach (var sharedFeat in item.SharedFeat)
{ {
sharedFeats.Add(ConvertFromSoftwareList(sharedFeat)); sharedFeats.Add(ConvertFromSoftwareList(sharedFeat));
} }
machine[Models.Internal.Machine.SharedFeatKey] = sharedFeats.ToArray(); machine[Machine.SharedFeatKey] = sharedFeats.ToArray();
} }
if (item.Part != null && item.Part.Any()) if (item.Part != null && item.Part.Any())
{ {
var parts = new List<Models.Internal.Part>(); var parts = new List<Part>();
foreach (var part in item.Part) foreach (var part in item.Part)
{ {
parts.Add(ConvertFromSoftwareList(part)); parts.Add(ConvertFromSoftwareList(part));
} }
machine[Models.Internal.Machine.PartKey] = parts.ToArray(); machine[Machine.PartKey] = parts.ToArray();
} }
return machine; return machine;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.SoftwareList.DataArea"/> to <cref="Models.Internal.DataArea"/> /// Convert from <cref="Models.SoftwareList.DataArea"/> to <cref="DataArea"/>
/// </summary> /// </summary>
public static Models.Internal.DataArea ConvertFromSoftwareList(Models.SoftwareList.DataArea item) public static DataArea ConvertFromSoftwareList(Models.SoftwareList.DataArea item)
{ {
var dataArea = new Models.Internal.DataArea var dataArea = new DataArea
{ {
[Models.Internal.DataArea.NameKey] = item.Name, [DataArea.NameKey] = item.Name,
[Models.Internal.DataArea.SizeKey] = item.Size, [DataArea.SizeKey] = item.Size,
[Models.Internal.DataArea.WidthKey] = item.Width, [DataArea.WidthKey] = item.Width,
[Models.Internal.DataArea.EndiannessKey] = item.Endianness, [DataArea.EndiannessKey] = item.Endianness,
}; };
if (item.Rom != null && item.Rom.Any()) if (item.Rom != null && item.Rom.Any())
{ {
var roms = new List<Models.Internal.Rom>(); var roms = new List<Rom>();
foreach (var rom in item.Rom) foreach (var rom in item.Rom)
{ {
roms.Add(ConvertFromSoftwareList(rom)); roms.Add(ConvertFromSoftwareList(rom));
} }
dataArea[Models.Internal.DataArea.RomKey] = roms.ToArray(); dataArea[DataArea.RomKey] = roms.ToArray();
} }
return dataArea; return dataArea;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.SoftwareList.DipSwitch"/> to <cref="Models.Internal.DipSwitch"/> /// Convert from <cref="Models.SoftwareList.DipSwitch"/> to <cref="DipSwitch"/>
/// </summary> /// </summary>
public static Models.Internal.DipSwitch ConvertFromSoftwareList(Models.SoftwareList.DipSwitch item) public static DipSwitch ConvertFromSoftwareList(Models.SoftwareList.DipSwitch item)
{ {
var dipSwitch = new Models.Internal.DipSwitch var dipSwitch = new DipSwitch
{ {
[Models.Internal.DipSwitch.NameKey] = item.Name, [DipSwitch.NameKey] = item.Name,
[Models.Internal.DipSwitch.TagKey] = item.Tag, [DipSwitch.TagKey] = item.Tag,
[Models.Internal.DipSwitch.MaskKey] = item.Mask, [DipSwitch.MaskKey] = item.Mask,
}; };
if (item.DipValue != null && item.DipValue.Any()) if (item.DipValue != null && item.DipValue.Any())
{ {
var dipValues = new List<Models.Internal.DipValue>(); var dipValues = new List<DipValue>();
foreach (var dipValue in item.DipValue) foreach (var dipValue in item.DipValue)
{ {
dipValues.Add(ConvertFromSoftwareList(dipValue)); dipValues.Add(ConvertFromSoftwareList(dipValue));
} }
dipSwitch[Models.Internal.DipSwitch.DipValueKey] = dipValues.ToArray(); dipSwitch[DipSwitch.DipValueKey] = dipValues.ToArray();
} }
return dipSwitch; return dipSwitch;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.SoftwareList.DipValue"/> to <cref="Models.Internal.DipValue"/> /// Convert from <cref="Models.SoftwareList.DipValue"/> to <cref="DipValue"/>
/// </summary> /// </summary>
public static Models.Internal.DipValue ConvertFromSoftwareList(Models.SoftwareList.DipValue item) public static DipValue ConvertFromSoftwareList(Models.SoftwareList.DipValue item)
{ {
var dipValue = new Models.Internal.DipValue var dipValue = new DipValue
{ {
[Models.Internal.DipValue.NameKey] = item.Name, [DipValue.NameKey] = item.Name,
[Models.Internal.DipValue.ValueKey] = item.Value, [DipValue.ValueKey] = item.Value,
[Models.Internal.DipValue.DefaultKey] = item.Default, [DipValue.DefaultKey] = item.Default,
}; };
return dipValue; return dipValue;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.SoftwareList.Disk"/> to <cref="Models.Internal.Disk"/> /// Convert from <cref="Models.SoftwareList.Disk"/> to <cref="Disk"/>
/// </summary> /// </summary>
public static Models.Internal.Disk ConvertFromSoftwareList(Models.SoftwareList.Disk item) public static Disk ConvertFromSoftwareList(Models.SoftwareList.Disk item)
{ {
var disk = new Models.Internal.Disk var disk = new Disk
{ {
[Models.Internal.Disk.NameKey] = item.Name, [Disk.NameKey] = item.Name,
[Models.Internal.Disk.MD5Key] = item.MD5, [Disk.MD5Key] = item.MD5,
[Models.Internal.Disk.SHA1Key] = item.SHA1, [Disk.SHA1Key] = item.SHA1,
[Models.Internal.Disk.StatusKey] = item.Status, [Disk.StatusKey] = item.Status,
[Models.Internal.Disk.WritableKey] = item.Writeable, [Disk.WritableKey] = item.Writeable,
}; };
return disk; return disk;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.SoftwareList.DiskArea"/> to <cref="Models.Internal.DiskArea"/> /// Convert from <cref="Models.SoftwareList.DiskArea"/> to <cref="DiskArea"/>
/// </summary> /// </summary>
public static Models.Internal.DiskArea ConvertFromSoftwareList(Models.SoftwareList.DiskArea item) public static DiskArea ConvertFromSoftwareList(Models.SoftwareList.DiskArea item)
{ {
var diskArea = new Models.Internal.DiskArea var diskArea = new DiskArea
{ {
[Models.Internal.DiskArea.NameKey] = item.Name, [DiskArea.NameKey] = item.Name,
}; };
if (item.Disk != null && item.Disk.Any()) if (item.Disk != null && item.Disk.Any())
{ {
var roms = new List<Models.Internal.Disk>(); var roms = new List<Disk>();
foreach (var disk in item.Disk) foreach (var disk in item.Disk)
{ {
roms.Add(ConvertFromSoftwareList(disk)); roms.Add(ConvertFromSoftwareList(disk));
} }
diskArea[Models.Internal.DiskArea.DiskKey] = roms.ToArray(); diskArea[DiskArea.DiskKey] = roms.ToArray();
} }
return diskArea; return diskArea;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.SoftwareList.Feature"/> to <cref="Models.Internal.Feature"/> /// Convert from <cref="Models.SoftwareList.Feature"/> to <cref="Feature"/>
/// </summary> /// </summary>
public static Models.Internal.Feature ConvertFromSoftwareList(Models.SoftwareList.Feature item) public static Feature ConvertFromSoftwareList(Models.SoftwareList.Feature item)
{ {
var feature = new Models.Internal.Feature var feature = new Feature
{ {
[Models.Internal.Feature.NameKey] = item.Name, [Feature.NameKey] = item.Name,
[Models.Internal.Feature.ValueKey] = item.Value, [Feature.ValueKey] = item.Value,
}; };
return feature; return feature;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.SoftwareList.Info"/> to <cref="Models.Internal.Info"/> /// Convert from <cref="Models.SoftwareList.Info"/> to <cref="Info"/>
/// </summary> /// </summary>
public static Models.Internal.Info ConvertFromSoftwareList(Models.SoftwareList.Info item) public static Info ConvertFromSoftwareList(Models.SoftwareList.Info item)
{ {
var info = new Models.Internal.Info var info = new Info
{ {
[Models.Internal.Info.NameKey] = item.Name, [Info.NameKey] = item.Name,
[Models.Internal.Info.ValueKey] = item.Value, [Info.ValueKey] = item.Value,
}; };
return info; return info;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.SoftwareList.Part"/> to <cref="Models.Internal.Part"/> /// Convert from <cref="Models.SoftwareList.Part"/> to <cref="Part"/>
/// </summary> /// </summary>
public static Models.Internal.Part ConvertFromSoftwareList(Models.SoftwareList.Part item) public static Part ConvertFromSoftwareList(Models.SoftwareList.Part item)
{ {
var part = new Models.Internal.Part var part = new Part
{ {
[Models.Internal.Part.NameKey] = item.Name, [Part.NameKey] = item.Name,
[Models.Internal.Part.InterfaceKey] = item.Interface, [Part.InterfaceKey] = item.Interface,
}; };
if (item.Feature != null && item.Feature.Any()) if (item.Feature != null && item.Feature.Any())
{ {
var features = new List<Models.Internal.Feature>(); var features = new List<Feature>();
foreach (var feature in item.Feature) foreach (var feature in item.Feature)
{ {
features.Add(ConvertFromSoftwareList(feature)); features.Add(ConvertFromSoftwareList(feature));
} }
part[Models.Internal.Part.FeatureKey] = features.ToArray(); part[Part.FeatureKey] = features.ToArray();
} }
if (item.DataArea != null && item.DataArea.Any()) if (item.DataArea != null && item.DataArea.Any())
{ {
var dataAreas = new List<Models.Internal.DataArea>(); var dataAreas = new List<DataArea>();
foreach (var dataArea in item.DataArea) foreach (var dataArea in item.DataArea)
{ {
dataAreas.Add(ConvertFromSoftwareList(dataArea)); dataAreas.Add(ConvertFromSoftwareList(dataArea));
} }
part[Models.Internal.Part.DataAreaKey] = dataAreas.ToArray(); part[Part.DataAreaKey] = dataAreas.ToArray();
} }
if (item.DiskArea != null && item.DiskArea.Any()) if (item.DiskArea != null && item.DiskArea.Any())
{ {
var diskAreas = new List<Models.Internal.DiskArea>(); var diskAreas = new List<DiskArea>();
foreach (var diskArea in item.DiskArea) foreach (var diskArea in item.DiskArea)
{ {
diskAreas.Add(ConvertFromSoftwareList(diskArea)); diskAreas.Add(ConvertFromSoftwareList(diskArea));
} }
part[Models.Internal.Part.DiskAreaKey] = diskAreas.ToArray(); part[Part.DiskAreaKey] = diskAreas.ToArray();
} }
if (item.DipSwitch != null && item.DipSwitch.Any()) if (item.DipSwitch != null && item.DipSwitch.Any())
{ {
var dipSwitches = new List<Models.Internal.DipSwitch>(); var dipSwitches = new List<DipSwitch>();
foreach (var rom in item.DipSwitch) foreach (var rom in item.DipSwitch)
{ {
dipSwitches.Add(ConvertFromSoftwareList(rom)); dipSwitches.Add(ConvertFromSoftwareList(rom));
} }
part[Models.Internal.Part.DipSwitchKey] = dipSwitches.ToArray(); part[Part.DipSwitchKey] = dipSwitches.ToArray();
} }
return part; return part;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.SoftwareList.Rom"/> to <cref="Models.Internal.Rom"/> /// Convert from <cref="Models.SoftwareList.Rom"/> to <cref="Rom"/>
/// </summary> /// </summary>
public static Models.Internal.Rom ConvertFromSoftwareList(Models.SoftwareList.Rom item) public static Rom ConvertFromSoftwareList(Models.SoftwareList.Rom item)
{ {
var rom = new Models.Internal.Rom var rom = new Rom
{ {
[Models.Internal.Rom.NameKey] = item.Name, [Rom.NameKey] = item.Name,
[Models.Internal.Rom.SizeKey] = item.Size, [Rom.SizeKey] = item.Size,
[Models.Internal.Rom.LengthKey] = item.Length, [Rom.LengthKey] = item.Length,
[Models.Internal.Rom.CRCKey] = item.CRC, [Rom.CRCKey] = item.CRC,
[Models.Internal.Rom.SHA1Key] = item.SHA1, [Rom.SHA1Key] = item.SHA1,
[Models.Internal.Rom.OffsetKey] = item.Offset, [Rom.OffsetKey] = item.Offset,
[Models.Internal.Rom.ValueKey] = item.Value, [Rom.ValueKey] = item.Value,
[Models.Internal.Rom.StatusKey] = item.Status, [Rom.StatusKey] = item.Status,
[Models.Internal.Rom.LoadFlagKey] = item.LoadFlag, [Rom.LoadFlagKey] = item.LoadFlag,
}; };
return rom; return rom;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.SoftwareList.SharedFeat"/> to <cref="Models.Internal.SharedFeat"/> /// Convert from <cref="Models.SoftwareList.SharedFeat"/> to <cref="SharedFeat"/>
/// </summary> /// </summary>
public static Models.Internal.SharedFeat ConvertFromSoftwareList(Models.SoftwareList.SharedFeat item) public static SharedFeat ConvertFromSoftwareList(Models.SoftwareList.SharedFeat item)
{ {
var sharedFeat = new Models.Internal.SharedFeat var sharedFeat = new SharedFeat
{ {
[Models.Internal.SharedFeat.NameKey] = item.Name, [SharedFeat.NameKey] = item.Name,
[Models.Internal.SharedFeat.ValueKey] = item.Value, [SharedFeat.ValueKey] = item.Value,
}; };
return sharedFeat; return sharedFeat;
} }
@@ -295,247 +296,247 @@ namespace SabreTools.Serialization
#region Deserialize #region Deserialize
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Header"/> to <cref="Models.SoftwareList.SoftwareList"/> /// Convert from <cref="Header"/> to <cref="Models.SoftwareList.SoftwareList"/>
/// </summary> /// </summary>
public static Models.SoftwareList.SoftwareList? ConvertHeaderToSoftwareList(Models.Internal.Header? item) public static Models.SoftwareList.SoftwareList? ConvertHeaderToSoftwareList(Header? item)
{ {
if (item == null) if (item == null)
return null; return null;
var softwareList = new Models.SoftwareList.SoftwareList var softwareList = new Models.SoftwareList.SoftwareList
{ {
Name = item.ReadString(Models.Internal.Header.NameKey), Name = item.ReadString(Header.NameKey),
Description = item.ReadString(Models.Internal.Header.DescriptionKey), Description = item.ReadString(Header.DescriptionKey),
Notes = item.ReadString(Models.Internal.Header.NotesKey), Notes = item.ReadString(Header.NotesKey),
}; };
return softwareList; return softwareList;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Machine"/> to <cref="Models.SoftwareList.Software"/> /// Convert from <cref="Machine"/> to <cref="Models.SoftwareList.Software"/>
/// </summary> /// </summary>
public static Models.SoftwareList.Software? ConvertMachineToSoftwareList(Models.Internal.Machine? item) public static Models.SoftwareList.Software? ConvertMachineToSoftwareList(Machine? item)
{ {
if (item == null) if (item == null)
return null; return null;
var software = new Models.SoftwareList.Software var software = new Models.SoftwareList.Software
{ {
Name = item.ReadString(Models.Internal.Machine.NameKey), Name = item.ReadString(Machine.NameKey),
CloneOf = item.ReadString(Models.Internal.Machine.CloneOfKey), CloneOf = item.ReadString(Machine.CloneOfKey),
Supported = item.ReadString(Models.Internal.Machine.SupportedKey), Supported = item.ReadString(Machine.SupportedKey),
Description = item.ReadString(Models.Internal.Machine.DescriptionKey), Description = item.ReadString(Machine.DescriptionKey),
Year = item.ReadString(Models.Internal.Machine.YearKey), Year = item.ReadString(Machine.YearKey),
Publisher = item.ReadString(Models.Internal.Machine.PublisherKey), Publisher = item.ReadString(Machine.PublisherKey),
Notes = item.ReadString(Models.Internal.Machine.NotesKey), Notes = item.ReadString(Machine.NotesKey),
}; };
var infos = item.Read<Models.Internal.Info[]>(Models.Internal.Machine.InfoKey); var infos = item.Read<Info[]>(Machine.InfoKey);
software.Info = infos?.Select(ConvertToSoftwareList)?.ToArray(); software.Info = infos?.Select(ConvertToSoftwareList)?.ToArray();
var sharedFeats = item.Read<Models.Internal.SharedFeat[]>(Models.Internal.Machine.SharedFeatKey); var sharedFeats = item.Read<SharedFeat[]>(Machine.SharedFeatKey);
software.SharedFeat = sharedFeats?.Select(ConvertToSoftwareList)?.ToArray(); software.SharedFeat = sharedFeats?.Select(ConvertToSoftwareList)?.ToArray();
var parts = item.Read<Models.Internal.Part[]>(Models.Internal.Machine.PartKey); var parts = item.Read<Part[]>(Machine.PartKey);
software.Part = parts?.Select(ConvertToSoftwareList)?.ToArray(); software.Part = parts?.Select(ConvertToSoftwareList)?.ToArray();
return software; return software;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.DataArea"/> to <cref="Models.SoftwareList.DataArea"/> /// Convert from <cref="DataArea"/> to <cref="Models.SoftwareList.DataArea"/>
/// </summary> /// </summary>
private static Models.SoftwareList.DataArea? ConvertToSoftwareList(Models.Internal.DataArea? item) private static Models.SoftwareList.DataArea? ConvertToSoftwareList(DataArea? item)
{ {
if (item == null) if (item == null)
return null; return null;
var dataArea = new Models.SoftwareList.DataArea var dataArea = new Models.SoftwareList.DataArea
{ {
Name = item.ReadString(Models.Internal.DataArea.NameKey), Name = item.ReadString(DataArea.NameKey),
Size = item.ReadString(Models.Internal.DataArea.SizeKey), Size = item.ReadString(DataArea.SizeKey),
Width = item.ReadString(Models.Internal.DataArea.WidthKey), Width = item.ReadString(DataArea.WidthKey),
Endianness = item.ReadString(Models.Internal.DataArea.EndiannessKey), Endianness = item.ReadString(DataArea.EndiannessKey),
}; };
var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.DataArea.RomKey); var roms = item.Read<Rom[]>(DataArea.RomKey);
dataArea.Rom = roms?.Select(ConvertToSoftwareList)?.ToArray(); dataArea.Rom = roms?.Select(ConvertToSoftwareList)?.ToArray();
return dataArea; return dataArea;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.DipSwitch"/> to <cref="Models.SoftwareList.DipSwitch"/> /// Convert from <cref="DipSwitch"/> to <cref="Models.SoftwareList.DipSwitch"/>
/// </summary> /// </summary>
private static Models.SoftwareList.DipSwitch? ConvertToSoftwareList(Models.Internal.DipSwitch? item) private static Models.SoftwareList.DipSwitch? ConvertToSoftwareList(DipSwitch? item)
{ {
if (item == null) if (item == null)
return null; return null;
var dipSwitch = new Models.SoftwareList.DipSwitch var dipSwitch = new Models.SoftwareList.DipSwitch
{ {
Name = item.ReadString(Models.Internal.DipSwitch.NameKey), Name = item.ReadString(DipSwitch.NameKey),
Tag = item.ReadString(Models.Internal.DipSwitch.TagKey), Tag = item.ReadString(DipSwitch.TagKey),
Mask = item.ReadString(Models.Internal.DipSwitch.MaskKey), Mask = item.ReadString(DipSwitch.MaskKey),
}; };
var dipValues = item.Read<Models.Internal.DipValue[]>(Models.Internal.DipSwitch.DipValueKey); var dipValues = item.Read<DipValue[]>(DipSwitch.DipValueKey);
dipSwitch.DipValue = dipValues?.Select(ConvertToSoftwareList)?.ToArray(); dipSwitch.DipValue = dipValues?.Select(ConvertToSoftwareList)?.ToArray();
return dipSwitch; return dipSwitch;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.DipValue"/> to <cref="Models.SoftwareList.DipValue"/> /// Convert from <cref="DipValue"/> to <cref="Models.SoftwareList.DipValue"/>
/// </summary> /// </summary>
private static Models.SoftwareList.DipValue? ConvertToSoftwareList(Models.Internal.DipValue? item) private static Models.SoftwareList.DipValue? ConvertToSoftwareList(DipValue? item)
{ {
if (item == null) if (item == null)
return null; return null;
var dipValue = new Models.SoftwareList.DipValue var dipValue = new Models.SoftwareList.DipValue
{ {
Name = item.ReadString(Models.Internal.DipValue.NameKey), Name = item.ReadString(DipValue.NameKey),
Value = item.ReadString(Models.Internal.DipValue.ValueKey), Value = item.ReadString(DipValue.ValueKey),
Default = item.ReadString(Models.Internal.DipValue.DefaultKey), Default = item.ReadString(DipValue.DefaultKey),
}; };
return dipValue; return dipValue;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Disk"/> to <cref="Models.SoftwareList.Disk"/> /// Convert from <cref="Disk"/> to <cref="Models.SoftwareList.Disk"/>
/// </summary> /// </summary>
private static Models.SoftwareList.Disk? ConvertToSoftwareList(Models.Internal.Disk? item) private static Models.SoftwareList.Disk? ConvertToSoftwareList(Disk? item)
{ {
if (item == null) if (item == null)
return null; return null;
var disk = new Models.SoftwareList.Disk var disk = new Models.SoftwareList.Disk
{ {
Name = item.ReadString(Models.Internal.Disk.NameKey), Name = item.ReadString(Disk.NameKey),
MD5 = item.ReadString(Models.Internal.Disk.MD5Key), MD5 = item.ReadString(Disk.MD5Key),
SHA1 = item.ReadString(Models.Internal.Disk.SHA1Key), SHA1 = item.ReadString(Disk.SHA1Key),
Status = item.ReadString(Models.Internal.Disk.StatusKey), Status = item.ReadString(Disk.StatusKey),
Writeable = item.ReadString(Models.Internal.Disk.WritableKey), Writeable = item.ReadString(Disk.WritableKey),
}; };
return disk; return disk;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.DiskArea"/> to <cref="Models.SoftwareList.DiskArea"/> /// Convert from <cref="DiskArea"/> to <cref="Models.SoftwareList.DiskArea"/>
/// </summary> /// </summary>
private static Models.SoftwareList.DiskArea? ConvertToSoftwareList(Models.Internal.DiskArea? item) private static Models.SoftwareList.DiskArea? ConvertToSoftwareList(DiskArea? item)
{ {
if (item == null) if (item == null)
return null; return null;
var diskArea = new Models.SoftwareList.DiskArea var diskArea = new Models.SoftwareList.DiskArea
{ {
Name = item.ReadString(Models.Internal.DiskArea.NameKey), Name = item.ReadString(DiskArea.NameKey),
}; };
var disks = item.Read<Models.Internal.Disk[]>(Models.Internal.DiskArea.DiskKey); var disks = item.Read<Disk[]>(DiskArea.DiskKey);
diskArea.Disk = disks?.Select(ConvertToSoftwareList)?.ToArray(); diskArea.Disk = disks?.Select(ConvertToSoftwareList)?.ToArray();
return diskArea; return diskArea;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Feature"/> to <cref="Models.SoftwareList.Feature"/> /// Convert from <cref="Feature"/> to <cref="Models.SoftwareList.Feature"/>
/// </summary> /// </summary>
private static Models.SoftwareList.Feature? ConvertToSoftwareList(Models.Internal.Feature? item) private static Models.SoftwareList.Feature? ConvertToSoftwareList(Feature? item)
{ {
if (item == null) if (item == null)
return null; return null;
var feature = new Models.SoftwareList.Feature var feature = new Models.SoftwareList.Feature
{ {
Name = item.ReadString(Models.Internal.Feature.NameKey), Name = item.ReadString(Feature.NameKey),
Value = item.ReadString(Models.Internal.Feature.ValueKey), Value = item.ReadString(Feature.ValueKey),
}; };
return feature; return feature;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Info"/> to <cref="Models.SoftwareList.Info"/> /// Convert from <cref="Info"/> to <cref="Models.SoftwareList.Info"/>
/// </summary> /// </summary>
private static Models.SoftwareList.Info? ConvertToSoftwareList(Models.Internal.Info? item) private static Models.SoftwareList.Info? ConvertToSoftwareList(Info? item)
{ {
if (item == null) if (item == null)
return null; return null;
var info = new Models.SoftwareList.Info var info = new Models.SoftwareList.Info
{ {
Name = item.ReadString(Models.Internal.Info.NameKey), Name = item.ReadString(Info.NameKey),
Value = item.ReadString(Models.Internal.Info.ValueKey), Value = item.ReadString(Info.ValueKey),
}; };
return info; return info;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Part"/> to <cref="Models.SoftwareList.Part"/> /// Convert from <cref="Part"/> to <cref="Models.SoftwareList.Part"/>
/// </summary> /// </summary>
private static Models.SoftwareList.Part? ConvertToSoftwareList(Models.Internal.Part? item) private static Models.SoftwareList.Part? ConvertToSoftwareList(Part? item)
{ {
if (item == null) if (item == null)
return null; return null;
var part = new Models.SoftwareList.Part var part = new Models.SoftwareList.Part
{ {
Name = item.ReadString(Models.Internal.Part.NameKey), Name = item.ReadString(Part.NameKey),
Interface = item.ReadString(Models.Internal.Part.InterfaceKey), Interface = item.ReadString(Part.InterfaceKey),
}; };
var features = item.Read<Models.Internal.Feature[]>(Models.Internal.Part.FeatureKey); var features = item.Read<Feature[]>(Part.FeatureKey);
part.Feature = features?.Select(ConvertToSoftwareList)?.ToArray(); part.Feature = features?.Select(ConvertToSoftwareList)?.ToArray();
var dataAreas = item.Read<Models.Internal.DataArea[]>(Models.Internal.Part.DataAreaKey); var dataAreas = item.Read<DataArea[]>(Part.DataAreaKey);
part.DataArea = dataAreas?.Select(ConvertToSoftwareList)?.ToArray(); part.DataArea = dataAreas?.Select(ConvertToSoftwareList)?.ToArray();
var diskAreas = item.Read<Models.Internal.DiskArea[]>(Models.Internal.Part.DiskAreaKey); var diskAreas = item.Read<DiskArea[]>(Part.DiskAreaKey);
part.DiskArea = diskAreas?.Select(ConvertToSoftwareList)?.ToArray(); part.DiskArea = diskAreas?.Select(ConvertToSoftwareList)?.ToArray();
var dipSwitches = item.Read<Models.Internal.DipSwitch[]>(Models.Internal.Part.DipSwitchKey); var dipSwitches = item.Read<DipSwitch[]>(Part.DipSwitchKey);
part.DipSwitch = dipSwitches?.Select(ConvertToSoftwareList)?.ToArray(); part.DipSwitch = dipSwitches?.Select(ConvertToSoftwareList)?.ToArray();
return part; return part;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.SoftwareList.Rom"/> /// Convert from <cref="Rom"/> to <cref="Models.SoftwareList.Rom"/>
/// </summary> /// </summary>
private static Models.SoftwareList.Rom? ConvertToSoftwareList(Models.Internal.Rom? item) private static Models.SoftwareList.Rom? ConvertToSoftwareList(Rom? item)
{ {
if (item == null) if (item == null)
return null; return null;
var rom = new Models.SoftwareList.Rom var rom = new Models.SoftwareList.Rom
{ {
Name = item.ReadString(Models.Internal.Rom.NameKey), Name = item.ReadString(Rom.NameKey),
Size = item.ReadString(Models.Internal.Rom.SizeKey), Size = item.ReadString(Rom.SizeKey),
Length = item.ReadString(Models.Internal.Rom.LengthKey), Length = item.ReadString(Rom.LengthKey),
CRC = item.ReadString(Models.Internal.Rom.CRCKey), CRC = item.ReadString(Rom.CRCKey),
SHA1 = item.ReadString(Models.Internal.Rom.SHA1Key), SHA1 = item.ReadString(Rom.SHA1Key),
Offset = item.ReadString(Models.Internal.Rom.OffsetKey), Offset = item.ReadString(Rom.OffsetKey),
Value = item.ReadString(Models.Internal.Rom.ValueKey), Value = item.ReadString(Rom.ValueKey),
Status = item.ReadString(Models.Internal.Rom.StatusKey), Status = item.ReadString(Rom.StatusKey),
LoadFlag = item.ReadString(Models.Internal.Rom.LoadFlagKey), LoadFlag = item.ReadString(Rom.LoadFlagKey),
}; };
return rom; return rom;
} }
/// <summary> /// <summary>
/// Convert from <cref="Models.Internal.SharedFeat"/> to <cref="Models.SoftwareList.SharedFeat"/> /// Convert from <cref="SharedFeat"/> to <cref="Models.SoftwareList.SharedFeat"/>
/// </summary> /// </summary>
private static Models.SoftwareList.SharedFeat? ConvertToSoftwareList(Models.Internal.SharedFeat? item) private static Models.SoftwareList.SharedFeat? ConvertToSoftwareList(SharedFeat? item)
{ {
if (item == null) if (item == null)
return null; return null;
var sharedFeat = new Models.SoftwareList.SharedFeat var sharedFeat = new Models.SoftwareList.SharedFeat
{ {
Name = item.ReadString(Models.Internal.SharedFeat.NameKey), Name = item.ReadString(SharedFeat.NameKey),
Value = item.ReadString(Models.Internal.SharedFeat.ValueKey), Value = item.ReadString(SharedFeat.ValueKey),
}; };
return sharedFeat; return sharedFeat;
} }