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