mirror of
https://github.com/claunia/SabreTools.git
synced 2025-12-16 19:14:27 +00:00
Start simplifying usings
This commit is contained in:
Matt Nadareski
@@ -1,5 +1,6 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using SabreTools.Models.Internal;
|
||||
|
||||
namespace SabreTools.Serialization
|
||||
{
|
||||
@@ -11,67 +12,67 @@ namespace SabreTools.Serialization
|
||||
#region Serialize
|
||||
|
||||
/// <summary>
|
||||
/// Convert from <cref="Models.OpenMSX.SoftwareDb"/> to <cref="Models.Internal.Header"/>
|
||||
/// Convert from <cref="Models.OpenMSX.SoftwareDb"/> to <cref="Header"/>
|
||||
/// </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;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert from <cref="Models.OpenMSX.Software"/> to <cref="Models.Internal.Machine"/>
|
||||
/// Convert from <cref="Models.OpenMSX.Software"/> to <cref="Machine"/>
|
||||
/// </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,
|
||||
[Models.Internal.Machine.GenMSXIDKey] = item.GenMSXID,
|
||||
[Models.Internal.Machine.SystemKey] = item.System,
|
||||
[Models.Internal.Machine.CompanyKey] = item.Company,
|
||||
[Models.Internal.Machine.YearKey] = item.Year,
|
||||
[Models.Internal.Machine.CountryKey] = item.Country,
|
||||
[Machine.NameKey] = item.Title,
|
||||
[Machine.GenMSXIDKey] = item.GenMSXID,
|
||||
[Machine.SystemKey] = item.System,
|
||||
[Machine.CompanyKey] = item.Company,
|
||||
[Machine.YearKey] = item.Year,
|
||||
[Machine.CountryKey] = item.Country,
|
||||
};
|
||||
|
||||
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)
|
||||
{
|
||||
dumps.Add(ConvertFromOpenMSX(dump));
|
||||
}
|
||||
machine[Models.Internal.Machine.DumpKey] = dumps.ToArray();
|
||||
machine[Machine.DumpKey] = dumps.ToArray();
|
||||
}
|
||||
|
||||
return machine;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert from <cref="Models.OpenMSX.Dump"/> to <cref="Models.Internal.Dump"/>
|
||||
/// Convert from <cref="Models.OpenMSX.Dump"/> to <cref="Dump"/>
|
||||
/// </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)
|
||||
dump[Models.Internal.Dump.OriginalKey] = ConvertFromOpenMSX(item.Original);
|
||||
dump[Dump.OriginalKey] = ConvertFromOpenMSX(item.Original);
|
||||
|
||||
switch (item.Rom)
|
||||
{
|
||||
case Models.OpenMSX.Rom rom:
|
||||
dump[Models.Internal.Dump.RomKey] = ConvertFromOpenMSX(rom);
|
||||
dump[Dump.RomKey] = ConvertFromOpenMSX(rom);
|
||||
break;
|
||||
|
||||
case Models.OpenMSX.MegaRom megaRom:
|
||||
dump[Models.Internal.Dump.MegaRomKey] = ConvertFromOpenMSX(megaRom);
|
||||
dump[Dump.MegaRomKey] = ConvertFromOpenMSX(megaRom);
|
||||
break;
|
||||
|
||||
case Models.OpenMSX.SCCPlusCart sccPlusCart:
|
||||
dump[Models.Internal.Dump.SCCPlusCartKey] = ConvertFromOpenMSX(sccPlusCart);
|
||||
dump[Dump.SCCPlusCartKey] = ConvertFromOpenMSX(sccPlusCart);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -79,29 +80,29 @@ namespace SabreTools.Serialization
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert from <cref="Models.OpenMSX.Original"/> to <cref="Models.Internal.Rom"/>
|
||||
/// Convert from <cref="Models.OpenMSX.Original"/> to <cref="Rom"/>
|
||||
/// </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,
|
||||
[Models.Internal.Original.ContentKey] = item.Content,
|
||||
[Original.ValueKey] = item.Value,
|
||||
[Original.ContentKey] = item.Content,
|
||||
};
|
||||
return original;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert from <cref="Models.OpenMSX.RomBase"/> to <cref="Models.Internal.Rom"/>
|
||||
/// Convert from <cref="Models.OpenMSX.RomBase"/> to <cref="Rom"/>
|
||||
/// </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,
|
||||
[Models.Internal.Rom.TypeKey] = item.Type,
|
||||
[Models.Internal.Rom.SHA1Key] = item.Hash,
|
||||
[Models.Internal.Rom.RemarkKey] = item.Remark,
|
||||
[Rom.StartKey] = item.Start,
|
||||
[Rom.TypeKey] = item.Type,
|
||||
[Rom.SHA1Key] = item.Hash,
|
||||
[Rom.RemarkKey] = item.Remark,
|
||||
};
|
||||
return rom;
|
||||
}
|
||||
@@ -111,135 +112,135 @@ namespace SabreTools.Serialization
|
||||
#region Deserialize
|
||||
|
||||
/// <summary>
|
||||
/// Convert from <cref="Models.Internal.Header"/> to <cref="Models.OpenMSX.SoftwareDb"/>
|
||||
/// Convert from <cref="Header"/> to <cref="Models.OpenMSX.SoftwareDb"/>
|
||||
/// </summary>
|
||||
public static Models.OpenMSX.SoftwareDb? ConvertHeaderToOpenMSX(Models.Internal.Header? item)
|
||||
public static Models.OpenMSX.SoftwareDb? ConvertHeaderToOpenMSX(Header? item)
|
||||
{
|
||||
if (item == null)
|
||||
return null;
|
||||
|
||||
var softwareDb = new Models.OpenMSX.SoftwareDb
|
||||
{
|
||||
Timestamp = item.ReadString(Models.Internal.Header.TimestampKey),
|
||||
Timestamp = item.ReadString(Header.TimestampKey),
|
||||
};
|
||||
return softwareDb;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert from <cref="Models.Internal.Machine"/> to <cref="Models.OpenMSX.Software"/>
|
||||
/// Convert from <cref="Machine"/> to <cref="Models.OpenMSX.Software"/>
|
||||
/// </summary>
|
||||
public static Models.OpenMSX.Software? ConvertMachineToOpenMSX(Models.Internal.Machine? item)
|
||||
public static Models.OpenMSX.Software? ConvertMachineToOpenMSX(Machine? item)
|
||||
{
|
||||
if (item == null)
|
||||
return null;
|
||||
|
||||
var game = new Models.OpenMSX.Software
|
||||
{
|
||||
Title = item.ReadString(Models.Internal.Machine.NameKey),
|
||||
GenMSXID = item.ReadString(Models.Internal.Machine.GenMSXIDKey),
|
||||
System = item.ReadString(Models.Internal.Machine.SystemKey),
|
||||
Company = item.ReadString(Models.Internal.Machine.CompanyKey),
|
||||
Year = item.ReadString(Models.Internal.Machine.YearKey),
|
||||
Country = item.ReadString(Models.Internal.Machine.CountryKey),
|
||||
Title = item.ReadString(Machine.NameKey),
|
||||
GenMSXID = item.ReadString(Machine.GenMSXIDKey),
|
||||
System = item.ReadString(Machine.SystemKey),
|
||||
Company = item.ReadString(Machine.CompanyKey),
|
||||
Year = item.ReadString(Machine.YearKey),
|
||||
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();
|
||||
|
||||
return game;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert from <cref="Models.Internal.Dump"/> to <cref="Models.OpenMSX.Dump"/>
|
||||
/// Convert from <cref="Dump"/> to <cref="Models.OpenMSX.Dump"/>
|
||||
/// </summary>
|
||||
private static Models.OpenMSX.Dump? ConvertToOpenMSX(Models.Internal.Dump? item)
|
||||
private static Models.OpenMSX.Dump? ConvertToOpenMSX(Dump? item)
|
||||
{
|
||||
if (item == null)
|
||||
return null;
|
||||
|
||||
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);
|
||||
|
||||
var rom = item.Read<Models.Internal.Rom>(Models.Internal.Dump.RomKey);
|
||||
var rom = item.Read<Rom>(Dump.RomKey);
|
||||
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);
|
||||
|
||||
var sccPlusCart = item.Read<Models.Internal.Rom>(Models.Internal.Dump.SCCPlusCartKey);
|
||||
var sccPlusCart = item.Read<Rom>(Dump.SCCPlusCartKey);
|
||||
dump.Rom = ConvertToOpenMSXSCCPlusCart(sccPlusCart);
|
||||
|
||||
return dump;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.OpenMSX.MegaRom"/>
|
||||
/// Convert from <cref="Rom"/> to <cref="Models.OpenMSX.MegaRom"/>
|
||||
/// </summary>
|
||||
private static Models.OpenMSX.MegaRom? ConvertToOpenMSXMegaRom(Models.Internal.Rom? item)
|
||||
private static Models.OpenMSX.MegaRom? ConvertToOpenMSXMegaRom(Rom? item)
|
||||
{
|
||||
if (item == null)
|
||||
return null;
|
||||
|
||||
var megaRom = new Models.OpenMSX.MegaRom
|
||||
{
|
||||
Start = item.ReadString(Models.Internal.Rom.StartKey),
|
||||
Type = item.ReadString(Models.Internal.Rom.TypeKey),
|
||||
Hash = item.ReadString(Models.Internal.Rom.SHA1Key),
|
||||
Remark = item.ReadString(Models.Internal.Rom.RemarkKey),
|
||||
Start = item.ReadString(Rom.StartKey),
|
||||
Type = item.ReadString(Rom.TypeKey),
|
||||
Hash = item.ReadString(Rom.SHA1Key),
|
||||
Remark = item.ReadString(Rom.RemarkKey),
|
||||
};
|
||||
return megaRom;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert from <cref="Models.Internal.Original"/> to <cref="Models.OpenMSX.Original"/>
|
||||
/// Convert from <cref="Original"/> to <cref="Models.OpenMSX.Original"/>
|
||||
/// </summary>
|
||||
private static Models.OpenMSX.Original? ConvertToOpenMSX(Models.Internal.Original? item)
|
||||
private static Models.OpenMSX.Original? ConvertToOpenMSX(Original? item)
|
||||
{
|
||||
if (item == null)
|
||||
return null;
|
||||
|
||||
var original = new Models.OpenMSX.Original
|
||||
{
|
||||
Value = item.ReadString(Models.Internal.Original.ValueKey),
|
||||
Content = item.ReadString(Models.Internal.Original.ContentKey),
|
||||
Value = item.ReadString(Original.ValueKey),
|
||||
Content = item.ReadString(Original.ContentKey),
|
||||
};
|
||||
return original;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.OpenMSX.Rom"/>
|
||||
/// Convert from <cref="Rom"/> to <cref="Models.OpenMSX.Rom"/>
|
||||
/// </summary>
|
||||
private static Models.OpenMSX.Rom? ConvertToOpenMSXRom(Models.Internal.Rom? item)
|
||||
private static Models.OpenMSX.Rom? ConvertToOpenMSXRom(Rom? item)
|
||||
{
|
||||
if (item == null)
|
||||
return null;
|
||||
|
||||
var rom = new Models.OpenMSX.Rom
|
||||
{
|
||||
Start = item.ReadString(Models.Internal.Rom.StartKey),
|
||||
Type = item.ReadString(Models.Internal.Rom.TypeKey),
|
||||
Hash = item.ReadString(Models.Internal.Rom.SHA1Key),
|
||||
Remark = item.ReadString(Models.Internal.Rom.RemarkKey),
|
||||
Start = item.ReadString(Rom.StartKey),
|
||||
Type = item.ReadString(Rom.TypeKey),
|
||||
Hash = item.ReadString(Rom.SHA1Key),
|
||||
Remark = item.ReadString(Rom.RemarkKey),
|
||||
};
|
||||
return rom;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert from <cref="Models.Internal.Rom"/> to <cref="Models.OpenMSX.SCCPlusCart"/>
|
||||
/// Convert from <cref="Rom"/> to <cref="Models.OpenMSX.SCCPlusCart"/>
|
||||
/// </summary>
|
||||
private static Models.OpenMSX.SCCPlusCart? ConvertToOpenMSXSCCPlusCart(Models.Internal.Rom? item)
|
||||
private static Models.OpenMSX.SCCPlusCart? ConvertToOpenMSXSCCPlusCart(Rom? item)
|
||||
{
|
||||
if (item == null)
|
||||
return null;
|
||||
|
||||
var sccPlusCart = new Models.OpenMSX.SCCPlusCart
|
||||
{
|
||||
Start = item.ReadString(Models.Internal.Rom.StartKey),
|
||||
Type = item.ReadString(Models.Internal.Rom.TypeKey),
|
||||
Hash = item.ReadString(Models.Internal.Rom.SHA1Key),
|
||||
Remark = item.ReadString(Models.Internal.Rom.RemarkKey),
|
||||
Start = item.ReadString(Rom.StartKey),
|
||||
Type = item.ReadString(Rom.TypeKey),
|
||||
Hash = item.ReadString(Rom.SHA1Key),
|
||||
Remark = item.ReadString(Rom.RemarkKey),
|
||||
};
|
||||
return sccPlusCart;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user