SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-07-08 18:06:41 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Rename "CRC" to "CRC32" where appropriate

Browse Source
This commit is contained in:
Matt Nadareski
2026-04-06 07:44:19 -04:00
parent 6a7d6e16b7
commit e2b2f4d8a5
61 changed files with 375 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs
View File

@@ -349,7 +349,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "name",
Size = 12345,
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -368,7 +368,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "name",
Size = 12345,
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -394,7 +394,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "name",
Size = 12345,
CRC16 = "XXXXXX",
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = "XXXXXX",
MD2 = string.Empty,
MD4 = "XXXXXX",
@@ -412,7 +412,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "name",
Size = 12345,
CRC16 = string.Empty,
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = string.Empty,
MD2 = "XXXXXX",
MD4 = string.Empty,
@@ -437,7 +437,7 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -455,7 +455,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX2",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -481,7 +481,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX1",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -498,7 +498,7 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX2",
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -524,7 +524,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX1",
Size = 12345,
CRC16 = "XXXXXX",
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -542,7 +542,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX2",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -568,7 +568,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX1",
Size = 12345,
CRC16 = string.Empty,
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -586,7 +586,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX2",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -612,7 +612,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX1",
Size = 12345,
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = "XXXXXX",
MD2 = string.Empty,
MD4 = string.Empty,
@@ -630,7 +630,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX2",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -656,7 +656,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX1",
Size = 12345,
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = "XXXXXX",
MD4 = string.Empty,
@@ -674,7 +674,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX2",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -700,7 +700,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX1",
Size = 12345,
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = "XXXXXX",
@@ -718,7 +718,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX2",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -744,7 +744,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX1",
Size = 12345,
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -762,7 +762,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX2",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -788,7 +788,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX1",
Size = 12345,
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -806,7 +806,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX2",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -832,7 +832,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX1",
Size = 12345,
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -850,7 +850,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX2",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -876,7 +876,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX1",
Size = 12345,
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -894,7 +894,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX2",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -920,7 +920,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX1",
Size = 12345,
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -938,7 +938,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX2",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -964,7 +964,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX1",
Size = 12345,
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -982,7 +982,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX2",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1008,7 +1008,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX1",
Size = 12345,
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -1026,7 +1026,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX2",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1052,7 +1052,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX1",
Size = 12345,
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -1070,7 +1070,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX2",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1096,7 +1096,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX1",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1114,7 +1114,7 @@ namespace SabreTools.Data.Extensions.Test
Name = "XXXXXX2",
Size = 12345,
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1380,7 +1380,7 @@ namespace SabreTools.Data.Extensions.Test
Rom self = new Rom
{
CRC16 = "XXXXXX",
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = "XXXXXX",
MD2 = string.Empty,
MD4 = "XXXXXX",
@@ -1396,7 +1396,7 @@ namespace SabreTools.Data.Extensions.Test
Rom other = new Rom
{
CRC16 = string.Empty,
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = string.Empty,
MD2 = "XXXXXX",
MD4 = string.Empty,
@@ -1420,7 +1420,7 @@ namespace SabreTools.Data.Extensions.Test
Rom self = new Rom
{
CRC16 = "XXXXXX",
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -1436,7 +1436,7 @@ namespace SabreTools.Data.Extensions.Test
Rom other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1460,7 +1460,7 @@ namespace SabreTools.Data.Extensions.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -1476,7 +1476,7 @@ namespace SabreTools.Data.Extensions.Test
Rom other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1500,7 +1500,7 @@ namespace SabreTools.Data.Extensions.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = "XXXXXX",
MD2 = string.Empty,
MD4 = string.Empty,
@@ -1516,7 +1516,7 @@ namespace SabreTools.Data.Extensions.Test
Rom other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1540,7 +1540,7 @@ namespace SabreTools.Data.Extensions.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = "XXXXXX",
MD4 = string.Empty,
@@ -1556,7 +1556,7 @@ namespace SabreTools.Data.Extensions.Test
Rom other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1580,7 +1580,7 @@ namespace SabreTools.Data.Extensions.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = "XXXXXX",
@@ -1596,7 +1596,7 @@ namespace SabreTools.Data.Extensions.Test
Rom other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1620,7 +1620,7 @@ namespace SabreTools.Data.Extensions.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -1636,7 +1636,7 @@ namespace SabreTools.Data.Extensions.Test
Rom other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1660,7 +1660,7 @@ namespace SabreTools.Data.Extensions.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -1676,7 +1676,7 @@ namespace SabreTools.Data.Extensions.Test
Rom other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1700,7 +1700,7 @@ namespace SabreTools.Data.Extensions.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -1716,7 +1716,7 @@ namespace SabreTools.Data.Extensions.Test
Rom other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1740,7 +1740,7 @@ namespace SabreTools.Data.Extensions.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -1756,7 +1756,7 @@ namespace SabreTools.Data.Extensions.Test
Rom other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1780,7 +1780,7 @@ namespace SabreTools.Data.Extensions.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -1796,7 +1796,7 @@ namespace SabreTools.Data.Extensions.Test
Rom other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1820,7 +1820,7 @@ namespace SabreTools.Data.Extensions.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -1836,7 +1836,7 @@ namespace SabreTools.Data.Extensions.Test
Rom other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1860,7 +1860,7 @@ namespace SabreTools.Data.Extensions.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -1876,7 +1876,7 @@ namespace SabreTools.Data.Extensions.Test
Rom other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1900,7 +1900,7 @@ namespace SabreTools.Data.Extensions.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -1916,7 +1916,7 @@ namespace SabreTools.Data.Extensions.Test
Rom other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1940,7 +1940,7 @@ namespace SabreTools.Data.Extensions.Test
Rom self = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -1956,7 +1956,7 @@ namespace SabreTools.Data.Extensions.Test
Rom other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -2150,7 +2150,7 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -2174,7 +2174,7 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
CRC16 = HashType.CRC16.ZeroString,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -2198,7 +2198,7 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
CRC16 = string.Empty,
CRC = HashType.CRC32.ZeroString,
CRC32 = HashType.CRC32.ZeroString,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -2222,7 +2222,7 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = HashType.CRC64.ZeroString,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -2246,7 +2246,7 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = HashType.MD2.ZeroString,
MD4 = string.Empty,
@@ -2270,7 +2270,7 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = HashType.MD4.ZeroString,
@@ -2294,7 +2294,7 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -2318,7 +2318,7 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -2342,7 +2342,7 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -2366,7 +2366,7 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -2390,7 +2390,7 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -2414,7 +2414,7 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -2438,7 +2438,7 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -2462,7 +2462,7 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -2486,7 +2486,7 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
CRC16 = HashType.CRC16.ZeroString,
CRC = HashType.CRC32.ZeroString,
CRC32 = HashType.CRC32.ZeroString,
CRC64 = HashType.CRC64.ZeroString,
MD2 = HashType.MD2.ZeroString,
MD4 = HashType.MD4.ZeroString,
@@ -2571,7 +2571,7 @@ namespace SabreTools.Data.Extensions.Test
var other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",

26
SabreTools.Data.Extensions/MetadataExtensions.cs
View File

@@ -248,8 +248,8 @@ namespace SabreTools.Data.Extensions
string? otherCrc16 = other.CRC16;
bool conditionalCrc16 = ConditionalHashEquals(selfCrc16, otherCrc16);
string? selfCrc = self.CRC;
string? otherCrc = other.CRC;
string? selfCrc = self.CRC32;
string? otherCrc = other.CRC32;
bool conditionalCrc = ConditionalHashEquals(selfCrc, otherCrc);
string? selfCrc64 = self.CRC64;
@@ -345,7 +345,7 @@ namespace SabreTools.Data.Extensions
public static bool HasHashes(this Rom rom)
{
bool crc16Null = string.IsNullOrEmpty(rom.CRC16);
bool crcNull = string.IsNullOrEmpty(rom.CRC);
bool crc32Null = string.IsNullOrEmpty(rom.CRC32);
bool crc64Null = string.IsNullOrEmpty(rom.CRC64);
bool md2Null = string.IsNullOrEmpty(rom.MD2);
bool md4Null = string.IsNullOrEmpty(rom.MD4);
@@ -359,7 +359,7 @@ namespace SabreTools.Data.Extensions
bool spamsumNull = string.IsNullOrEmpty(rom.SpamSum);
return !crc16Null
|| !crcNull
|| !crc32Null
|| !crc64Null
|| !md2Null
|| !md4Null
@@ -419,8 +419,8 @@ namespace SabreTools.Data.Extensions
string? crc16 = rom.CRC16;
bool crc16Null = string.IsNullOrEmpty(crc16) || string.Equals(crc16, HashType.CRC16.ZeroString, StringComparison.OrdinalIgnoreCase);
string? crc = rom.CRC;
bool crcNull = string.IsNullOrEmpty(crc) || string.Equals(crc, HashType.CRC32.ZeroString, StringComparison.OrdinalIgnoreCase);
string? crc32 = rom.CRC32;
bool crc32Null = string.IsNullOrEmpty(crc32) || string.Equals(crc32, HashType.CRC32.ZeroString, StringComparison.OrdinalIgnoreCase);
string? crc64 = rom.CRC64;
bool crc64Null = string.IsNullOrEmpty(crc64) || string.Equals(crc64, HashType.CRC64.ZeroString, StringComparison.OrdinalIgnoreCase);
@@ -456,7 +456,7 @@ namespace SabreTools.Data.Extensions
bool spamsumNull = string.IsNullOrEmpty(spamsum) || string.Equals(spamsum, HashType.SpamSum.ZeroString, StringComparison.OrdinalIgnoreCase);
return crc16Null
&& crcNull
&& crc32Null
&& crc64Null
&& md2Null
&& md4Null
@@ -516,8 +516,8 @@ namespace SabreTools.Data.Extensions
bool crc16Null = string.IsNullOrEmpty(self.CRC16);
crc16Null ^= string.IsNullOrEmpty(other.CRC16);
bool crcNull = string.IsNullOrEmpty(self.CRC);
crcNull ^= string.IsNullOrEmpty(other.CRC);
bool crc32Null = string.IsNullOrEmpty(self.CRC32);
crc32Null ^= string.IsNullOrEmpty(other.CRC32);
bool crc64Null = string.IsNullOrEmpty(self.CRC64);
crc64Null ^= string.IsNullOrEmpty(other.CRC64);
@@ -553,7 +553,7 @@ namespace SabreTools.Data.Extensions
spamsumNull ^= string.IsNullOrEmpty(other.SpamSum);
return !crc16Null
|| !crcNull
|| !crc32Null
|| !crc64Null
|| !md2Null
|| !md4Null
@@ -637,10 +637,10 @@ namespace SabreTools.Data.Extensions
if (string.IsNullOrEmpty(selfCrc16) && !string.IsNullOrEmpty(otherCrc16))
self.CRC16 = otherCrc16;
string? selfCrc = self.CRC;
string? otherCrc = other.CRC;
string? selfCrc = self.CRC32;
string? otherCrc = other.CRC32;
if (string.IsNullOrEmpty(selfCrc) && !string.IsNullOrEmpty(otherCrc))
self.CRC = otherCrc;
self.CRC32 = otherCrc;
string? selfCrc64 = self.CRC64;
string? otherCrc64 = other.CRC64;

8
SabreTools.Data.Models/Metadata/Rom.cs
View File

@@ -88,11 +88,11 @@ namespace SabreTools.Data.Models.Metadata
/// <remarks>ArchiveDotOrg.File</remarks>
public string? Comment { get; set; }
/// <remarks>Also "crc32" in ArchiveDotOrg.File</remarks>
public string? CRC { get; set; }
public string? CRC16 { get; set; }
/// <remarks>Mainly "crc", named here for clarity</remarks>
public string? CRC32 { get; set; }
public string? CRC64 { get; set; }
/// <remarks>ArchiveDotOrg.File</remarks>
@@ -300,8 +300,8 @@ namespace SabreTools.Data.Models.Metadata
obj.ClothCoverDetectionModuleVersion = ClothCoverDetectionModuleVersion;
obj.CollectionCatalogNumber = CollectionCatalogNumber;
obj.Comment = Comment;
obj.CRC = CRC;
obj.CRC16 = CRC16;
obj.CRC32 = CRC32;
obj.CRC64 = CRC64;
obj.Creator = Creator;
obj.Date = Date;

4
SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs
View File

@@ -24,7 +24,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem datItem = new Rom
{
Name = "rom.bin",
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = machine,
Source = source
};
@@ -53,7 +53,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem datItem = new Rom
{
Name = "rom.bin",
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = machine,
Source = source
};

4
SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs
View File

@@ -795,8 +795,8 @@ namespace SabreTools.Metadata.DatFiles.Test
ClothCoverDetectionModuleVersion = "cloth_cover_detection_module_version",
CollectionCatalogNumber = "collection-catalog-number",
Comment = "comment",
CRC = HashType.CRC32.ZeroString,
CRC16 = HashType.CRC16.ZeroString,
CRC32 = HashType.CRC32.ZeroString,
CRC64 = HashType.CRC64.ZeroString,
Creator = "creator",
Date = "date",
@@ -1507,8 +1507,8 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.Equal("cloth_cover_detection_module_version", rom.ClothCoverDetectionModuleVersion);
Assert.Equal("collection-catalog-number", rom.CollectionCatalogNumber);
Assert.Equal("comment", rom.Comment);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC);
Assert.Equal(HashType.CRC16.ZeroString, rom.CRC16);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC32);
Assert.Equal(HashType.CRC64.ZeroString, rom.CRC64);
Assert.Equal("creator", rom.Creator);
Assert.Equal("date", rom.Date);

76
SabreTools.Metadata.DatFiles.Test/DatFileTests.Splitting.cs
View File

@@ -27,7 +27,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -36,7 +36,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -45,7 +45,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -79,7 +79,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -88,7 +88,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -97,7 +97,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -131,7 +131,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -140,7 +140,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -149,7 +149,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -186,7 +186,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -195,7 +195,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -204,7 +204,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -245,7 +245,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -254,7 +254,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -263,7 +263,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -297,7 +297,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -306,7 +306,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -315,7 +315,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -375,7 +375,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = itemMachine,
Source = source
};
@@ -434,7 +434,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "deadbeef"
CRC32 = "deadbeef"
};
DatItem deviceRef = new DeviceRef
@@ -486,7 +486,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -495,7 +495,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -504,7 +504,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -538,7 +538,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -547,7 +547,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -556,7 +556,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -677,7 +677,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -686,7 +686,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -695,7 +695,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -737,7 +737,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -746,7 +746,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -755,7 +755,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -801,7 +801,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -810,7 +810,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -819,7 +819,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};
@@ -857,7 +857,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = parentMachine,
Source = source
};
@@ -866,7 +866,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "match_child_rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Machine = childMachine,
Source = source
};
@@ -875,7 +875,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "no_match_child_rom",
Size = 12345,
CRC = "beefdead",
CRC32 = "beefdead",
Machine = childMachine,
Source = source
};

2
SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs
View File

@@ -1039,8 +1039,8 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.Equal("cloth_cover_detection_module_version", rom.ClothCoverDetectionModuleVersion);
Assert.Equal("collection-catalog-number", rom.CollectionCatalogNumber);
Assert.Equal("comment", rom.Comment);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC);
Assert.Equal(HashType.CRC16.ZeroString, rom.CRC16);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC32);
Assert.Equal(HashType.CRC64.ZeroString, rom.CRC64);
Assert.Equal("creator", rom.Creator);
Assert.Equal("date", rom.Date);

78
SabreTools.Metadata.DatFiles.Test/DatFileTests.cs
View File

@@ -35,7 +35,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem rom = new Rom
{
Name = "rom",
CRC = "deadbeef",
CRC32 = "deadbeef",
Source = source,
Machine = machine
};
@@ -1378,7 +1378,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Name = "name",
Size = 12345,
CRC16 = "crc16",
CRC = "crc",
CRC32 = "crc32",
CRC64 = "crc64",
MD2 = "md2",
MD4 = "md4",
@@ -1481,7 +1481,7 @@ namespace SabreTools.Metadata.DatFiles.Test
public void FormatPrefixPostfix_Rom()
{
string fix = "%game%_%machine%_%name%_%manufacturer%_%publisher%_%category%_%crc16%_%crc%_%crc64%_%md2%_%md4%_%md5%_%ripemd128%_%ripemd160%_%sha1%_%sha256%_%sha384%_%sha512%_%size%_%spamsum%";
string expected = "machine_machine_name_manufacturer_publisher_category_crc16_crc_crc64_md2_md4_md5_ripemd128_ripemd160_sha1_sha256_sha384_sha512_12345_spamsum";
string expected = "machine_machine_name_manufacturer_publisher_category_crc16_crc32_crc64_md2_md4_md5_ripemd128_ripemd160_sha1_sha256_sha384_sha512_12345_spamsum";
Machine machine = new Machine
{
@@ -1496,7 +1496,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Name = "name",
Size = 12345,
CRC16 = "crc16",
CRC = "crc",
CRC32 = "crc32",
CRC64 = "crc64",
MD2 = "md2",
MD4 = "md4",
@@ -1531,7 +1531,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(rom);
Assert.Equal(12345, rom.Size);
Assert.Null(rom.CRC16);
Assert.Null(rom.CRC);
Assert.Null(rom.CRC32);
Assert.Null(rom.CRC64);
Assert.Null(rom.MD2);
Assert.Null(rom.MD4);
@@ -1550,14 +1550,14 @@ namespace SabreTools.Metadata.DatFiles.Test
{
DatItem item = new Rom
{
CRC = HashType.CRC32.ZeroString
CRC32 = HashType.CRC32.ZeroString
};
DatItem actual = DatFile.ProcessNullifiedItem(item);
Rom? rom = actual as Rom;
Assert.NotNull(rom);
Assert.Null(rom.Size);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC32);
Assert.Null(rom.MD2);
Assert.Null(rom.MD4);
Assert.Null(rom.MD5);
@@ -1576,7 +1576,7 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem item = new Rom
{
CRC16 = "null",
CRC = "null",
CRC32 = "null",
CRC64 = "null",
MD2 = "null",
MD4 = "null",
@@ -1595,7 +1595,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(rom);
Assert.Equal(0, rom.Size);
Assert.Equal(HashType.CRC16.ZeroString, rom.CRC16);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC);
Assert.Equal(HashType.CRC32.ZeroString, rom.CRC32);
Assert.Equal(HashType.CRC64.ZeroString, rom.CRC64);
Assert.Equal(HashType.MD2.ZeroString, rom.MD2);
Assert.Equal(HashType.MD4.ZeroString, rom.MD4);
@@ -1793,12 +1793,12 @@ namespace SabreTools.Metadata.DatFiles.Test
}
[Fact]
public void GetDuplicateSuffix_Rom_CRC()
public void GetDuplicateSuffix_Rom_CRC32()
{
string hash = "XXXXXX";
DatItem datItem = new Rom
{
CRC = hash
CRC32 = hash
};
string actual = DatFile.GetDuplicateSuffix(datItem);
@@ -1982,7 +1982,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "name",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -1997,7 +1997,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("name", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
}
[Fact]
@@ -2011,7 +2011,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "romA",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2020,7 +2020,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "romB",
Size = 23456,
CRC = "crc2",
CRC32 = "crc2",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2036,13 +2036,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("romA", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
Rom? actualRomB = actual[1] as Rom;
Assert.NotNull(actualRomB);
Assert.Equal("romB", actualRomB.Name);
Assert.Equal(23456, actualRomB.Size);
Assert.Equal("crc2", actualRomB.CRC);
Assert.Equal("crc2", actualRomB.CRC32);
}
[Fact]
@@ -2056,7 +2056,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2065,7 +2065,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2080,7 +2080,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("rom", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
}
[Fact]
@@ -2094,7 +2094,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2103,7 +2103,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 23456,
CRC = "crc2",
CRC32 = "crc2",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2119,13 +2119,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("rom", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
Rom? actualRomB = actual[1] as Rom;
Assert.NotNull(actualRomB);
Assert.Equal("rom_crc2", actualRomB.Name);
Assert.Equal(23456, actualRomB.Size);
Assert.Equal("crc2", actualRomB.CRC);
Assert.Equal("crc2", actualRomB.CRC32);
}
#endregion
@@ -2154,7 +2154,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "name",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2171,7 +2171,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("name", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
}
[Fact]
@@ -2185,7 +2185,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "romA",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2194,7 +2194,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "romB",
Size = 23456,
CRC = "crc2",
CRC32 = "crc2",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2213,13 +2213,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("romA", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
Rom? actualRomB = actual[1].Value as Rom;
Assert.NotNull(actualRomB);
Assert.Equal("romB", actualRomB.Name);
Assert.Equal(23456, actualRomB.Size);
Assert.Equal("crc2", actualRomB.CRC);
Assert.Equal("crc2", actualRomB.CRC32);
}
[Fact]
@@ -2237,7 +2237,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "crc"
CRC32 = "crc"
};
long romAIndex = datFile.AddItemDB(romA, machineIndex, sourceIndex, statsOnly: false);
@@ -2245,7 +2245,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "crc"
CRC32 = "crc"
};
long romBIndex = datFile.AddItemDB(romB, machineIndex, sourceIndex, statsOnly: false);
@@ -2261,7 +2261,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("rom", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
}
[Fact]
@@ -2275,7 +2275,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2284,7 +2284,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 23456,
CRC = "crc2",
CRC32 = "crc2",
Machine = (Machine)machine.Clone(),
Source = (Source)source.Clone()
};
@@ -2303,13 +2303,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actualRomA);
Assert.Equal("rom", actualRomA.Name);
Assert.Equal(12345, actualRomA.Size);
Assert.Equal("crc", actualRomA.CRC);
Assert.Equal("crc", actualRomA.CRC32);
Rom? actualRomB = actual[1].Value as Rom;
Assert.NotNull(actualRomB);
Assert.Equal("rom_crc2", actualRomB.Name);
Assert.Equal(23456, actualRomB.Size);
Assert.Equal("crc2", actualRomB.CRC);
Assert.Equal("crc2", actualRomB.CRC32);
}
#endregion
@@ -2363,7 +2363,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "name",
Size = 12345,
CRC = "crc"
CRC32 = "crc"
};
DatFile datFile = new Logiqx(null, useGame: false);
@@ -2402,7 +2402,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "name",
Size = 12345,
CRC = "crc",
CRC32 = "crc",
MD2 = "crc",
MD4 = "crc",
MD5 = "crc",

2
SabreTools.Metadata.DatFiles.Test/DatStatisticsTests.cs
View File

@@ -305,7 +305,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Size = 1
};
rom.CRC16 = HashType.CRC16.ZeroString;
rom.CRC = HashType.CRC32.ZeroString;
rom.CRC32 = HashType.CRC32.ZeroString;
rom.CRC64 = HashType.CRC64.ZeroString;
rom.MD2 = HashType.MD2.ZeroString;
rom.MD4 = HashType.MD4.ZeroString;

12
SabreTools.Metadata.DatFiles.Test/FormatsTests.cs
View File

@@ -289,7 +289,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
nameof(Data.Models.Metadata.Rom.Size),
nameof(Data.Models.Metadata.Rom.CRC),
nameof(Data.Models.Metadata.Rom.CRC32),
]));
}
@@ -321,7 +321,7 @@ namespace SabreTools.Metadata.DatFiles.Test
nameof(Data.Models.Metadata.Rom.SHA256),
nameof(Data.Models.Metadata.Rom.SHA1),
nameof(Data.Models.Metadata.Rom.MD5),
nameof(Data.Models.Metadata.Rom.CRC),
nameof(Data.Models.Metadata.Rom.CRC32),
]));
}
@@ -350,7 +350,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
nameof(Data.Models.Metadata.Rom.CRC),
nameof(Data.Models.Metadata.Rom.CRC32),
]));
}
@@ -742,7 +742,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
nameof(Data.Models.Metadata.Rom.Size),
nameof(Data.Models.Metadata.Rom.CRC),
nameof(Data.Models.Metadata.Rom.CRC32),
nameof(Data.Models.Metadata.Rom.SHA1),
]));
}
@@ -1277,7 +1277,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Size),
nameof(Data.Models.Metadata.Rom.CRC),
nameof(Data.Models.Metadata.Rom.CRC32),
]));
}
@@ -1335,7 +1335,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
nameof(Data.Models.Metadata.Rom.CRC),
nameof(Data.Models.Metadata.Rom.CRC32),
nameof(Data.Models.Metadata.Rom.Size),
]));
}

40
SabreTools.Metadata.DatFiles.Test/ItemDictionaryDBTests.cs
View File

@@ -306,7 +306,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
@@ -314,7 +314,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-2",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
RemoveFlag = true,
SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
@@ -550,7 +550,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
@@ -579,7 +579,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
@@ -616,7 +616,7 @@ namespace SabreTools.Metadata.DatFiles.Test
[Theory]
[InlineData(ItemKey.NULL, 2)]
[InlineData(ItemKey.Machine, 2)]
[InlineData(ItemKey.CRC, 1)]
[InlineData(ItemKey.CRC32, 1)]
[InlineData(ItemKey.SHA1, 4)]
public void BucketByTest(ItemKey itemKey, int expected)
{
@@ -631,7 +631,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
@@ -639,7 +639,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-2",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
@@ -647,7 +647,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-3",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
SHA1 = "00000ea4014ce66679e7e17d56ac510f67e39e26"
};
@@ -655,7 +655,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-4",
Size = 1024,
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
SHA1 = "00000151d437442e74e5134023fab8bf694a2487"
};
@@ -762,7 +762,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "BEEFDEAD"
CRC32 = "BEEFDEAD"
};
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
@@ -770,7 +770,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -798,7 +798,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
@@ -806,7 +806,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -834,7 +834,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
@@ -842,7 +842,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -870,7 +870,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
@@ -878,7 +878,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -906,7 +906,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair<long, DatItem>? romAPair = new KeyValuePair<long, DatItem>(romAIndex, romA);
@@ -914,7 +914,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF"
CRC32 = "DEADBEEF"
};
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair<long, DatItem>? romBPair = new KeyValuePair<long, DatItem>(romBIndex, romB);
@@ -1032,7 +1032,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "deadbeef"
CRC32 = "deadbeef"
};
var dict = new ItemDictionaryDB();

40
SabreTools.Metadata.DatFiles.Test/ItemDictionaryTests.cs
View File

@@ -291,7 +291,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
CRC = "DEAEEF",
CRC32 = "DEAEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
rom1.CopyMachineInformation(machine);
@@ -300,7 +300,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-2",
Size = 1024,
CRC = "DEAEEF",
CRC32 = "DEAEEF",
RemoveFlag = true,
SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
@@ -441,7 +441,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Size = 1024,
Name = "rom-1",
CRC = "DEAEEF",
CRC32 = "DEAEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
datItem.CopyMachineInformation(machine);
@@ -468,7 +468,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Size = 1024,
Name = "rom-1",
CRC = "DEAEEF",
CRC32 = "DEAEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
datItem.CopyMachineInformation(machine);
@@ -489,7 +489,7 @@ namespace SabreTools.Metadata.DatFiles.Test
[Theory]
[InlineData(ItemKey.NULL, 2)]
[InlineData(ItemKey.Machine, 2)]
[InlineData(ItemKey.CRC, 1)]
[InlineData(ItemKey.CRC32, 1)]
[InlineData(ItemKey.SHA1, 4)]
public void BucketByTest(ItemKey itemKey, int expected)
{
@@ -502,7 +502,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
CRC = "DEAEEF",
CRC32 = "DEAEEF",
SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
rom1.CopyMachineInformation(machine1);
@@ -511,7 +511,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-2",
Size = 1024,
CRC = "DEAEEF",
CRC32 = "DEAEEF",
SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
rom1.CopyMachineInformation(machine1);
@@ -520,7 +520,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-3",
Size = 1024,
CRC = "DEAEEF",
CRC32 = "DEAEEF",
SHA1 = "00000ea4014ce66679e7e17d56ac510f67e39e26"
};
rom1.CopyMachineInformation(machine2);
@@ -529,7 +529,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-4",
Size = 1024,
CRC = "DEAEEF",
CRC32 = "DEAEEF",
SHA1 = "00000151d437442e74e5134023fab8bf694a2487"
};
rom1.CopyMachineInformation(machine2);
@@ -616,7 +616,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "BEEFDEAD",
CRC32 = "BEEFDEAD",
Source = new Source(0)
};
romA.CopyMachineInformation(machineA);
@@ -624,7 +624,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(1)
};
romB.CopyMachineInformation(machineB);
@@ -645,7 +645,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(0)
};
romA.CopyMachineInformation(machineA);
@@ -653,7 +653,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(1)
};
romB.CopyMachineInformation(machineB);
@@ -674,7 +674,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(0)
};
romA.CopyMachineInformation(machineA);
@@ -682,7 +682,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(1)
};
romB.CopyMachineInformation(machineB);
@@ -703,7 +703,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(0)
};
romA.CopyMachineInformation(machineA);
@@ -711,7 +711,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(0)
};
romB.CopyMachineInformation(machineB);
@@ -732,7 +732,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romA = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(0)
};
romA.CopyMachineInformation(machineA);
@@ -740,7 +740,7 @@ namespace SabreTools.Metadata.DatFiles.Test
var romB = new Rom
{
Name = "same-name",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
Source = new Source(0)
};
romB.CopyMachineInformation(machineB);
@@ -856,7 +856,7 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
CRC = "deadbeef",
CRC32 = "deadbeef",
Source = source,
Machine = machine
};

19
SabreTools.Metadata.DatFiles/DatFile.cs
View File

@@ -579,7 +579,7 @@ namespace SabreTools.Metadata.DatFiles
category = machine?.Category is null ? string.Empty : string.Join(", ", machine.Category),
name = item.GetName() ?? type.AsStringValue() ?? string.Empty,
crc16 = string.Empty,
crc = string.Empty,
crc32 = string.Empty,
crc64 = string.Empty,
md2 = string.Empty,
md4 = string.Empty,
@@ -603,7 +603,7 @@ namespace SabreTools.Metadata.DatFiles
{
name = $"{file.Id}.{file.Extension}";
size = file.Size.ToString() ?? string.Empty;
crc = file.CRC ?? string.Empty;
crc32 = file.CRC ?? string.Empty;
md5 = file.MD5 ?? string.Empty;
sha1 = file.SHA1 ?? string.Empty;
sha256 = file.SHA256 ?? string.Empty;
@@ -618,7 +618,7 @@ namespace SabreTools.Metadata.DatFiles
else if (item is Rom rom)
{
crc16 = rom.CRC16 ?? string.Empty;
crc = rom.CRC ?? string.Empty;
crc32 = rom.CRC32 ?? string.Empty;
crc64 = rom.CRC64 ?? string.Empty;
md2 = rom.MD2 ?? string.Empty;
md4 = rom.MD4 ?? string.Empty;
@@ -642,7 +642,8 @@ namespace SabreTools.Metadata.DatFiles
.Replace("%publisher%", publisher)
.Replace("%category%", category)
.Replace("%crc16%", crc16)
.Replace("%crc%", crc)
.Replace("%crc%", crc32)
.Replace("%crc32%", crc32)
.Replace("%crc64%", crc64)
.Replace("%md2%", md2)
.Replace("%md4%", md4)
@@ -675,14 +676,14 @@ namespace SabreTools.Metadata.DatFiles
return rom;
// If the item CRC isn't "null"
if (rom.CRC != "null")
if (rom.CRC32 != "null")
return rom;
// If the Rom has "null" characteristics, ensure all fields
rom.Name = rom.Name == "null" ? "-" : rom.Name;
rom.Size = 0;
rom.CRC16 = rom.CRC16 == "null" ? HashType.CRC16.ZeroString : null;
rom.CRC = rom.CRC == "null" ? HashType.CRC32.ZeroString : null;
rom.CRC32 = rom.CRC32 == "null" ? HashType.CRC32.ZeroString : null;
rom.CRC64 = rom.CRC64 == "null" ? HashType.CRC64.ZeroString : null;
rom.MD2 = rom.MD2 == "null" ? HashType.MD2.ZeroString : null;
rom.MD4 = rom.MD4 == "null" ? HashType.MD4.ZeroString : null;
@@ -1076,9 +1077,9 @@ namespace SabreTools.Metadata.DatFiles
if (!string.IsNullOrEmpty(crc16))
return $"_{crc16}";
string? crc = datItem.CRC;
if (!string.IsNullOrEmpty(crc))
return $"_{crc}";
string? crc32 = datItem.CRC32;
if (!string.IsNullOrEmpty(crc32))
return $"_{crc32}";
string? crc64 = datItem.CRC64;
if (!string.IsNullOrEmpty(crc64))

4
SabreTools.Metadata.DatFiles/DatStatistics.cs
View File

@@ -340,7 +340,7 @@ namespace SabreTools.Metadata.DatFiles
{
TotalSize += rom.Size ?? 0;
ModifyHashCount(HashType.CRC16, string.IsNullOrEmpty(rom.CRC16) ? 0 : 1);
ModifyHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.CRC) ? 0 : 1);
ModifyHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.CRC32) ? 0 : 1);
ModifyHashCount(HashType.CRC64, string.IsNullOrEmpty(rom.CRC64) ? 0 : 1);
ModifyHashCount(HashType.MD2, string.IsNullOrEmpty(rom.MD2) ? 0 : 1);
ModifyHashCount(HashType.MD4, string.IsNullOrEmpty(rom.MD4) ? 0 : 1);
@@ -415,7 +415,7 @@ namespace SabreTools.Metadata.DatFiles
{
TotalSize -= rom.Size ?? 0;
ModifyHashCount(HashType.CRC16, string.IsNullOrEmpty(rom.CRC16) ? 0 : -1);
ModifyHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.CRC) ? 0 : -1);
ModifyHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.CRC32) ? 0 : -1);
ModifyHashCount(HashType.CRC64, string.IsNullOrEmpty(rom.CRC64) ? 0 : -1);
ModifyHashCount(HashType.MD2, string.IsNullOrEmpty(rom.MD2) ? 0 : -1);
ModifyHashCount(HashType.MD4, string.IsNullOrEmpty(rom.MD4) ? 0 : -1);

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

@@ -93,7 +93,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
if (rom.Size is null || rom.Size < 0)
missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
if (string.IsNullOrEmpty(rom.CRC16)
&& string.IsNullOrEmpty(rom.CRC)
&& string.IsNullOrEmpty(rom.CRC32)
&& string.IsNullOrEmpty(rom.CRC64)
&& string.IsNullOrEmpty(rom.MD2)
&& string.IsNullOrEmpty(rom.MD4)

4
SabreTools.Metadata.DatFiles/Formats/DosCenter.cs
View File

@@ -38,8 +38,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
// if (string.IsNullOrEmpty(rom.Date))
// missingFields.Add(nameof(Data.Models.Metadata.Rom.Date));
if (string.IsNullOrEmpty(rom.CRC))
missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC));
if (string.IsNullOrEmpty(rom.CRC32))
missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC32));
// if (string.IsNullOrEmpty(rom.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key)))
// missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA1));
break;

4
SabreTools.Metadata.DatFiles/Formats/EverdriveSmdb.cs
View File

@@ -40,8 +40,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA1));
if (string.IsNullOrEmpty(rom.MD5))
missingFields.Add(nameof(Data.Models.Metadata.Rom.MD5));
if (string.IsNullOrEmpty(rom.CRC))
missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC));
if (string.IsNullOrEmpty(rom.CRC32))
missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC32));
break;
default:

4
SabreTools.Metadata.DatFiles/Formats/Listrom.cs
View File

@@ -48,8 +48,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
if (rom.Size is null || rom.Size < 0)
missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
if (string.IsNullOrEmpty(rom.CRC))
missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC));
if (string.IsNullOrEmpty(rom.CRC32))
missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC32));
if (string.IsNullOrEmpty(rom.SHA1))
missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA1));
break;

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

@@ -271,7 +271,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
if (rom.Size is null || rom.Size < 0)
missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
if (string.IsNullOrEmpty(rom.CRC)
if (string.IsNullOrEmpty(rom.CRC32)
&& string.IsNullOrEmpty(rom.SHA1))
{
missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA1));

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

@@ -285,7 +285,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
if (rom.Size is null || rom.Size < 0)
missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
if (string.IsNullOrEmpty(rom.CRC16)
&& string.IsNullOrEmpty(rom.CRC)
&& string.IsNullOrEmpty(rom.CRC32)
&& string.IsNullOrEmpty(rom.CRC64)
&& string.IsNullOrEmpty(rom.MD2)
&& string.IsNullOrEmpty(rom.MD4)

4
SabreTools.Metadata.DatFiles/Formats/OfflineList.cs
View File

@@ -34,8 +34,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
case Rom rom:
if (rom.Size is null || rom.Size < 0)
missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
if (string.IsNullOrEmpty(rom.CRC))
missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC));
if (string.IsNullOrEmpty(rom.CRC32))
missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC32));
break;
default:

4
SabreTools.Metadata.DatFiles/Formats/RomCenter.cs
View File

@@ -34,8 +34,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
case Rom rom:
if (string.IsNullOrEmpty(rom.Name))
missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
if (string.IsNullOrEmpty(rom.CRC))
missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC));
if (string.IsNullOrEmpty(rom.CRC32))
missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC32));
if (rom.Size is null || rom.Size < 0)
missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
break;

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

@@ -97,7 +97,7 @@ namespace SabreTools.Metadata.DatFiles.Formats
missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
if (rom.Size is null || rom.Size < 0)
missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
if (string.IsNullOrEmpty(rom.CRC)
if (string.IsNullOrEmpty(rom.CRC32)
&& string.IsNullOrEmpty(rom.MD5)
&& string.IsNullOrEmpty(rom.SHA1)
&& string.IsNullOrEmpty(rom.SHA256)

4
SabreTools.Metadata.DatFiles/Formats/SfvFile.cs
View File

@@ -36,8 +36,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
case Rom rom:
if (string.IsNullOrEmpty(rom.Name))
missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
if (string.IsNullOrEmpty(rom.CRC))
missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC));
if (string.IsNullOrEmpty(rom.CRC32))
missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC32));
break;
default:

8
SabreTools.Metadata.DatFiles/ItemDictionary.cs
View File

@@ -147,11 +147,11 @@ namespace SabreTools.Metadata.DatFiles
// If we have a rom and it's missing size AND the hashes match a 0-byte file, fill in the rest of the info
else if ((size == 0 || size is null)
&& (string.IsNullOrEmpty(rom.CRC) || rom.HasZeroHash()))
&& (string.IsNullOrEmpty(rom.CRC32) || rom.HasZeroHash()))
{
rom.Size = 0;
rom.CRC16 = null; // HashType.CRC16.ZeroString
rom.CRC = HashType.CRC32.ZeroString;
rom.CRC32 = HashType.CRC32.ZeroString;
rom.CRC64 = null; // HashType.CRC64.ZeroString
rom.MD2 = null; // HashType.MD2.ZeroString
rom.MD4 = null; // HashType.MD4.ZeroString
@@ -710,9 +710,9 @@ namespace SabreTools.Metadata.DatFiles
else if (diskCount + mediaCount + romCount - nodumpCount == DatStatistics.GetHashCount(HashType.CRC16))
return ItemKey.CRC16;
// Otherwise, we bucket by CRC
// Otherwise, we bucket by CRC32
else
return ItemKey.CRC;
return ItemKey.CRC32;
}
/// <summary>

8
SabreTools.Metadata.DatFiles/ItemDictionaryDB.cs
View File

@@ -236,11 +236,11 @@ namespace SabreTools.Metadata.DatFiles
// If we have a rom and it's missing size AND the hashes match a 0-byte file, fill in the rest of the info
else if ((size == 0 || size is null)
&& (string.IsNullOrEmpty(rom.CRC) || rom.HasZeroHash()))
&& (string.IsNullOrEmpty(rom.CRC32) || rom.HasZeroHash()))
{
rom.Size = 0;
rom.CRC16 = null; // HashType.CRC16.ZeroString
rom.CRC = HashType.CRC32.ZeroString;
rom.CRC32 = HashType.CRC32.ZeroString;
rom.CRC64 = null; // HashType.CRC64.ZeroString
rom.MD2 = null; // HashType.MD2.ZeroString
rom.MD4 = null; // HashType.MD4.ZeroString
@@ -1025,9 +1025,9 @@ namespace SabreTools.Metadata.DatFiles
else if (diskCount + mediaCount + romCount - nodumpCount == DatStatistics.GetHashCount(HashType.CRC16))
return ItemKey.CRC16;
// Otherwise, we bucket by CRC
// Otherwise, we bucket by CRC32
else
return ItemKey.CRC;
return ItemKey.CRC32;
}
/// <summary>

18
SabreTools.Metadata.DatItems.Test/DatItemTests.cs
View File

@@ -242,10 +242,10 @@ namespace SabreTools.Metadata.DatItems.Test
[InlineData(ItemKey.CRC16, false, true, "0000")]
[InlineData(ItemKey.CRC16, true, false, "0000")]
[InlineData(ItemKey.CRC16, true, true, "0000")]
[InlineData(ItemKey.CRC, false, false, "00000000")]
[InlineData(ItemKey.CRC, false, true, "00000000")]
[InlineData(ItemKey.CRC, true, false, "00000000")]
[InlineData(ItemKey.CRC, true, true, "00000000")]
[InlineData(ItemKey.CRC32, false, false, "00000000")]
[InlineData(ItemKey.CRC32, false, true, "00000000")]
[InlineData(ItemKey.CRC32, true, false, "00000000")]
[InlineData(ItemKey.CRC32, true, true, "00000000")]
[InlineData(ItemKey.CRC64, false, false, "0000000000000000")]
[InlineData(ItemKey.CRC64, false, true, "0000000000000000")]
[InlineData(ItemKey.CRC64, true, false, "0000000000000000")]
@@ -315,10 +315,10 @@ namespace SabreTools.Metadata.DatItems.Test
[InlineData(ItemKey.CRC16, false, true, "DEADBEEF")]
[InlineData(ItemKey.CRC16, true, false, "deadbeef")]
[InlineData(ItemKey.CRC16, true, true, "deadbeef")]
[InlineData(ItemKey.CRC, false, false, "DEADBEEF")]
[InlineData(ItemKey.CRC, false, true, "DEADBEEF")]
[InlineData(ItemKey.CRC, true, false, "deadbeef")]
[InlineData(ItemKey.CRC, true, true, "deadbeef")]
[InlineData(ItemKey.CRC32, false, false, "DEADBEEF")]
[InlineData(ItemKey.CRC32, false, true, "DEADBEEF")]
[InlineData(ItemKey.CRC32, true, false, "deadbeef")]
[InlineData(ItemKey.CRC32, true, true, "deadbeef")]
[InlineData(ItemKey.CRC64, false, false, "DEADBEEF")]
[InlineData(ItemKey.CRC64, false, true, "DEADBEEF")]
[InlineData(ItemKey.CRC64, true, false, "deadbeef")]
@@ -372,7 +372,7 @@ namespace SabreTools.Metadata.DatItems.Test
DatItem datItem = new Rom
{
CRC16 = "DEADBEEF",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
CRC64 = "DEADBEEF",
MD2 = "DEADBEEF",
MD4 = "DEADBEEF",

8
SabreTools.Metadata.DatItems.Test/Formats/DiskTests.cs
View File

@@ -228,10 +228,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[InlineData(ItemKey.Machine, false, true, "Machine")]
[InlineData(ItemKey.Machine, true, false, "0000000000-machine")]
[InlineData(ItemKey.Machine, true, true, "machine")]
[InlineData(ItemKey.CRC, false, false, "00000000")]
[InlineData(ItemKey.CRC, false, true, "00000000")]
[InlineData(ItemKey.CRC, true, false, "00000000")]
[InlineData(ItemKey.CRC, true, true, "00000000")]
[InlineData(ItemKey.CRC32, false, false, "00000000")]
[InlineData(ItemKey.CRC32, false, true, "00000000")]
[InlineData(ItemKey.CRC32, true, false, "00000000")]
[InlineData(ItemKey.CRC32, true, true, "00000000")]
[InlineData(ItemKey.MD2, false, false, "8350e5a3e24c153df2275c9f80692773")]
[InlineData(ItemKey.MD2, false, true, "8350e5a3e24c153df2275c9f80692773")]
[InlineData(ItemKey.MD2, true, false, "8350e5a3e24c153df2275c9f80692773")]

10
SabreTools.Metadata.DatItems.Test/Formats/FileTests.cs
View File

@@ -36,7 +36,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Assert.Equal("XXXXXX.XXXXXX", actual.Name);
Assert.Equal(12345, actual.Size);
Assert.Equal("deadbeef", actual.CRC);
Assert.Equal("deadbeef", actual.CRC32);
Assert.Equal("000000000000000000000000deadbeef", actual.MD5);
Assert.Equal("00000000000000000000000000000000deadbeef", actual.SHA1);
Assert.Equal("00000000000000000000000000000000000000000000000000000000deadbeef", actual.SHA256);
@@ -299,10 +299,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[InlineData(ItemKey.Machine, false, true, "Machine")]
[InlineData(ItemKey.Machine, true, false, "0000000000-machine")]
[InlineData(ItemKey.Machine, true, true, "machine")]
[InlineData(ItemKey.CRC, false, false, "deadbeef")]
[InlineData(ItemKey.CRC, false, true, "deadbeef")]
[InlineData(ItemKey.CRC, true, false, "deadbeef")]
[InlineData(ItemKey.CRC, true, true, "deadbeef")]
[InlineData(ItemKey.CRC32, false, false, "deadbeef")]
[InlineData(ItemKey.CRC32, false, true, "deadbeef")]
[InlineData(ItemKey.CRC32, true, false, "deadbeef")]
[InlineData(ItemKey.CRC32, true, true, "deadbeef")]
[InlineData(ItemKey.MD2, false, false, "8350e5a3e24c153df2275c9f80692773")]
[InlineData(ItemKey.MD2, false, true, "8350e5a3e24c153df2275c9f80692773")]
[InlineData(ItemKey.MD2, true, false, "8350e5a3e24c153df2275c9f80692773")]

8
SabreTools.Metadata.DatItems.Test/Formats/MediaTests.cs
View File

@@ -290,10 +290,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[InlineData(ItemKey.Machine, false, true, "Machine")]
[InlineData(ItemKey.Machine, true, false, "0000000000-machine")]
[InlineData(ItemKey.Machine, true, true, "machine")]
[InlineData(ItemKey.CRC, false, false, "00000000")]
[InlineData(ItemKey.CRC, false, true, "00000000")]
[InlineData(ItemKey.CRC, true, false, "00000000")]
[InlineData(ItemKey.CRC, true, true, "00000000")]
[InlineData(ItemKey.CRC32, false, false, "00000000")]
[InlineData(ItemKey.CRC32, false, true, "00000000")]
[InlineData(ItemKey.CRC32, true, false, "00000000")]
[InlineData(ItemKey.CRC32, true, true, "00000000")]
[InlineData(ItemKey.MD2, false, false, "8350e5a3e24c153df2275c9f80692773")]
[InlineData(ItemKey.MD2, false, true, "8350e5a3e24c153df2275c9f80692773")]
[InlineData(ItemKey.MD2, true, false, "8350e5a3e24c153df2275c9f80692773")]

78
SabreTools.Metadata.DatItems.Test/Formats/RomTests.cs
View File

@@ -16,7 +16,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
self.FillMissingInformation(other);
Assert.Null(self.CRC16);
Assert.Null(self.CRC);
Assert.Null(self.CRC32);
Assert.Null(self.CRC64);
Assert.Null(self.MD2);
Assert.Null(self.MD4);
@@ -38,7 +38,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom other = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -55,7 +55,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
self.FillMissingInformation(other);
Assert.Equal("XXXXXX", self.CRC16);
Assert.Equal("XXXXXX", self.CRC);
Assert.Equal("XXXXXX", self.CRC32);
Assert.Equal("XXXXXX", self.CRC64);
Assert.Equal("XXXXXX", self.MD2);
Assert.Equal("XXXXXX", self.MD4);
@@ -87,7 +87,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = "XXXXXX",
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -106,12 +106,12 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
}
[Fact]
public void HasHashes_CRC_True()
public void HasHashes_CRC32_True()
{
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -135,7 +135,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = "XXXXXX",
MD2 = string.Empty,
MD4 = string.Empty,
@@ -159,7 +159,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = "XXXXXX",
MD4 = string.Empty,
@@ -183,7 +183,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = "XXXXXX",
@@ -207,7 +207,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -231,7 +231,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -255,7 +255,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -279,7 +279,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -303,7 +303,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -327,7 +327,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -351,7 +351,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -375,7 +375,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -399,7 +399,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -435,7 +435,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = "XXXXXX",
CRC = "XXXXXX",
CRC32 = "XXXXXX",
CRC64 = "XXXXXX",
MD2 = "XXXXXX",
MD4 = "XXXXXX",
@@ -459,7 +459,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = HashType.CRC16.ZeroString,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -478,12 +478,12 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
}
[Fact]
public void HasZeroHash_ZeroCRC_True()
public void HasZeroHash_ZeroCRC32_True()
{
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = HashType.CRC32.ZeroString,
CRC32 = HashType.CRC32.ZeroString,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -507,7 +507,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = HashType.CRC64.ZeroString,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -531,7 +531,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = HashType.MD2.ZeroString,
MD4 = string.Empty,
@@ -555,7 +555,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = HashType.MD4.ZeroString,
@@ -579,7 +579,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -603,7 +603,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -627,7 +627,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -651,7 +651,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -675,7 +675,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -699,7 +699,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -723,7 +723,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -747,7 +747,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = string.Empty,
CRC = string.Empty,
CRC32 = string.Empty,
CRC64 = string.Empty,
MD2 = string.Empty,
MD4 = string.Empty,
@@ -771,7 +771,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom self = new Rom
{
CRC16 = HashType.CRC16.ZeroString,
CRC = HashType.CRC32.ZeroString,
CRC32 = HashType.CRC32.ZeroString,
CRC64 = HashType.CRC64.ZeroString,
MD2 = HashType.MD2.ZeroString,
MD4 = HashType.MD4.ZeroString,
@@ -807,10 +807,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[InlineData(ItemKey.CRC16, false, true, "DEADBEEF")]
[InlineData(ItemKey.CRC16, true, false, "deadbeef")]
[InlineData(ItemKey.CRC16, true, true, "deadbeef")]
[InlineData(ItemKey.CRC, false, false, "DEADBEEF")]
[InlineData(ItemKey.CRC, false, true, "DEADBEEF")]
[InlineData(ItemKey.CRC, true, false, "deadbeef")]
[InlineData(ItemKey.CRC, true, true, "deadbeef")]
[InlineData(ItemKey.CRC32, false, false, "DEADBEEF")]
[InlineData(ItemKey.CRC32, false, true, "DEADBEEF")]
[InlineData(ItemKey.CRC32, true, false, "deadbeef")]
[InlineData(ItemKey.CRC32, true, true, "deadbeef")]
[InlineData(ItemKey.CRC64, false, false, "DEADBEEF")]
[InlineData(ItemKey.CRC64, false, true, "DEADBEEF")]
[InlineData(ItemKey.CRC64, true, false, "deadbeef")]
@@ -864,7 +864,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
DatItem datItem = new Rom
{
CRC16 = "DEADBEEF",
CRC = "DEADBEEF",
CRC32 = "DEADBEEF",
CRC64 = "DEADBEEF",
MD2 = "DEADBEEF",
MD4 = "DEADBEEF",

2
SabreTools.Metadata.DatItems/DatItem.cs
View File

@@ -190,7 +190,7 @@ namespace SabreTools.Metadata.DatItems
key = HashType.CRC16.ZeroString;
break;
case ItemKey.CRC:
case ItemKey.CRC32:
key = HashType.CRC32.ZeroString;
break;

2
SabreTools.Metadata.DatItems/Enums.cs
View File

@@ -27,7 +27,7 @@ namespace SabreTools.Metadata.DatItems
Machine,
CRC16,
CRC,
CRC32,
CRC64,
MD2,
MD4,

4
SabreTools.Metadata.DatItems/Formats/File.cs
View File

@@ -150,7 +150,7 @@ namespace SabreTools.Metadata.DatItems.Formats
rom.Name = $"{Id}.{Extension}";
rom.Size = Size;
rom.CRC = CRC;
rom.CRC32 = CRC;
rom.MD5 = MD5;
rom.SHA1 = SHA1;
rom.SHA256 = SHA256;
@@ -297,7 +297,7 @@ namespace SabreTools.Metadata.DatItems.Formats
// Now determine what the key should be based on the bucketedBy value
switch (bucketedBy)
{
case ItemKey.CRC:
case ItemKey.CRC32:
key = CRC;
break;

28
SabreTools.Metadata.DatItems/Formats/Rom.cs
View File

@@ -92,18 +92,18 @@ namespace SabreTools.Metadata.DatItems.Formats
set => _internal.Comment = value;
}
public string? CRC
{
get => _internal.CRC;
set => _internal.CRC = value;
}
public string? CRC16
{
get => _internal.CRC16;
set => _internal.CRC16 = value;
}
public string? CRC32
{
get => _internal.CRC32;
set => _internal.CRC32 = value;
}
public string? CRC64
{
get => _internal.CRC64;
@@ -691,9 +691,9 @@ namespace SabreTools.Metadata.DatItems.Formats
if (crc16 is not null)
CRC16 = NormalizeHashData(crc16, 4);
string? crc = CRC;
if (crc is not null)
CRC = TextHelper.NormalizeCRC32(crc);
string? crc32 = CRC32;
if (crc32 is not null)
CRC32 = TextHelper.NormalizeCRC32(crc32);
// TODO: This should be normalized to CRC-64
string? crc64 = CRC64;
@@ -747,9 +747,9 @@ namespace SabreTools.Metadata.DatItems.Formats
if (crc16 is not null)
CRC16 = NormalizeHashData(crc16, 4);
string? crc = CRC;
if (crc is not null)
CRC = TextHelper.NormalizeCRC32(crc);
string? crc32 = CRC32;
if (crc32 is not null)
CRC32 = TextHelper.NormalizeCRC32(crc32);
// TODO: This should be normalized to CRC-64
string? crc64 = CRC64;
@@ -957,8 +957,8 @@ namespace SabreTools.Metadata.DatItems.Formats
key = CRC16;
break;
case ItemKey.CRC:
key = CRC;
case ItemKey.CRC32:
key = CRC32;
break;
case ItemKey.CRC64:

8
SabreTools.Metadata.Filter.Test/FilterRunnerTests.cs
View File

@@ -168,7 +168,7 @@ namespace SabreTools.Metadata.Filter.Test
DatItem datItem = new Rom
{
Name = "name",
CRC = null,
CRC32 = null,
};
bool actual = _filterRunner.Run(datItem);
@@ -181,7 +181,7 @@ namespace SabreTools.Metadata.Filter.Test
DatItem datItem = new Rom
{
Name = "name",
CRC = "",
CRC32 = "",
};
bool actual = _filterRunner.Run(datItem);
@@ -194,7 +194,7 @@ namespace SabreTools.Metadata.Filter.Test
DatItem datItem = new Rom
{
Name = "name",
CRC = "NO_MATCH",
CRC32 = "NO_MATCH",
};
bool actual = _filterRunner.Run(datItem);
@@ -207,7 +207,7 @@ namespace SabreTools.Metadata.Filter.Test
DatItem datItem = new Rom
{
Name = "name",
CRC = "crc",
CRC32 = "crc",
};
bool actual = _filterRunner.Run(datItem);

7
SabreTools.Metadata.Filter/FilterObject.cs
View File

@@ -1799,12 +1799,13 @@ namespace SabreTools.Metadata.Filter
case "comment":
checkValue = obj.Comment;
return true;
case "crc":
checkValue = obj.CRC;
return true;
case "crc16":
checkValue = obj.CRC16;
return true;
case "crc":
case "crc32":
checkValue = obj.CRC32;
return true;
case "crc64":
checkValue = obj.CRC64;
return true;

2
SabreTools.Serialization.CrossModel/ArchiveDotOrg.Deserializer.cs
View File

@@ -50,7 +50,7 @@ namespace SabreTools.Serialization.CrossModel
LastModifiedTime = item.LastModifiedTime,
Size = item.Size?.ToString(),
MD5 = item.MD5,
CRC32 = item.CRC,
CRC32 = item.CRC32,
SHA1 = item.SHA1,
FileCount = item.FileCount,
Format = item.Format,

2
SabreTools.Serialization.CrossModel/ArchiveDotOrg.Serializer.cs
View File

@@ -65,7 +65,7 @@ namespace SabreTools.Serialization.CrossModel
LastModifiedTime = item.LastModifiedTime,
Size = NumberHelper.ConvertToInt64(item.Size),
MD5 = item.MD5,
CRC = item.CRC32,
CRC32 = item.CRC32,
SHA1 = item.SHA1,
FileCount = item.FileCount,
Format = item.Format,

2
SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs
View File

@@ -278,7 +278,7 @@ namespace SabreTools.Serialization.CrossModel
Name = item.Name,
Size = item.Size,
CRC16 = item.CRC16,
CRC = item.CRC,
CRC = item.CRC32,
CRC64 = item.CRC64,
MD2 = item.MD2,
MD4 = item.MD4,

2
SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs
View File

@@ -258,7 +258,7 @@ namespace SabreTools.Serialization.CrossModel
Name = item.Name,
Size = item.Size,
CRC16 = item.CRC16,
CRC = item.CRC,
CRC32 = item.CRC,
CRC64 = item.CRC64,
MD2 = item.MD2,
MD4 = item.MD4,

2
SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs
View File

@@ -68,7 +68,7 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
Size = item.Size,
CRC = item.CRC,
CRC = item.CRC32,
SHA1 = item.SHA1,
Date = item.Date,
};

2
SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs
View File

@@ -65,7 +65,7 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
Size = item.Size,
CRC = item.CRC,
CRC32 = item.CRC,
SHA1 = item.SHA1,
Date = item.Date,
};

2
SabreTools.Serialization.CrossModel/EverdriveSMDB.Deserializer.cs
View File

@@ -49,7 +49,7 @@ namespace SabreTools.Serialization.CrossModel
Name = item.Name,
SHA1 = item.SHA1,
MD5 = item.MD5,
CRC32 = item.CRC,
CRC32 = item.CRC32,
Size = item.Size,
};
return row;

2
SabreTools.Serialization.CrossModel/EverdriveSMDB.Serializer.cs
View File

@@ -57,7 +57,7 @@ namespace SabreTools.Serialization.CrossModel
Name = item.Name,
SHA1 = item.SHA1,
MD5 = item.MD5,
CRC = item.CRC32,
CRC32 = item.CRC32,
Size = item.Size,
};
return rom;

2
SabreTools.Serialization.CrossModel/Hashfile.Deserializer.cs
View File

@@ -211,7 +211,7 @@ namespace SabreTools.Serialization.CrossModel
var sfv = new SFV
{
File = item.Name,
Hash = item.CRC,
Hash = item.CRC32,
};
return sfv;
}

2
SabreTools.Serialization.CrossModel/Hashfile.Serializer.cs
View File

@@ -140,7 +140,7 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Data.Models.Metadata.Rom
{
Name = item.File,
CRC = item.Hash,
CRC32 = item.Hash,
};
return rom;
}

2
SabreTools.Serialization.CrossModel/Listrom.Deserializer.cs
View File

@@ -77,7 +77,7 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
Size = item.Size,
CRC = item.CRC,
CRC = item.CRC32,
SHA1 = item.SHA1,
};

2
SabreTools.Serialization.CrossModel/Listrom.Serializer.cs
View File

@@ -98,7 +98,7 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
Size = item.Size,
CRC = item.CRC,
CRC32 = item.CRC,
SHA1 = item.SHA1,
};

2
SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs
View File

@@ -565,7 +565,7 @@ namespace SabreTools.Serialization.CrossModel
Name = item.Name,
Bios = item.Bios,
Size = item.Size,
CRC = item.CRC,
CRC = item.CRC32,
SHA1 = item.SHA1,
Merge = item.Merge,
Region = item.Region,

2
SabreTools.Serialization.CrossModel/Listxml.Serializer.cs
View File

@@ -532,7 +532,7 @@ namespace SabreTools.Serialization.CrossModel
Name = item.Name,
Bios = item.Bios,
Size = item.Size,
CRC = item.CRC,
CRC32 = item.CRC,
SHA1 = item.SHA1,
Merge = item.Merge,
Region = item.Region,

2
SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs
View File

@@ -328,7 +328,7 @@ namespace SabreTools.Serialization.CrossModel
Name = item.Name,
Size = item.Size,
CRC16 = item.CRC16,
CRC = item.CRC,
CRC = item.CRC32,
CRC64 = item.CRC64,
MD2 = item.MD2,
MD4 = item.MD4,

2
SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs
View File

@@ -307,7 +307,7 @@ namespace SabreTools.Serialization.CrossModel
Name = item.Name,
Size = item.Size,
CRC16 = item.CRC16,
CRC = item.CRC,
CRC32 = item.CRC,
CRC64 = item.CRC64,
MD2 = item.MD2,
MD4 = item.MD4,

2
SabreTools.Serialization.CrossModel/OfflineList.Deserializer.cs
View File

@@ -112,7 +112,7 @@ namespace SabreTools.Serialization.CrossModel
var fileRomCRC = new FileRomCRC
{
Extension = item.Extension,
Content = item.CRC,
Content = item.CRC32,
};
return fileRomCRC;
}

2
SabreTools.Serialization.CrossModel/OfflineList.Serializer.cs
View File

@@ -96,7 +96,7 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Data.Models.Metadata.Rom
{
Extension = item.Extension,
CRC = item.Content,
CRC32 = item.Content,
};
return rom;
}

2
SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs
View File

@@ -102,7 +102,7 @@ namespace SabreTools.Serialization.CrossModel
GameName = parent.Name,
GameDescription = parent.Description,
RomName = item.Name,
RomCRC = item.CRC,
RomCRC = item.CRC32,
RomSize = item.Size,
RomOf = parent.RomOf,
MergeName = item.Merge,

2
SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs
View File

@@ -86,7 +86,7 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Data.Models.Metadata.Rom
{
Name = item.RomName,
CRC = item.RomCRC,
CRC32 = item.RomCRC,
Size = item.RomSize,
Merge = item.MergeName,
};

2
SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs
View File

@@ -140,7 +140,7 @@ namespace SabreTools.Serialization.CrossModel
RomName = item.Name,
DiskName = null,
Size = item.Size,
CRC = item.CRC,
CRC = item.CRC32,
MD5 = item.MD5,
SHA1 = item.SHA1,
SHA256 = item.SHA256,

2
SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs
View File

@@ -103,7 +103,7 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.RomName,
Size = item.Size,
CRC = item.CRC,
CRC32 = item.CRC,
MD5 = item.MD5,
SHA1 = item.SHA1,
SHA256 = item.SHA256,

2
SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs
View File

@@ -218,7 +218,7 @@ namespace SabreTools.Serialization.CrossModel
Name = item.Name,
Size = item.Size,
Length = item.Length,
CRC = item.CRC,
CRC = item.CRC32,
SHA1 = item.SHA1,
Offset = item.Offset,
Value = item.Value,

2
SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs
View File

@@ -209,7 +209,7 @@ namespace SabreTools.Serialization.CrossModel
Name = item.Name,
Size = item.Size,
Length = item.Length,
CRC = item.CRC,
CRC32 = item.CRC,
SHA1 = item.SHA1,
Offset = item.Offset,
Value = item.Value,