SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-07-09 02:16:55 +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

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>