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

Update packages, fix build

Browse Source
This commit is contained in:
Matt Nadareski
2024-04-24 13:45:38 -04:00
parent dc889afdbb
commit c53a506dba
56 changed files with 199 additions and 1378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ namespace SabreTools.DatFiles.Formats
/// <summary>
/// Represents a Archive.org file list
/// </summary>
internal sealed class ArchiveDotOrg : SerializableDatFile<Models.ArchiveDotOrg.Files, Serialization.Files.ArchiveDotOrg, Serialization.CrossModel.ArchiveDotOrg>
internal sealed class ArchiveDotOrg : SerializableDatFile<Models.ArchiveDotOrg.Files, Serialization.Deserializers.ArchiveDotOrg, Serialization.Serializers.ArchiveDotOrg, Serialization.CrossModel.ArchiveDotOrg>
{
/// <summary>
/// Constructor designed for casting a base DatFile

3
SabreTools.DatFiles/Formats/AttractMode.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.DatItems;
namespace SabreTools.DatFiles.Formats
@@ -7,7 +6,7 @@ namespace SabreTools.DatFiles.Formats
/// <summary>
/// Represents an AttractMode DAT
/// </summary>
internal sealed class AttractMode : SerializableDatFile<Models.AttractMode.MetadataFile, Serialization.Files.AttractMode, Serialization.CrossModel.AttractMode>
internal sealed class AttractMode : SerializableDatFile<Models.AttractMode.MetadataFile, Serialization.Deserializers.AttractMode, Serialization.Serializers.AttractMode, Serialization.CrossModel.AttractMode>
{
/// <summary>
/// Constructor designed for casting a base DatFile

7
SabreTools.DatFiles/Formats/ClrMamePro.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
@@ -10,7 +9,7 @@ namespace SabreTools.DatFiles.Formats
/// <summary>
/// Represents a ClrMamePro DAT
/// </summary>
internal sealed class ClrMamePro : SerializableDatFile<Models.ClrMamePro.MetadataFile, Serialization.Files.ClrMamePro, Serialization.CrossModel.ClrMamePro>
internal sealed class ClrMamePro : SerializableDatFile<Models.ClrMamePro.MetadataFile, Serialization.Deserializers.ClrMamePro, Serialization.Serializers.ClrMamePro, Serialization.CrossModel.ClrMamePro>
{
#region Fields
@@ -38,7 +37,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var metadataFile = new Serialization.Files.ClrMamePro().Deserialize(filename, this.Quotes);
var metadataFile = Serialization.Deserializers.ClrMamePro.DeserializeFile(filename, this.Quotes);
var metadata = new Serialization.CrossModel.ClrMamePro().Serialize(metadataFile);
// Convert to the internal format
@@ -181,7 +180,7 @@ namespace SabreTools.DatFiles.Formats
// Serialize the input file
var metadata = ConvertMetadata(ignoreblanks);
var metadataFile = new Serialization.CrossModel.ClrMamePro().Deserialize(metadata);
if (!(new Serialization.Files.ClrMamePro().Serialize(metadataFile, outfile, Quotes)))
if (!(Serialization.Serializers.ClrMamePro.SerializeFile(metadataFile, outfile, Quotes)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;

3
SabreTools.DatFiles/Formats/DosCenter.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
@@ -8,7 +7,7 @@ namespace SabreTools.DatFiles.Formats
/// <summary>
/// Represents parsing and writing of a DosCenter DAT
/// </summary>
internal sealed class DosCenter : SerializableDatFile<Models.DosCenter.MetadataFile, Serialization.Files.DosCenter, Serialization.CrossModel.DosCenter>
internal sealed class DosCenter : SerializableDatFile<Models.DosCenter.MetadataFile, Serialization.Deserializers.DosCenter, Serialization.Serializers.DosCenter, Serialization.CrossModel.DosCenter>
{
/// <summary>
/// Constructor designed for casting a base DatFile

3
SabreTools.DatFiles/Formats/EverdriveSmdb.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
@@ -8,7 +7,7 @@ namespace SabreTools.DatFiles.Formats
/// <summary>
/// Represents parsing and writing of an Everdrive SMDB file
/// </summary>
internal sealed class EverdriveSMDB : SerializableDatFile<Models.EverdriveSMDB.MetadataFile, Serialization.Files.EverdriveSMDB, Serialization.CrossModel.EverdriveSMDB>
internal sealed class EverdriveSMDB : SerializableDatFile<Models.EverdriveSMDB.MetadataFile, Serialization.Deserializers.EverdriveSMDB, Serialization.Serializers.EverdriveSMDB, Serialization.CrossModel.EverdriveSMDB>
{
/// <summary>
/// Constructor designed for casting a base DatFile

42
SabreTools.DatFiles/Formats/Hashfile.cs
View File

@@ -1,18 +1,18 @@
using System;
using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.Hashing;
namespace SabreTools.DatFiles.Formats
{
/// <summary>
/// Represents a hashfile such as an SFV, MD5, or SHA-1 file
/// </summary>
internal abstract class Hashfile : SerializableDatFile<Models.Hashfile.Hashfile, Serialization.Files.Hashfile, Serialization.CrossModel.Hashfile>
internal abstract class Hashfile : SerializableDatFile<Models.Hashfile.Hashfile, Serialization.Deserializers.Hashfile, Serialization.Serializers.Hashfile, Serialization.CrossModel.Hashfile>
{
// Private instance variables specific to Hashfile DATs
protected Serialization.Hash _hash;
protected HashType _hash;
/// <summary>
/// Constructor designed for casting a base DatFile
@@ -29,7 +29,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var hashfile = new Serialization.Files.Hashfile().Deserialize(filename, _hash);
var hashfile = Serialization.Deserializers.Hashfile.DeserializeFile(filename, _hash);
var metadata = new Serialization.CrossModel.Hashfile().Serialize(hashfile);
// Convert to the internal format
@@ -65,7 +65,11 @@ namespace SabreTools.DatFiles.Formats
// Check hash linked to specific Hashfile type
switch (_hash)
{
case Serialization.Hash.CRC:
case HashType.CRC32:
case HashType.CRC32_ISO:
case HashType.CRC32_Naive:
case HashType.CRC32_Optimized:
case HashType.CRC32_Parallel:
switch (datItem)
{
case Rom rom:
@@ -77,7 +81,7 @@ namespace SabreTools.DatFiles.Formats
break;
}
break;
case Serialization.Hash.MD5:
case HashType.MD5:
switch (datItem)
{
case Disk disk:
@@ -97,7 +101,7 @@ namespace SabreTools.DatFiles.Formats
break;
}
break;
case Serialization.Hash.SHA1:
case HashType.SHA1:
switch (datItem)
{
case Disk disk:
@@ -117,7 +121,7 @@ namespace SabreTools.DatFiles.Formats
break;
}
break;
case Serialization.Hash.SHA256:
case HashType.SHA256:
switch (datItem)
{
case Media medium:
@@ -133,7 +137,7 @@ namespace SabreTools.DatFiles.Formats
break;
}
break;
case Serialization.Hash.SHA384:
case HashType.SHA384:
switch (datItem)
{
case Rom rom:
@@ -145,7 +149,7 @@ namespace SabreTools.DatFiles.Formats
break;
}
break;
case Serialization.Hash.SHA512:
case HashType.SHA512:
switch (datItem)
{
case Rom rom:
@@ -157,7 +161,7 @@ namespace SabreTools.DatFiles.Formats
break;
}
break;
case Serialization.Hash.SpamSum:
case HashType.SpamSum:
switch (datItem)
{
case Media medium:
@@ -188,7 +192,7 @@ namespace SabreTools.DatFiles.Formats
// Serialize the input file
var metadata = ConvertMetadata(ignoreblanks);
var hashfile = new Serialization.CrossModel.Hashfile().Deserialize(metadata, _hash);
if (!(new Serialization.Files.Hashfile().Serialize(hashfile, outfile, _hash)))
if (!(Serialization.Serializers.Hashfile.SerializeFile(hashfile, outfile, _hash)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;
@@ -217,7 +221,7 @@ namespace SabreTools.DatFiles.Formats
public SfvFile(DatFile? datFile)
: base(datFile)
{
_hash = Serialization.Hash.CRC;
_hash = HashType.CRC32;
}
}
@@ -233,7 +237,7 @@ namespace SabreTools.DatFiles.Formats
public Md5File(DatFile? datFile)
: base(datFile)
{
_hash = Serialization.Hash.MD5;
_hash = HashType.MD5;
}
}
@@ -249,7 +253,7 @@ namespace SabreTools.DatFiles.Formats
public Sha1File(DatFile? datFile)
: base(datFile)
{
_hash = Serialization.Hash.SHA1;
_hash = HashType.SHA1;
}
}
@@ -265,7 +269,7 @@ namespace SabreTools.DatFiles.Formats
public Sha256File(DatFile? datFile)
: base(datFile)
{
_hash = Serialization.Hash.SHA256;
_hash = HashType.SHA256;
}
}
@@ -281,7 +285,7 @@ namespace SabreTools.DatFiles.Formats
public Sha384File(DatFile? datFile)
: base(datFile)
{
_hash = Serialization.Hash.SHA384;
_hash = HashType.SHA384;
}
}
@@ -297,7 +301,7 @@ namespace SabreTools.DatFiles.Formats
public Sha512File(DatFile? datFile)
: base(datFile)
{
_hash = Serialization.Hash.SHA512;
_hash = HashType.SHA512;
}
}
@@ -313,7 +317,7 @@ namespace SabreTools.DatFiles.Formats
public SpamSumFile(DatFile? datFile)
: base(datFile)
{
_hash = Serialization.Hash.SpamSum;
_hash = HashType.SpamSum;
}
}
}

3
SabreTools.DatFiles/Formats/Listrom.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
@@ -8,7 +7,7 @@ namespace SabreTools.DatFiles.Formats
/// <summary>
/// Represents a MAME Listrom file
/// </summary>
internal sealed class Listrom : SerializableDatFile<Models.Listrom.MetadataFile, Serialization.Files.Listrom, Serialization.CrossModel.Listrom>
internal sealed class Listrom : SerializableDatFile<Models.Listrom.MetadataFile, Serialization.Deserializers.Listrom, Serialization.Serializers.Listrom, Serialization.CrossModel.Listrom>
{
/// <summary>
/// Constructor designed for casting a base DatFile

7
SabreTools.DatFiles/Formats/Listxml.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
@@ -10,7 +9,7 @@ namespace SabreTools.DatFiles.Formats
/// <summary>
/// Represents a MAME/M1 XML DAT
/// </summary>
internal sealed class Listxml : SerializableDatFile<Models.Listxml.Mame, Serialization.Files.Listxml, Serialization.CrossModel.Listxml>
internal sealed class Listxml : SerializableDatFile<Models.Listxml.Mame, Serialization.Deserializers.Listxml, Serialization.Serializers.Listxml, Serialization.CrossModel.Listxml>
{
/// <summary>
/// DTD for original MAME XML DATs
@@ -193,11 +192,11 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var mame = new Serialization.Files.Listxml().Deserialize(filename);
var mame = Serialization.Deserializers.Listxml.DeserializeFile(filename);
Models.Metadata.MetadataFile? metadata;
if (mame == null)
{
var m1 = new Serialization.Files.M1().Deserialize(filename);
var m1 = Serialization.Deserializers.M1.DeserializeFile(filename);
metadata = new Serialization.CrossModel.M1().Serialize(m1);
}
else

8
SabreTools.DatFiles/Formats/Logiqx.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
@@ -10,7 +9,7 @@ namespace SabreTools.DatFiles.Formats
/// <summary>
/// Represents a Logiqx-derived DAT
/// </summary>
internal sealed class Logiqx : SerializableDatFile<Models.Logiqx.Datafile, Serialization.Files.Logiqx, Serialization.CrossModel.Logiqx>
internal sealed class Logiqx : SerializableDatFile<Models.Logiqx.Datafile, Serialization.Deserializers.Logiqx, Serialization.Serializers.Logiqx, Serialization.CrossModel.Logiqx>
{
// Private instance variables specific to Logiqx DATs
private readonly bool _deprecated;
@@ -356,12 +355,13 @@ namespace SabreTools.DatFiles.Formats
var metadata = ConvertMetadata(ignoreblanks);
var datafile = new Serialization.CrossModel.Logiqx().Deserialize(metadata);
// TODO: Reenable doctype writing
// Only write the doctype if we don't have No-Intro data
bool success;
if (string.IsNullOrEmpty(Header.GetStringFieldValue(Models.Metadata.Header.IdKey)))
success = new Serialization.Files.Logiqx().SerializeToFileWithDocType(datafile!, outfile);
success = Serialization.Serializers.Logiqx.SerializeFile(datafile!, outfile);
else
success = new Serialization.Files.Logiqx().Serialize(datafile, outfile);
success = Serialization.Serializers.Logiqx.SerializeFile(datafile, outfile);
if (!success)
{

3
SabreTools.DatFiles/Formats/OfflineList.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
@@ -8,7 +7,7 @@ namespace SabreTools.DatFiles.Formats
/// <summary>
/// Represents an OfflineList XML DAT
/// </summary>
internal sealed class OfflineList : SerializableDatFile<Models.OfflineList.Dat, Serialization.Files.OfflineList, Serialization.CrossModel.OfflineList>
internal sealed class OfflineList : SerializableDatFile<Models.OfflineList.Dat, Serialization.Deserializers.OfflineList, Serialization.Serializers.OfflineList, Serialization.CrossModel.OfflineList>
{
/// <summary>
/// Constructor designed for casting a base DatFile

3
SabreTools.DatFiles/Formats/OpenMSX.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
@@ -8,7 +7,7 @@ namespace SabreTools.DatFiles.Formats
/// <summary>
/// Represents an openMSX softawre list XML DAT
/// </summary>
internal sealed class OpenMSX : SerializableDatFile<Models.OpenMSX.SoftwareDb, Serialization.Files.OpenMSX, Serialization.CrossModel.OpenMSX>
internal sealed class OpenMSX : SerializableDatFile<Models.OpenMSX.SoftwareDb, Serialization.Deserializers.OpenMSX, Serialization.Serializers.OpenMSX, Serialization.CrossModel.OpenMSX>
{
/// <summary>
/// DTD for original openMSX DATs

3
SabreTools.DatFiles/Formats/RomCenter.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
@@ -8,7 +7,7 @@ namespace SabreTools.DatFiles.Formats
/// <summary>
/// Represents a RomCenter INI file
/// </summary>
internal sealed class RomCenter : SerializableDatFile<Models.RomCenter.MetadataFile, Serialization.Files.RomCenter, Serialization.CrossModel.RomCenter>
internal sealed class RomCenter : SerializableDatFile<Models.RomCenter.MetadataFile, Serialization.Deserializers.RomCenter, Serialization.Serializers.RomCenter, Serialization.CrossModel.RomCenter>
{
/// <summary>
/// Constructor designed for casting a base DatFile

7
SabreTools.DatFiles/Formats/SeparatedValue.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
@@ -9,7 +8,7 @@ namespace SabreTools.DatFiles.Formats
/// <summary>
/// Represents a value-separated DAT
/// </summary>
internal abstract class SeparatedValue : SerializableDatFile<Models.SeparatedValue.MetadataFile, Serialization.Files.SeparatedValue, Serialization.CrossModel.SeparatedValue>
internal abstract class SeparatedValue : SerializableDatFile<Models.SeparatedValue.MetadataFile, Serialization.Deserializers.SeparatedValue, Serialization.Serializers.SeparatedValue, Serialization.CrossModel.SeparatedValue>
{
// Private instance variables specific to Hashfile DATs
protected char _delim;
@@ -29,7 +28,7 @@ namespace SabreTools.DatFiles.Formats
try
{
// Deserialize the input file
var metadataFile = new Serialization.Files.SeparatedValue().Deserialize(filename, _delim);
var metadataFile = Serialization.Deserializers.SeparatedValue.DeserializeFile(filename, _delim);
var metadata = new Serialization.CrossModel.SeparatedValue().Serialize(metadataFile);
// Convert to the internal format
@@ -101,7 +100,7 @@ namespace SabreTools.DatFiles.Formats
// Serialize the input file
var metadata = ConvertMetadata(ignoreblanks);
var metadataFile = new Serialization.CrossModel.SeparatedValue().Deserialize(metadata);
if (!(new Serialization.Files.SeparatedValue().Serialize(metadataFile, outfile, _delim)))
if (!(Serialization.Serializers.SeparatedValue.SerializeFile(metadataFile, outfile, _delim)))
{
logger.Warning($"File '{outfile}' could not be written! See the log for more details.");
return false;

3
SabreTools.DatFiles/Formats/SoftwareList.cs
View File

@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using SabreTools.Core;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
@@ -9,7 +8,7 @@ namespace SabreTools.DatFiles.Formats
/// <summary>
/// Represents parsing and writing of a SoftwareList
/// </summary>
internal sealed class SoftwareList : SerializableDatFile<Models.SoftwareList.SoftwareList, Serialization.Files.SoftwareList, Serialization.CrossModel.SoftwareList>
internal sealed class SoftwareList : SerializableDatFile<Models.SoftwareList.SoftwareList, Serialization.Deserializers.SoftwareList, Serialization.Serializers.SoftwareList, Serialization.CrossModel.SoftwareList>
{
/// <summary>
/// DTD for original MAME Software List DATs