claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify deserialization with helper method

Browse Source
This commit is contained in:
Matt Nadareski
2023-08-08 12:04:07 -04:00
parent 4dffd76574
commit 75879c8049
14 changed files with 608 additions and 816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
SabreTools.Serialization/Internal.SeparatedValue.cs
View File

@@ -31,7 +31,7 @@ namespace SabreTools.Serialization
case Models.Internal.Media media:
machine[Models.Internal.Machine.MediaKey] = new Models.Internal.Media[] { media };
break;
case Models.Internal.Rom rom:
machine[Models.Internal.Machine.RomKey] = new Models.Internal.Rom[] { rom };
break;
@@ -86,42 +86,24 @@ namespace SabreTools.Serialization
/// <summary>
/// Convert from <cref="Models.Internal.Machine"/> to an array of <cref="Models.SeparatedValue.Row"/>
/// </summary>
public static Models.SeparatedValue.Row[] ConvertMachineToSeparatedValue(Models.Internal.Machine item)
public static Models.SeparatedValue.Row[]? ConvertMachineToSeparatedValue(Models.Internal.Machine? item)
{
if (item == null)
return null;
var rowItems = new List<Models.SeparatedValue.Row>();
if (item.ContainsKey(Models.Internal.Machine.DiskKey) && item[Models.Internal.Machine.DiskKey] is Models.Internal.Disk[] disks)
{
foreach (var disk in disks)
{
var rowItem = ConvertToSeparatedValue(disk);
rowItem.GameName = item.ReadString(Models.Internal.Machine.NameKey);
rowItem.Description = item.ReadString(Models.Internal.Machine.DescriptionKey);
rowItems.Add(rowItem);
}
}
var disks = item.Read<Models.Internal.Disk[]>(Models.Internal.Machine.DiskKey);
if (disks != null)
rowItems.AddRange(disks.Select(disk => ConvertToSeparatedValue(disk, item)));
if (item.ContainsKey(Models.Internal.Machine.MediaKey) && item[Models.Internal.Machine.MediaKey] is Models.Internal.Media[] media)
{
foreach (var medium in media)
{
var rowItem = ConvertToSeparatedValue(medium);
rowItem.GameName = item.ReadString(Models.Internal.Machine.NameKey);
rowItem.Description = item.ReadString(Models.Internal.Machine.DescriptionKey);
rowItems.Add(rowItem);
}
}
var media = item.Read<Models.Internal.Media[]>(Models.Internal.Machine.MediaKey);
if (media != null)
rowItems.AddRange(media.Select(medium => ConvertToSeparatedValue(medium, item)));
if (item.ContainsKey(Models.Internal.Machine.RomKey) && item[Models.Internal.Machine.RomKey] is Models.Internal.Rom[] roms)
{
foreach (var rom in roms)
{
var rowItem = ConvertToSeparatedValue(rom);
rowItem.GameName = item.ReadString(Models.Internal.Machine.NameKey);
rowItem.Description = item.ReadString(Models.Internal.Machine.DescriptionKey);
rowItems.Add(rowItem);
}
}
var roms = item.Read<Models.Internal.Rom[]>(Models.Internal.Machine.RomKey);
if (roms != null)
rowItems.AddRange(roms.Select(rom => ConvertToSeparatedValue(rom, item)));
return rowItems.ToArray();
}
@@ -129,10 +111,15 @@ namespace SabreTools.Serialization
/// <summary>
/// Convert from <cref="Models.Internal.Disk"/> to <cref="Models.SeparatedValue.Row"/>
/// </summary>
public static Models.SeparatedValue.Row ConvertToSeparatedValue(Models.Internal.Disk item)
public static Models.SeparatedValue.Row? ConvertToSeparatedValue(Models.Internal.Disk? item, Models.Internal.Machine? parent)
{
if (item == null)
return null;
var row = new Models.SeparatedValue.Row
{
GameName = parent?.ReadString(Models.Internal.Machine.NameKey),
Description = parent?.ReadString(Models.Internal.Machine.DescriptionKey),
Type = "disk",
DiskName = item.ReadString(Models.Internal.Disk.NameKey),
MD5 = item.ReadString(Models.Internal.Disk.MD5Key),
@@ -145,10 +132,15 @@ namespace SabreTools.Serialization
/// <summary>
/// Convert from <cref="Models.Internal.Media"/> to <cref="Models.SeparatedValue.Row"/>
/// </summary>
public static Models.SeparatedValue.Row ConvertToSeparatedValue(Models.Internal.Media item)
public static Models.SeparatedValue.Row? ConvertToSeparatedValue(Models.Internal.Media? item, Models.Internal.Machine? parent)
{
if (item == null)
return null;
var row = new Models.SeparatedValue.Row
{
GameName = parent?.ReadString(Models.Internal.Machine.NameKey),
Description = parent?.ReadString(Models.Internal.Machine.DescriptionKey),
Type = "media",
DiskName = item.ReadString(Models.Internal.Media.NameKey),
MD5 = item.ReadString(Models.Internal.Media.MD5Key),
@@ -162,10 +154,15 @@ namespace SabreTools.Serialization
/// <summary>
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.SeparatedValue.Row"/>
/// </summary>
public static Models.SeparatedValue.Row ConvertToSeparatedValue(Models.Internal.Rom item)
public static Models.SeparatedValue.Row? ConvertToSeparatedValue(Models.Internal.Rom? item, Models.Internal.Machine? parent)
{
if (item == null)
return null;
var row = new Models.SeparatedValue.Row
{
GameName = parent?.ReadString(Models.Internal.Machine.NameKey),
Description = parent?.ReadString(Models.Internal.Machine.DescriptionKey),
Type = "rom",
RomName = item.ReadString(Models.Internal.Rom.NameKey),
Size = item.ReadString(Models.Internal.Rom.SizeKey),