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

Migrate to Serialization package

Browse Source
This commit is contained in:
Matt Nadareski
2023-09-11 01:20:21 -04:00
parent c88105bee7
commit 1d50ab962f
75 changed files with 56 additions and 10160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SabreTools.DatFiles/Formats/ArchiveDotOrg.Reader.cs
View File

@@ -19,7 +19,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var files = Serialization.ArchiveDotOrg.Deserialize(filename);
var files = new Serialization.Files.ArchiveDotOrg().Deserialize(filename);
// Convert the files data to the internal format
ConvertFiles(files?.File, filename, indexId, statsOnly);
@@ -69,7 +69,11 @@ namespace SabreTools.DatFiles.Formats
/// <param name="filename">Name of the file to be parsed</param>
/// <param name="indexId">Index ID for the DAT</param>
/// <param name="statsOnly">True to only add item statistics while parsing, false otherwise</param>
#if NET48
private void ConvertFiles(Models.ArchiveDotOrg.File[]? files, string filename, int indexId, bool statsOnly)
#else
private void ConvertFiles(Models.ArchiveDotOrg.File?[]? files, string filename, int indexId, bool statsOnly)
#endif
{
// If the files array is missing, we can't do anything
if (files == null || !files.Any())

2
SabreTools.DatFiles/Formats/ArchiveDotOrg.Writer.cs
View File

@@ -55,7 +55,7 @@ namespace SabreTools.DatFiles.Formats
logger.User($"Writing to '{outfile}'...");
var files = CreateFiles(ignoreblanks);
if (!Serialization.ArchiveDotOrg.SerializeToFile(files, outfile))
if (!(new Serialization.Files.ArchiveDotOrg().Serialize(files, outfile)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;

4
SabreTools.DatFiles/Formats/AttractMode.Reader.cs
View File

@@ -17,7 +17,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var metadataFile = Serialization.AttractMode.Deserialize(filename);
var metadataFile = new Serialization.Files.AttractMode().Deserialize(filename);
// Convert the row data to the internal format
ConvertRows(metadataFile?.Row, filename, indexId, statsOnly);
@@ -38,7 +38,7 @@ namespace SabreTools.DatFiles.Formats
/// <param name="filename">Name of the file to be parsed</param>
/// <param name="indexId">Index ID for the DAT</param>
/// <param name="statsOnly">True to only add item statistics while parsing, false otherwise</param>
private void ConvertRows(Models.AttractMode.Row[]? rows, string filename, int indexId, bool statsOnly)
private void ConvertRows(Models.AttractMode.Row?[]? rows, string filename, int indexId, bool statsOnly)
{
// If the rows array is missing, we can't do anything
if (rows == null || !rows.Any())

2
SabreTools.DatFiles/Formats/AttractMode.Writer.cs
View File

@@ -38,7 +38,7 @@ namespace SabreTools.DatFiles.Formats
logger.User($"Writing to '{outfile}'...");
var metadataFile = CreateMetadataFile(ignoreblanks);
if (!Serialization.AttractMode.SerializeToFile(metadataFile, outfile))
if (!(new Serialization.Files.AttractMode().Serialize(metadataFile, outfile)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;

2
SabreTools.DatFiles/Formats/ClrMamePro.Reader.cs
View File

@@ -19,7 +19,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var metadataFile = Serialization.ClrMamePro.Deserialize(filename, this.Quotes);
var metadataFile = new Serialization.Files.ClrMamePro().Deserialize(filename, this.Quotes);
// Convert the header to the internal format
ConvertHeader(metadataFile?.ClrMamePro, keep);

2
SabreTools.DatFiles/Formats/ClrMamePro.Writer.cs
View File

@@ -141,7 +141,7 @@ namespace SabreTools.DatFiles.Formats
logger.User($"Writing to '{outfile}'...");
var metadataFile = CreateMetadataFile(ignoreblanks);
if (!Serialization.ClrMamePro.SerializeToFile(metadataFile, outfile, Quotes))
if (!(new Serialization.Files.ClrMamePro().Serialize(metadataFile, outfile, Quotes)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;

2
SabreTools.DatFiles/Formats/DosCenter.Reader.cs
View File

@@ -17,7 +17,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var metadataFile = Serialization.DosCenter.Deserialize(filename);
var metadataFile = new Serialization.Files.DosCenter().Deserialize(filename);
// Convert the header to the internal format
ConvertHeader(metadataFile?.DosCenter, keep);

2
SabreTools.DatFiles/Formats/DosCenter.Writer.cs
View File

@@ -53,7 +53,7 @@ namespace SabreTools.DatFiles.Formats
logger.User($"Writing to '{outfile}'...");
var metadataFile = CreateMetadataFile(ignoreblanks);
if (!Serialization.DosCenter.SerializeToFile(metadataFile, outfile))
if (!(new Serialization.Files.DosCenter().Serialize(metadataFile, outfile)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;

2
SabreTools.DatFiles/Formats/EverdriveSMDB.Reader.cs
View File

@@ -19,7 +19,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var metadataFile = Serialization.EverdriveSMDB.Deserialize(filename);
var metadataFile = new Serialization.Files.EverdriveSMDB().Deserialize(filename);
// Convert the row data to the internal format
ConvertRows(metadataFile?.Row, filename, indexId, statsOnly);

2
SabreTools.DatFiles/Formats/EverdriveSMDB.Writer.cs
View File

@@ -55,7 +55,7 @@ namespace SabreTools.DatFiles.Formats
logger.User($"Writing to '{outfile}'...");
var metadataFile = CreateMetadataFile(ignoreblanks);
if (!Serialization.EverdriveSMDB.SerializeToFile(metadataFile, outfile))
if (!(new Serialization.Files.EverdriveSMDB().Serialize(metadataFile, outfile)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;

2
SabreTools.DatFiles/Formats/Hashfile.Reader.cs
View File

@@ -18,7 +18,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var hashfile = Serialization.Hashfile.Deserialize(filename, _hash);
var hashfile = new Serialization.Files.Hashfile().Deserialize(filename, _hash);
// Convert items
switch (_hash)

2
SabreTools.DatFiles/Formats/Hashfile.Writer.cs
View File

@@ -157,7 +157,7 @@ namespace SabreTools.DatFiles.Formats
logger.User($"Writing to '{outfile}'...");
var hashfile = CreateHashFile(ignoreblanks);
if (!Serialization.Hashfile.SerializeToFile(hashfile, outfile, _hash))
if (!(new Serialization.Files.Hashfile().Serialize(hashfile, outfile, _hash)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;

2
SabreTools.DatFiles/Formats/Listrom.Reader.cs
View File

@@ -18,7 +18,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var metadataFile = Serialization.Listrom.Deserialize(filename);
var metadataFile = new Serialization.Files.Listrom().Deserialize(filename);
// Convert the set data to the internal format
ConvertSets(metadataFile?.Set, filename, indexId, statsOnly);

2
SabreTools.DatFiles/Formats/Listrom.Writer.cs
View File

@@ -62,7 +62,7 @@ namespace SabreTools.DatFiles.Formats
logger.User($"Writing to '{outfile}'...");
var metadataFile = CreateMetadataFile(ignoreblanks);
if (!Serialization.Listrom.SerializeToFile(metadataFile, outfile))
if (!(new Serialization.Files.Listrom().Serialize(metadataFile, outfile)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;

2
SabreTools.DatFiles/Formats/Listxml.Reader.cs
View File

@@ -20,7 +20,7 @@ namespace SabreTools.DatFiles.Formats
{
// Deserialize the input file
// TODO: Support M1 DATs again
var mame = Serialization.Listxml.Deserialize(filename);
var mame = new Serialization.Files.Listxml().Deserialize(filename);
// Convert the header to the internal format
ConvertHeader(mame, keep);

2
SabreTools.DatFiles/Formats/Listxml.Writer.cs
View File

@@ -186,7 +186,7 @@ namespace SabreTools.DatFiles.Formats
logger.User($"Writing to '{outfile}'...");
var mame = CreateMame(ignoreblanks);
if (!Serialization.Listxml.SerializeToFile(mame, outfile))
if (!(new Serialization.Files.Listxml().Serialize(mame, outfile)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;

2
SabreTools.DatFiles/Formats/Logiqx.Reader.cs
View File

@@ -18,7 +18,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var metadataFile = Serialization.Logiqx.Deserialize(filename);
var metadataFile = new Serialization.Files.Logiqx().Deserialize(filename);
// Convert the header to the internal format
ConvertHeader(metadataFile, keep);

4
SabreTools.DatFiles/Formats/Logiqx.Writer.cs
View File

@@ -138,9 +138,9 @@ namespace SabreTools.DatFiles.Formats
// Only write the doctype if we don't have No-Intro data
bool success;
if (string.IsNullOrWhiteSpace(Header.NoIntroID))
success = Serialization.Logiqx.SerializeToFileWithDocType(datafile, outfile);
success = new Serialization.Files.Logiqx().SerializeToFileWithDocType(datafile, outfile);
else
success = Serialization.Logiqx.SerializeToFile(datafile, outfile);
success = new Serialization.Files.Logiqx().Serialize(datafile, outfile);
if (!success)
{

2
SabreTools.DatFiles/Formats/OfflineList.Reader.cs
View File

@@ -19,7 +19,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var dat = Serialization.OfflineList.Deserialize(filename);
var dat = new Serialization.Files.OfflineList().Deserialize(filename);
// Convert the header to the internal format
ConvertHeader(dat);

2
SabreTools.DatFiles/Formats/OfflineList.Writer.cs
View File

@@ -52,7 +52,7 @@ namespace SabreTools.DatFiles.Formats
logger.User($"Writing to '{outfile}'...");
var datafile = CreateDat(ignoreblanks);
if (!Serialization.OfflineList.SerializeToFile(datafile, outfile))
if (!(new Serialization.Files.OfflineList().Serialize(datafile, outfile)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;

2
SabreTools.DatFiles/Formats/OpenMSX.Reader.cs
View File

@@ -18,7 +18,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var softwareDb = Serialization.OpenMSX.Deserialize(filename);
var softwareDb = new Serialization.Files.OpenMSX().Deserialize(filename);
// Convert the header to the internal format
ConvertHeader(softwareDb);

2
SabreTools.DatFiles/Formats/OpenMSX.Writer.cs
View File

@@ -49,7 +49,7 @@ namespace SabreTools.DatFiles.Formats
// TODO: Write out comment prefix somehow
var softwaredb = CreateSoftwareDb(ignoreblanks);
if (!Serialization.OpenMSX.SerializeToFileWithDocType(softwaredb, outfile))
if (!(new Serialization.Files.OpenMSX().SerializeToFileWithDocType(softwaredb, outfile)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;

2
SabreTools.DatFiles/Formats/RomCenter.Reader.cs
View File

@@ -18,7 +18,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var metadataFile = Serialization.RomCenter.Deserialize(filename);
var metadataFile = new Serialization.Files.RomCenter().Deserialize(filename);
// Convert the credits data to the internal format
ConvertCredits(metadataFile?.Credits);

2
SabreTools.DatFiles/Formats/RomCenter.Writer.cs
View File

@@ -51,7 +51,7 @@ namespace SabreTools.DatFiles.Formats
logger.User($"Writing to '{outfile}'...");
var metadataFile = CreateMetadataFile(ignoreblanks);
if (!Serialization.RomCenter.SerializeToFile(metadataFile, outfile))
if (!(new Serialization.Files.RomCenter().Serialize(metadataFile, outfile)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;

2
SabreTools.DatFiles/Formats/SeparatedValue.Reader.cs
View File

@@ -18,7 +18,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var metadataFile = Serialization.SeparatedValue.Deserialize(filename, _delim);
var metadataFile = new Serialization.Files.SeparatedValue().Deserialize(filename, _delim);
// Convert the row data to the internal format
ConvertRows(metadataFile?.Row, filename, indexId, statsOnly);

2
SabreTools.DatFiles/Formats/SeparatedValue.Writer.cs
View File

@@ -70,7 +70,7 @@ namespace SabreTools.DatFiles.Formats
logger.User($"Writing to '{outfile}'...");
var metadataFile = CreateMetadataFile(ignoreblanks);
if (!Serialization.SeparatedValue.SerializeToFile(metadataFile, outfile, _delim))
if (!(new Serialization.Files.SeparatedValue().Serialize(metadataFile, outfile, _delim)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;

2
SabreTools.DatFiles/Formats/SoftwareList.Reader.cs
View File

@@ -18,7 +18,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var softwarelist = Serialization.SoftawreList.Deserialize(filename);
var softwarelist = new Serialization.Files.SoftwareList().Deserialize(filename);
// Convert the header to the internal format
ConvertHeader(softwarelist, keep);

2
SabreTools.DatFiles/Formats/SoftwareList.Writer.cs
View File

@@ -140,7 +140,7 @@ namespace SabreTools.DatFiles.Formats
logger.User($"Writing to '{outfile}'...");
var softwarelist = CreateSoftwareList(ignoreblanks);
if (!Serialization.SoftawreList.SerializeToFileWithDocType(softwarelist, outfile))
if (!(new Serialization.Files.SoftwareList().SerializeToFileWithDocType(softwarelist, outfile)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;

4
SabreTools.DatFiles/SabreTools.DatFiles.csproj
View File

@@ -10,14 +10,14 @@
<ProjectReference Include="..\SabreTools.Core\SabreTools.Core.csproj" />
<ProjectReference Include="..\SabreTools.DatItems\SabreTools.DatItems.csproj" />
<ProjectReference Include="..\SabreTools.Logging\SabreTools.Logging.csproj" />
<ProjectReference Include="..\SabreTools.Serialization\SabreTools.Serialization.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.10" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SabreTools.IO" Version="1.1.1" />
<PackageReference Include="SabreTools.Models" Version="1.1.0" />
<PackageReference Include="SabreTools.Models" Version="1.1.1" />
<PackageReference Include="SabreTools.Serialization" Version="1.1.0" />
</ItemGroup>
</Project>