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

Fix build after package update

Browse Source
This commit is contained in:
Matt Nadareski
2023-09-11 10:27:17 -04:00
parent ee84812918
commit 106c5e4cdd
6 changed files with 60 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,7 @@ namespace SabreTools.DatFiles.Formats
/// <param name="filename">Name of the file to be parsed</param> /// <param name="filename">Name of the file to be parsed</param>
/// <param name="indexId">Index ID for the DAT</param> /// <param name="indexId">Index ID for the DAT</param>
/// <param name="statsOnly">True to only add item statistics while parsing, false otherwise</param> /// <param name="statsOnly">True to only add item statistics while parsing, false otherwise</param>
private void ConvertGames(Models.ClrMamePro.GameBase[]? games, string filename, int indexId, bool statsOnly) private void ConvertGames(Models.ClrMamePro.GameBase?[]? games, string filename, int indexId, bool statsOnly)
{ {
// If the game array is missing, we can't do anything // If the game array is missing, we can't do anything
if (games == null || !games.Any()) if (games == null || !games.Any())
@@ -98,7 +98,7 @@ namespace SabreTools.DatFiles.Formats
/// <param name="filename">Name of the file to be parsed</param> /// <param name="filename">Name of the file to be parsed</param>
/// <param name="indexId">Index ID for the DAT</param> /// <param name="indexId">Index ID for the DAT</param>
/// <param name="statsOnly">True to only add item statistics while parsing, false otherwise</param> /// <param name="statsOnly">True to only add item statistics while parsing, false otherwise</param>
private void ConvertGame(Models.ClrMamePro.GameBase game, string filename, int indexId, bool statsOnly) private void ConvertGame(Models.ClrMamePro.GameBase? game, string filename, int indexId, bool statsOnly)
{ {
// If the game is missing, we can't do anything // If the game is missing, we can't do anything
if (game == null) if (game == null)

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

@@ -23,25 +23,25 @@ namespace SabreTools.DatFiles.Formats
// Convert items // Convert items
switch (_hash) switch (_hash)
{ {
case Hash.CRC: case Serialization.Hash.CRC:
ConvertSFV(hashfile?.SFV, filename, indexId, statsOnly); ConvertSFV(hashfile?.SFV, filename, indexId, statsOnly);
break; break;
case Hash.MD5: case Serialization.Hash.MD5:
ConvertMD5(hashfile?.MD5, filename, indexId, statsOnly); ConvertMD5(hashfile?.MD5, filename, indexId, statsOnly);
break; break;
case Hash.SHA1: case Serialization.Hash.SHA1:
ConvertSHA1(hashfile?.SHA1, filename, indexId, statsOnly); ConvertSHA1(hashfile?.SHA1, filename, indexId, statsOnly);
break; break;
case Hash.SHA256: case Serialization.Hash.SHA256:
ConvertSHA256(hashfile?.SHA256, filename, indexId, statsOnly); ConvertSHA256(hashfile?.SHA256, filename, indexId, statsOnly);
break; break;
case Hash.SHA384: case Serialization.Hash.SHA384:
ConvertSHA384(hashfile?.SHA384, filename, indexId, statsOnly); ConvertSHA384(hashfile?.SHA384, filename, indexId, statsOnly);
break; break;
case Hash.SHA512: case Serialization.Hash.SHA512:
ConvertSHA512(hashfile?.SHA512, filename, indexId, statsOnly); ConvertSHA512(hashfile?.SHA512, filename, indexId, statsOnly);
break; break;
case Hash.SpamSum: case Serialization.Hash.SpamSum:
ConvertSpamSum(hashfile?.SpamSum, filename, indexId, statsOnly); ConvertSpamSum(hashfile?.SpamSum, filename, indexId, statsOnly);
break; break;
} }

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

@@ -36,7 +36,7 @@ namespace SabreTools.DatFiles.Formats
// Check hash linked to specific Hashfile type // Check hash linked to specific Hashfile type
switch (_hash) switch (_hash)
{ {
case Hash.CRC: case Serialization.Hash.CRC:
switch (datItem.ItemType) switch (datItem.ItemType)
{ {
case ItemType.Rom: case ItemType.Rom:
@@ -48,7 +48,7 @@ namespace SabreTools.DatFiles.Formats
break; break;
} }
break; break;
case Hash.MD5: case Serialization.Hash.MD5:
switch (datItem.ItemType) switch (datItem.ItemType)
{ {
case ItemType.Disk: case ItemType.Disk:
@@ -68,7 +68,7 @@ namespace SabreTools.DatFiles.Formats
break; break;
} }
break; break;
case Hash.SHA1: case Serialization.Hash.SHA1:
switch (datItem.ItemType) switch (datItem.ItemType)
{ {
case ItemType.Disk: case ItemType.Disk:
@@ -88,7 +88,7 @@ namespace SabreTools.DatFiles.Formats
break; break;
} }
break; break;
case Hash.SHA256: case Serialization.Hash.SHA256:
switch (datItem.ItemType) switch (datItem.ItemType)
{ {
case ItemType.Media: case ItemType.Media:
@@ -104,7 +104,7 @@ namespace SabreTools.DatFiles.Formats
break; break;
} }
break; break;
case Hash.SHA384: case Serialization.Hash.SHA384:
switch (datItem.ItemType) switch (datItem.ItemType)
{ {
case ItemType.Rom: case ItemType.Rom:
@@ -116,7 +116,7 @@ namespace SabreTools.DatFiles.Formats
break; break;
} }
break; break;
case Hash.SHA512: case Serialization.Hash.SHA512:
switch (datItem.ItemType) switch (datItem.ItemType)
{ {
case ItemType.Rom: case ItemType.Rom:
@@ -128,7 +128,7 @@ namespace SabreTools.DatFiles.Formats
break; break;
} }
break; break;
case Hash.SpamSum: case Serialization.Hash.SpamSum:
switch (datItem.ItemType) switch (datItem.ItemType)
{ {
case ItemType.Media: case ItemType.Media:
@@ -185,25 +185,25 @@ namespace SabreTools.DatFiles.Formats
switch (_hash) switch (_hash)
{ {
case Hash.CRC: case Serialization.Hash.CRC:
hashfile.SFV = CreateSFV(ignoreblanks); hashfile.SFV = CreateSFV(ignoreblanks);
break; break;
case Hash.MD5: case Serialization.Hash.MD5:
hashfile.MD5 = CreateMD5(ignoreblanks); hashfile.MD5 = CreateMD5(ignoreblanks);
break; break;
case Hash.SHA1: case Serialization.Hash.SHA1:
hashfile.SHA1 = CreateSHA1(ignoreblanks); hashfile.SHA1 = CreateSHA1(ignoreblanks);
break; break;
case Hash.SHA256: case Serialization.Hash.SHA256:
hashfile.SHA256 = CreateSHA256(ignoreblanks); hashfile.SHA256 = CreateSHA256(ignoreblanks);
break; break;
case Hash.SHA384: case Serialization.Hash.SHA384:
hashfile.SHA384 = CreateSHA384(ignoreblanks); hashfile.SHA384 = CreateSHA384(ignoreblanks);
break; break;
case Hash.SHA512: case Serialization.Hash.SHA512:
hashfile.SHA512 = CreateSHA512(ignoreblanks); hashfile.SHA512 = CreateSHA512(ignoreblanks);
break; break;
case Hash.SpamSum: case Serialization.Hash.SpamSum:
hashfile.SpamSum = CreateSpamSum(ignoreblanks); hashfile.SpamSum = CreateSpamSum(ignoreblanks);
break; break;
} }

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

@@ -8,7 +8,7 @@ namespace SabreTools.DatFiles.Formats
internal partial class Hashfile : DatFile internal partial class Hashfile : DatFile
{ {
// Private instance variables specific to Hashfile DATs // Private instance variables specific to Hashfile DATs
private readonly Hash _hash; private readonly Serialization.Hash _hash;
/// <summary> /// <summary>
/// Constructor designed for casting a base DatFile /// Constructor designed for casting a base DatFile
@@ -18,7 +18,25 @@ namespace SabreTools.DatFiles.Formats
public Hashfile(DatFile? datFile, Hash hash) public Hashfile(DatFile? datFile, Hash hash)
: base(datFile) : base(datFile)
{ {
_hash = hash; _hash = ConvertHash(hash);
}
/// <summary>
/// Convert hash types between internal and Serialization
/// </summary>
private Serialization.Hash ConvertHash(Hash hash)
{
return hash switch
{
Hash.CRC => Serialization.Hash.CRC,
Hash.MD5 => Serialization.Hash.MD5,
Hash.SHA1 => Serialization.Hash.SHA1,
Hash.SHA256 => Serialization.Hash.SHA256,
Hash.SHA384 => Serialization.Hash.SHA384,
Hash.SHA512 => Serialization.Hash.SHA512,
Hash.SpamSum => Serialization.Hash.SpamSum,
_ => throw new System.ArgumentOutOfRangeException(),
};
} }
} }
} }

32
SabreTools.Test/Serialization/DeserializationTests.cs
View File

@@ -204,14 +204,14 @@ namespace SabreTools.Test.Parser
} }
[Theory] [Theory]
[InlineData("test-sfv-files.sfv", Hash.CRC, 100)] [InlineData("test-sfv-files.sfv", Serialization.Hash.CRC, 100)]
[InlineData("test-md5-files.md5", Hash.MD5, 100)] [InlineData("test-md5-files.md5", Serialization.Hash.MD5, 100)]
[InlineData("test-sha1-files.sha1", Hash.SHA1, 100)] [InlineData("test-sha1-files.sha1", Serialization.Hash.SHA1, 100)]
[InlineData("test-sha256.sha256", Hash.SHA256, 1)] [InlineData("test-sha256.sha256", Serialization.Hash.SHA256, 1)]
[InlineData("test-sha384.sha384", Hash.SHA384, 1)] [InlineData("test-sha384.sha384", Serialization.Hash.SHA384, 1)]
[InlineData("test-sha512.sha512", Hash.SHA512, 1)] [InlineData("test-sha512.sha512", Serialization.Hash.SHA512, 1)]
[InlineData("test-spamsum.spamsum", Hash.SpamSum, 1)] [InlineData("test-spamsum.spamsum", Serialization.Hash.SpamSum, 1)]
public void HashfileDeserializeTest(string path, Hash hash, long count) public void HashfileDeserializeTest(string path, Serialization.Hash hash, long count)
{ {
// Open the file for reading // Open the file for reading
string filename = System.IO.Path.Combine(Environment.CurrentDirectory, "TestData", path); string filename = System.IO.Path.Combine(Environment.CurrentDirectory, "TestData", path);
@@ -224,25 +224,25 @@ namespace SabreTools.Test.Parser
switch (hash) switch (hash)
{ {
case Hash.CRC: case Serialization.Hash.CRC:
Assert.Equal(count, dat.SFV.Length); Assert.Equal(count, dat.SFV.Length);
break; break;
case Hash.MD5: case Serialization.Hash.MD5:
Assert.Equal(count, dat.MD5.Length); Assert.Equal(count, dat.MD5.Length);
break; break;
case Hash.SHA1: case Serialization.Hash.SHA1:
Assert.Equal(count, dat.SHA1.Length); Assert.Equal(count, dat.SHA1.Length);
break; break;
case Hash.SHA256: case Serialization.Hash.SHA256:
Assert.Equal(count, dat.SHA256.Length); Assert.Equal(count, dat.SHA256.Length);
break; break;
case Hash.SHA384: case Serialization.Hash.SHA384:
Assert.Equal(count, dat.SHA384.Length); Assert.Equal(count, dat.SHA384.Length);
break; break;
case Hash.SHA512: case Serialization.Hash.SHA512:
Assert.Equal(count, dat.SHA512.Length); Assert.Equal(count, dat.SHA512.Length);
break; break;
case Hash.SpamSum: case Serialization.Hash.SpamSum:
Assert.Equal(count, dat.SpamSum.Length); Assert.Equal(count, dat.SpamSum.Length);
break; break;
default: default:
@@ -1005,7 +1005,7 @@ namespace SabreTools.Test.Parser
string filename = System.IO.Path.Combine(Environment.CurrentDirectory, "TestData", path); string filename = System.IO.Path.Combine(Environment.CurrentDirectory, "TestData", path);
// Deserialize the file // Deserialize the file
var dat = new Serialization.Files.SoftawreList().Deserialize(filename); var dat = new Serialization.Files.SoftwareList().Deserialize(filename);
// Validate the values // Validate the values
Assert.NotNull(dat); Assert.NotNull(dat);

2
SabreTools.Test/Serialization/SerializationTests.cs
View File

@@ -12,7 +12,7 @@ namespace SabreTools.Test.Parser
var dat = GenerateOpenMSX(); var dat = GenerateOpenMSX();
// Deserialize the file // Deserialize the file
var stream = new Serialization.Files.OpenMSX.SerializeToStream(dat) as System.IO.MemoryStream; var stream = new Serialization.Streams.OpenMSX().Serialize(dat) as System.IO.MemoryStream;
// Validate the values // Validate the values
Assert.NotNull(stream); Assert.NotNull(stream);