diff --git a/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs b/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs
index 16b57fac..e7d0fe01 100644
--- a/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs
+++ b/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs
@@ -15,15 +15,14 @@ namespace SabreTools.Data.Extensions.Test
Rom? actual = self.ConvertToRom();
Assert.NotNull(actual);
- Assert.Equal(4, actual.Count);
Assert.Equal(ItemType.Rom, actual.ItemType);
Assert.Null(actual.Name);
- Assert.Null(actual[Rom.MergeKey]);
- Assert.Null(actual[Rom.RegionKey]);
+ Assert.Null(actual.Merge);
+ Assert.Null(actual.Region);
Assert.Null(actual.Status);
Assert.Null(actual.Optional);
- Assert.Null(actual[Rom.MD5Key]);
- Assert.Null(actual[Rom.SHA1Key]);
+ Assert.Null(actual.MD5);
+ Assert.Null(actual.SHA1);
}
[Fact]
@@ -43,15 +42,14 @@ namespace SabreTools.Data.Extensions.Test
Rom? actual = self.ConvertToRom();
Assert.NotNull(actual);
- Assert.Equal(4, actual.Count);
Assert.Equal(ItemType.Rom, actual.ItemType);
Assert.Equal("name.chd", actual.Name);
- Assert.Equal("merge", actual[Rom.MergeKey]);
- Assert.Equal("region", actual[Rom.RegionKey]);
+ Assert.Equal("merge", actual.Merge);
+ Assert.Equal("region", actual.Region);
Assert.Equal(ItemStatus.Good, actual.Status);
Assert.Equal(true, actual.Optional);
- Assert.Equal("md5", actual[Rom.MD5Key]);
- Assert.Equal("sha1", actual[Rom.SHA1Key]);
+ Assert.Equal("md5", actual.MD5);
+ Assert.Equal("sha1", actual.SHA1);
}
[Fact]
@@ -61,13 +59,12 @@ namespace SabreTools.Data.Extensions.Test
Rom? actual = self.ConvertToRom();
Assert.NotNull(actual);
- Assert.Equal(4, actual.Count);
Assert.Equal(ItemType.Rom, actual.ItemType);
Assert.Null(actual.Name);
- Assert.Null(actual[Rom.MD5Key]);
- Assert.Null(actual[Rom.SHA1Key]);
- Assert.Null(actual[Rom.SHA256Key]);
- Assert.Null(actual[Rom.SpamSumKey]);
+ Assert.Null(actual.MD5);
+ Assert.Null(actual.SHA1);
+ Assert.Null(actual.SHA256);
+ Assert.Null(actual.SpamSum);
}
[Fact]
@@ -85,13 +82,12 @@ namespace SabreTools.Data.Extensions.Test
Rom? actual = self.ConvertToRom();
Assert.NotNull(actual);
- Assert.Equal(4, actual.Count);
Assert.Equal(ItemType.Rom, actual.ItemType);
Assert.Equal("name.aaruf", actual.Name);
- Assert.Equal("md5", actual[Rom.MD5Key]);
- Assert.Equal("sha1", actual[Rom.SHA1Key]);
- Assert.Equal("sha256", actual[Rom.SHA256Key]);
- Assert.Equal("spamsum", actual[Rom.SpamSumKey]);
+ Assert.Equal("md5", actual.MD5);
+ Assert.Equal("sha1", actual.SHA1);
+ Assert.Equal("sha256", actual.SHA256);
+ Assert.Equal("spamsum", actual.SpamSum);
}
#endregion
@@ -352,38 +348,38 @@ namespace SabreTools.Data.Extensions.Test
Status = ItemStatus.Nodump,
Name = "name",
Size = 12345,
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
var other = new Rom
{
Status = ItemStatus.Nodump,
Name = "name",
Size = 12345,
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
bool actual = self.PartialEquals(other);
@@ -397,37 +393,37 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "name",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = string.Empty,
+ CRC64 = "XXXXXX",
+ MD2 = string.Empty,
+ MD4 = "XXXXXX",
+ MD5 = string.Empty,
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = string.Empty,
+ SHA1 = "XXXXXX",
+ SHA256 = string.Empty,
+ SHA384 = "XXXXXX",
+ SHA512 = string.Empty,
+ SpamSum = "XXXXXX",
};
var other = new Rom
{
Name = "name",
Size = 12345,
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = "XXXXXX",
+ CRC64 = string.Empty,
+ MD2 = "XXXXXX",
+ MD4 = string.Empty,
+ MD5 = "XXXXXX",
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = "XXXXXX",
+ SHA1 = string.Empty,
+ SHA256 = "XXXXXX",
+ SHA384 = string.Empty,
+ SHA512 = "XXXXXX",
+ SpamSum = string.Empty,
};
bool actual = self.PartialEquals(other);
@@ -440,37 +436,37 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom
{
Name = "XXXXXX1",
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
var other = new Rom
{
Name = "XXXXXX2",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -484,36 +480,36 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
var other = new Rom
{
Name = "XXXXXX2",
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -527,37 +523,37 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = "XXXXXX",
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
var other = new Rom
{
Name = "XXXXXX2",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -571,37 +567,37 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
Size = 12345,
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = "XXXXXX",
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
var other = new Rom
{
Name = "XXXXXX2",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -615,37 +611,37 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
Size = 12345,
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = "XXXXXX",
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
var other = new Rom
{
Name = "XXXXXX2",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -659,37 +655,37 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
Size = 12345,
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = "XXXXXX",
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
var other = new Rom
{
Name = "XXXXXX2",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -703,37 +699,37 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
Size = 12345,
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = "XXXXXX",
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
var other = new Rom
{
Name = "XXXXXX2",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -747,37 +743,37 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
Size = 12345,
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = "XXXXXX",
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
var other = new Rom
{
Name = "XXXXXX2",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -791,37 +787,37 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
Size = 12345,
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
var other = new Rom
{
Name = "XXXXXX2",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -835,37 +831,37 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
Size = 12345,
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = "XXXXXX",
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
var other = new Rom
{
Name = "XXXXXX2",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -879,37 +875,37 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
Size = 12345,
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = "XXXXXX",
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
var other = new Rom
{
Name = "XXXXXX2",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -923,37 +919,37 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
Size = 12345,
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = "XXXXXX",
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
var other = new Rom
{
Name = "XXXXXX2",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -967,37 +963,37 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
Size = 12345,
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = "XXXXXX",
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
var other = new Rom
{
Name = "XXXXXX2",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -1011,37 +1007,37 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
Size = 12345,
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = "XXXXXX",
+ SpamSum = string.Empty,
};
var other = new Rom
{
Name = "XXXXXX2",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -1055,37 +1051,37 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
Size = 12345,
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = "XXXXXX",
};
var other = new Rom
{
Name = "XXXXXX2",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -1099,37 +1095,37 @@ namespace SabreTools.Data.Extensions.Test
{
Name = "XXXXXX1",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
var other = new Rom
{
Name = "XXXXXX2",
Size = 12345,
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.PartialEquals(other);
@@ -1383,35 +1379,35 @@ namespace SabreTools.Data.Extensions.Test
{
Rom self = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = string.Empty,
+ CRC64 = "XXXXXX",
+ MD2 = string.Empty,
+ MD4 = "XXXXXX",
+ MD5 = string.Empty,
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = string.Empty,
+ SHA1 = "XXXXXX",
+ SHA256 = string.Empty,
+ SHA384 = "XXXXXX",
+ SHA512 = string.Empty,
+ SpamSum = "XXXXXX",
};
Rom other = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = "XXXXXX",
+ CRC64 = string.Empty,
+ MD2 = "XXXXXX",
+ MD4 = string.Empty,
+ MD5 = "XXXXXX",
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = "XXXXXX",
+ SHA1 = string.Empty,
+ SHA256 = "XXXXXX",
+ SHA384 = string.Empty,
+ SHA512 = "XXXXXX",
+ SpamSum = string.Empty,
};
bool actual = self.HashMatch(other);
@@ -1423,35 +1419,35 @@ namespace SabreTools.Data.Extensions.Test
{
Rom self = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = "XXXXXX",
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
Rom other = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.HashMatch(other);
@@ -1463,35 +1459,35 @@ namespace SabreTools.Data.Extensions.Test
{
Rom self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = "XXXXXX",
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
Rom other = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.HashMatch(other);
@@ -1503,35 +1499,35 @@ namespace SabreTools.Data.Extensions.Test
{
Rom self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = "XXXXXX",
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
Rom other = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.HashMatch(other);
@@ -1543,35 +1539,35 @@ namespace SabreTools.Data.Extensions.Test
{
Rom self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = "XXXXXX",
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
Rom other = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.HashMatch(other);
@@ -1583,35 +1579,35 @@ namespace SabreTools.Data.Extensions.Test
{
Rom self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = "XXXXXX",
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
Rom other = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.HashMatch(other);
@@ -1623,35 +1619,35 @@ namespace SabreTools.Data.Extensions.Test
{
Rom self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = "XXXXXX",
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
Rom other = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.HashMatch(other);
@@ -1663,35 +1659,35 @@ namespace SabreTools.Data.Extensions.Test
{
Rom self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
Rom other = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.HashMatch(other);
@@ -1703,35 +1699,35 @@ namespace SabreTools.Data.Extensions.Test
{
Rom self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = "XXXXXX",
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
Rom other = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.HashMatch(other);
@@ -1743,35 +1739,35 @@ namespace SabreTools.Data.Extensions.Test
{
Rom self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = "XXXXXX",
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
Rom other = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.HashMatch(other);
@@ -1783,35 +1779,35 @@ namespace SabreTools.Data.Extensions.Test
{
Rom self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = "XXXXXX",
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
Rom other = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.HashMatch(other);
@@ -1823,35 +1819,35 @@ namespace SabreTools.Data.Extensions.Test
{
Rom self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = "XXXXXX",
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
Rom other = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.HashMatch(other);
@@ -1863,35 +1859,35 @@ namespace SabreTools.Data.Extensions.Test
{
Rom self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = "XXXXXX",
+ SpamSum = string.Empty,
};
Rom other = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.HashMatch(other);
@@ -1903,35 +1899,35 @@ namespace SabreTools.Data.Extensions.Test
{
Rom self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = "XXXXXX",
};
Rom other = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.HashMatch(other);
@@ -1943,35 +1939,35 @@ namespace SabreTools.Data.Extensions.Test
{
Rom self = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
Rom other = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.HashMatch(other);
@@ -2153,19 +2149,19 @@ namespace SabreTools.Data.Extensions.Test
{
var self = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
bool actual = self.HasZeroHash();
@@ -2177,19 +2173,19 @@ namespace SabreTools.Data.Extensions.Test
{
var self = new Rom
{
- [Rom.CRC16Key] = HashType.CRC16.ZeroString,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = HashType.CRC16.ZeroString,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
bool actual = self.HasZeroHash();
@@ -2201,19 +2197,19 @@ namespace SabreTools.Data.Extensions.Test
{
var self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = HashType.CRC32.ZeroString,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = HashType.CRC32.ZeroString,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
bool actual = self.HasZeroHash();
@@ -2225,19 +2221,19 @@ namespace SabreTools.Data.Extensions.Test
{
var self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = HashType.CRC64.ZeroString,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = HashType.CRC64.ZeroString,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
bool actual = self.HasZeroHash();
@@ -2249,19 +2245,19 @@ namespace SabreTools.Data.Extensions.Test
{
var self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = HashType.MD2.ZeroString,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = HashType.MD2.ZeroString,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
bool actual = self.HasZeroHash();
@@ -2273,19 +2269,19 @@ namespace SabreTools.Data.Extensions.Test
{
var self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = HashType.MD4.ZeroString,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = HashType.MD4.ZeroString,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
bool actual = self.HasZeroHash();
@@ -2297,19 +2293,19 @@ namespace SabreTools.Data.Extensions.Test
{
var self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = HashType.MD5.ZeroString,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = HashType.MD5.ZeroString,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
bool actual = self.HasZeroHash();
@@ -2321,19 +2317,19 @@ namespace SabreTools.Data.Extensions.Test
{
var self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = HashType.RIPEMD128.ZeroString,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = HashType.RIPEMD128.ZeroString,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
bool actual = self.HasZeroHash();
@@ -2345,19 +2341,19 @@ namespace SabreTools.Data.Extensions.Test
{
var self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = HashType.RIPEMD160.ZeroString,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = HashType.RIPEMD160.ZeroString,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
bool actual = self.HasZeroHash();
@@ -2369,19 +2365,19 @@ namespace SabreTools.Data.Extensions.Test
{
var self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = HashType.SHA1.ZeroString,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = HashType.SHA1.ZeroString,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
bool actual = self.HasZeroHash();
@@ -2393,19 +2389,19 @@ namespace SabreTools.Data.Extensions.Test
{
var self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = HashType.SHA256.ZeroString,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = HashType.SHA256.ZeroString,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
bool actual = self.HasZeroHash();
@@ -2417,19 +2413,19 @@ namespace SabreTools.Data.Extensions.Test
{
var self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = HashType.SHA384.ZeroString,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = HashType.SHA384.ZeroString,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty,
};
bool actual = self.HasZeroHash();
@@ -2441,19 +2437,19 @@ namespace SabreTools.Data.Extensions.Test
{
var self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = HashType.SHA512.ZeroString,
- [Rom.SpamSumKey] = string.Empty,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = HashType.SHA512.ZeroString,
+ SpamSum = string.Empty,
};
bool actual = self.HasZeroHash();
@@ -2465,19 +2461,19 @@ namespace SabreTools.Data.Extensions.Test
{
var self = new Rom
{
- [Rom.CRC16Key] = string.Empty,
- [Rom.CRCKey] = string.Empty,
- [Rom.CRC64Key] = string.Empty,
- [Rom.MD2Key] = string.Empty,
- [Rom.MD4Key] = string.Empty,
- [Rom.MD5Key] = string.Empty,
- [Rom.RIPEMD128Key] = string.Empty,
- [Rom.RIPEMD160Key] = string.Empty,
- [Rom.SHA1Key] = string.Empty,
- [Rom.SHA256Key] = string.Empty,
- [Rom.SHA384Key] = string.Empty,
- [Rom.SHA512Key] = string.Empty,
- [Rom.SpamSumKey] = HashType.SpamSum.ZeroString,
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = HashType.SpamSum.ZeroString,
};
bool actual = self.HasZeroHash();
@@ -2489,19 +2485,19 @@ namespace SabreTools.Data.Extensions.Test
{
var self = new Rom
{
- [Rom.CRC16Key] = HashType.CRC16.ZeroString,
- [Rom.CRCKey] = HashType.CRC32.ZeroString,
- [Rom.CRC64Key] = HashType.CRC64.ZeroString,
- [Rom.MD2Key] = HashType.MD2.ZeroString,
- [Rom.MD4Key] = HashType.MD4.ZeroString,
- [Rom.MD5Key] = HashType.MD5.ZeroString,
- [Rom.RIPEMD128Key] = HashType.RIPEMD128.ZeroString,
- [Rom.RIPEMD160Key] = HashType.RIPEMD160.ZeroString,
- [Rom.SHA1Key] = HashType.SHA1.ZeroString,
- [Rom.SHA256Key] = HashType.SHA256.ZeroString,
- [Rom.SHA384Key] = HashType.SHA384.ZeroString,
- [Rom.SHA512Key] = HashType.SHA512.ZeroString,
- [Rom.SpamSumKey] = HashType.SpamSum.ZeroString,
+ CRC16 = HashType.CRC16.ZeroString,
+ CRC = HashType.CRC32.ZeroString,
+ CRC64 = HashType.CRC64.ZeroString,
+ MD2 = HashType.MD2.ZeroString,
+ MD4 = HashType.MD4.ZeroString,
+ MD5 = HashType.MD5.ZeroString,
+ RIPEMD128 = HashType.RIPEMD128.ZeroString,
+ RIPEMD160 = HashType.RIPEMD160.ZeroString,
+ SHA1 = HashType.SHA1.ZeroString,
+ SHA256 = HashType.SHA256.ZeroString,
+ SHA384 = HashType.SHA384.ZeroString,
+ SHA512 = HashType.SHA512.ZeroString,
+ SpamSum = HashType.SpamSum.ZeroString,
};
bool actual = self.HasZeroHash();
@@ -2574,19 +2570,19 @@ namespace SabreTools.Data.Extensions.Test
var self = new Rom();
var other = new Rom
{
- [Rom.CRC16Key] = "XXXXXX",
- [Rom.CRCKey] = "XXXXXX",
- [Rom.CRC64Key] = "XXXXXX",
- [Rom.MD2Key] = "XXXXXX",
- [Rom.MD4Key] = "XXXXXX",
- [Rom.MD5Key] = "XXXXXX",
- [Rom.RIPEMD128Key] = "XXXXXX",
- [Rom.RIPEMD160Key] = "XXXXXX",
- [Rom.SHA1Key] = "XXXXXX",
- [Rom.SHA256Key] = "XXXXXX",
- [Rom.SHA384Key] = "XXXXXX",
- [Rom.SHA512Key] = "XXXXXX",
- [Rom.SpamSumKey] = "XXXXXX",
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX",
};
self.FillMissingHashes(other);
diff --git a/SabreTools.Data.Extensions/MetadataExtensions.cs b/SabreTools.Data.Extensions/MetadataExtensions.cs
index f37f91f2..6788036a 100644
--- a/SabreTools.Data.Extensions/MetadataExtensions.cs
+++ b/SabreTools.Data.Extensions/MetadataExtensions.cs
@@ -29,12 +29,12 @@ namespace SabreTools.Data.Extensions
return new Rom
{
Name = name,
- [Rom.MergeKey] = disk.Merge,
- [Rom.RegionKey] = disk.Region,
+ Merge = disk.Merge,
+ Region = disk.Region,
Status = disk.Status,
Optional = disk.Optional,
- [Rom.MD5Key] = disk.MD5,
- [Rom.SHA1Key] = disk.SHA1,
+ MD5 = disk.MD5,
+ SHA1 = disk.SHA1,
};
}
@@ -55,10 +55,10 @@ namespace SabreTools.Data.Extensions
return new Rom
{
Name = name,
- [Rom.MD5Key] = media.MD5,
- [Rom.SHA1Key] = media.SHA1,
- [Rom.SHA256Key] = media.SHA256,
- [Rom.SpamSumKey] = media.SpamSum,
+ MD5 = media.MD5,
+ SHA1 = media.SHA1,
+ SHA256 = media.SHA256,
+ SpamSum = media.SpamSum,
};
}
@@ -244,56 +244,56 @@ namespace SabreTools.Data.Extensions
return false;
// Return if all hashes match according to merge rules
- string? selfCrc16 = self.ReadString(Rom.CRC16Key);
- string? otherCrc16 = other.ReadString(Rom.CRC16Key);
+ string? selfCrc16 = self.CRC16;
+ string? otherCrc16 = other.CRC16;
bool conditionalCrc16 = ConditionalHashEquals(selfCrc16, otherCrc16);
- string? selfCrc = self.ReadString(Rom.CRCKey);
- string? otherCrc = other.ReadString(Rom.CRCKey);
+ string? selfCrc = self.CRC;
+ string? otherCrc = other.CRC;
bool conditionalCrc = ConditionalHashEquals(selfCrc, otherCrc);
- string? selfCrc64 = self.ReadString(Rom.CRC64Key);
- string? otherCrc64 = other.ReadString(Rom.CRC64Key);
+ string? selfCrc64 = self.CRC64;
+ string? otherCrc64 = other.CRC64;
bool conditionalCrc64 = ConditionalHashEquals(selfCrc64, otherCrc64);
- string? selfMd2 = self.ReadString(Rom.MD2Key);
- string? otherMd2 = other.ReadString(Rom.MD2Key);
+ string? selfMd2 = self.MD2;
+ string? otherMd2 = other.MD2;
bool conditionalMd2 = ConditionalHashEquals(selfMd2, otherMd2);
- string? selfMd4 = self.ReadString(Rom.MD4Key);
- string? otherMd4 = other.ReadString(Rom.MD4Key);
+ string? selfMd4 = self.MD4;
+ string? otherMd4 = other.MD4;
bool conditionalMd4 = ConditionalHashEquals(selfMd4, otherMd4);
- string? selfMd5 = self.ReadString(Rom.MD5Key);
- string? otherMd5 = other.ReadString(Rom.MD5Key);
+ string? selfMd5 = self.MD5;
+ string? otherMd5 = other.MD5;
bool conditionalMd5 = ConditionalHashEquals(selfMd5, otherMd5);
- string? selfRipeMD128 = self.ReadString(Rom.RIPEMD128Key);
- string? otherRipeMD128 = other.ReadString(Rom.RIPEMD128Key);
+ string? selfRipeMD128 = self.RIPEMD128;
+ string? otherRipeMD128 = other.RIPEMD128;
bool conditionaRipeMD128 = ConditionalHashEquals(selfRipeMD128, otherRipeMD128);
- string? selfRipeMD160 = self.ReadString(Rom.RIPEMD160Key);
- string? otherRipeMD160 = other.ReadString(Rom.RIPEMD160Key);
+ string? selfRipeMD160 = self.RIPEMD160;
+ string? otherRipeMD160 = other.RIPEMD160;
bool conditionaRipeMD160 = ConditionalHashEquals(selfRipeMD160, otherRipeMD160);
- string? selfSha1 = self.ReadString(Rom.SHA1Key);
- string? otherSha1 = other.ReadString(Rom.SHA1Key);
+ string? selfSha1 = self.SHA1;
+ string? otherSha1 = other.SHA1;
bool conditionalSha1 = ConditionalHashEquals(selfSha1, otherSha1);
- string? selfSha256 = self.ReadString(Rom.SHA256Key);
- string? otherSha256 = other.ReadString(Rom.SHA256Key);
+ string? selfSha256 = self.SHA256;
+ string? otherSha256 = other.SHA256;
bool conditionalSha256 = ConditionalHashEquals(selfSha256, otherSha256);
- string? selfSha384 = self.ReadString(Rom.SHA384Key);
- string? otherSha384 = other.ReadString(Rom.SHA384Key);
+ string? selfSha384 = self.SHA384;
+ string? otherSha384 = other.SHA384;
bool conditionalSha384 = ConditionalHashEquals(selfSha384, otherSha384);
- string? selfSha512 = self.ReadString(Rom.SHA512Key);
- string? otherSha512 = other.ReadString(Rom.SHA512Key);
+ string? selfSha512 = self.SHA512;
+ string? otherSha512 = other.SHA512;
bool conditionalSha512 = ConditionalHashEquals(selfSha512, otherSha512);
- string? selfSpamSum = self.ReadString(Rom.SpamSumKey);
- string? otherSpamSum = other.ReadString(Rom.SpamSumKey);
+ string? selfSpamSum = self.SpamSum;
+ string? otherSpamSum = other.SpamSum;
bool conditionalSpamSum = ConditionalHashEquals(selfSpamSum, otherSpamSum);
return conditionalCrc16
@@ -344,19 +344,19 @@ namespace SabreTools.Data.Extensions
///
public static bool HasHashes(this Rom rom)
{
- bool crc16Null = string.IsNullOrEmpty(rom.ReadString(Rom.CRC16Key));
- bool crcNull = string.IsNullOrEmpty(rom.ReadString(Rom.CRCKey));
- bool crc64Null = string.IsNullOrEmpty(rom.ReadString(Rom.CRC64Key));
- bool md2Null = string.IsNullOrEmpty(rom.ReadString(Rom.MD2Key));
- bool md4Null = string.IsNullOrEmpty(rom.ReadString(Rom.MD4Key));
- bool md5Null = string.IsNullOrEmpty(rom.ReadString(Rom.MD5Key));
- bool ripeMD128Null = string.IsNullOrEmpty(rom.ReadString(Rom.RIPEMD128Key));
- bool ripeMD160Null = string.IsNullOrEmpty(rom.ReadString(Rom.RIPEMD160Key));
- bool sha1Null = string.IsNullOrEmpty(rom.ReadString(Rom.SHA1Key));
- bool sha256Null = string.IsNullOrEmpty(rom.ReadString(Rom.SHA256Key));
- bool sha384Null = string.IsNullOrEmpty(rom.ReadString(Rom.SHA384Key));
- bool sha512Null = string.IsNullOrEmpty(rom.ReadString(Rom.SHA512Key));
- bool spamsumNull = string.IsNullOrEmpty(rom.ReadString(Rom.SpamSumKey));
+ bool crc16Null = string.IsNullOrEmpty(rom.CRC16);
+ bool crcNull = string.IsNullOrEmpty(rom.CRC);
+ bool crc64Null = string.IsNullOrEmpty(rom.CRC64);
+ bool md2Null = string.IsNullOrEmpty(rom.MD2);
+ bool md4Null = string.IsNullOrEmpty(rom.MD4);
+ bool md5Null = string.IsNullOrEmpty(rom.MD5);
+ bool ripeMD128Null = string.IsNullOrEmpty(rom.RIPEMD128);
+ bool ripeMD160Null = string.IsNullOrEmpty(rom.RIPEMD160);
+ bool sha1Null = string.IsNullOrEmpty(rom.SHA1);
+ bool sha256Null = string.IsNullOrEmpty(rom.SHA256);
+ bool sha384Null = string.IsNullOrEmpty(rom.SHA384);
+ bool sha512Null = string.IsNullOrEmpty(rom.SHA512);
+ bool spamsumNull = string.IsNullOrEmpty(rom.SpamSum);
return !crc16Null
|| !crcNull
@@ -416,43 +416,43 @@ namespace SabreTools.Data.Extensions
///
public static bool HasZeroHash(this Rom rom)
{
- string? crc16 = rom.ReadString(Rom.CRC16Key);
+ string? crc16 = rom.CRC16;
bool crc16Null = string.IsNullOrEmpty(crc16) || string.Equals(crc16, HashType.CRC16.ZeroString, StringComparison.OrdinalIgnoreCase);
- string? crc = rom.ReadString(Rom.CRCKey);
+ string? crc = rom.CRC;
bool crcNull = string.IsNullOrEmpty(crc) || string.Equals(crc, HashType.CRC32.ZeroString, StringComparison.OrdinalIgnoreCase);
- string? crc64 = rom.ReadString(Rom.CRC64Key);
+ string? crc64 = rom.CRC64;
bool crc64Null = string.IsNullOrEmpty(crc64) || string.Equals(crc64, HashType.CRC64.ZeroString, StringComparison.OrdinalIgnoreCase);
- string? md2 = rom.ReadString(Rom.MD2Key);
+ string? md2 = rom.MD2;
bool md2Null = string.IsNullOrEmpty(md2) || string.Equals(md2, HashType.MD2.ZeroString, StringComparison.OrdinalIgnoreCase);
- string? md4 = rom.ReadString(Rom.MD4Key);
+ string? md4 = rom.MD4;
bool md4Null = string.IsNullOrEmpty(md4) || string.Equals(md4, HashType.MD4.ZeroString, StringComparison.OrdinalIgnoreCase);
- string? md5 = rom.ReadString(Rom.MD5Key);
+ string? md5 = rom.MD5;
bool md5Null = string.IsNullOrEmpty(md5) || string.Equals(md5, HashType.MD5.ZeroString, StringComparison.OrdinalIgnoreCase);
- string? ripeMD128 = rom.ReadString(Rom.RIPEMD128Key);
+ string? ripeMD128 = rom.RIPEMD128;
bool ripeMD128Null = string.IsNullOrEmpty(value: ripeMD128) || string.Equals(ripeMD128, HashType.RIPEMD128.ZeroString, StringComparison.OrdinalIgnoreCase);
- string? ripeMD160 = rom.ReadString(Rom.RIPEMD160Key);
+ string? ripeMD160 = rom.RIPEMD160;
bool ripeMD160Null = string.IsNullOrEmpty(ripeMD160) || string.Equals(ripeMD160, HashType.RIPEMD160.ZeroString, StringComparison.OrdinalIgnoreCase);
- string? sha1 = rom.ReadString(Rom.SHA1Key);
+ string? sha1 = rom.SHA1;
bool sha1Null = string.IsNullOrEmpty(sha1) || string.Equals(sha1, HashType.SHA1.ZeroString, StringComparison.OrdinalIgnoreCase);
- string? sha256 = rom.ReadString(Rom.SHA256Key);
+ string? sha256 = rom.SHA256;
bool sha256Null = string.IsNullOrEmpty(sha256) || string.Equals(sha256, HashType.SHA256.ZeroString, StringComparison.OrdinalIgnoreCase);
- string? sha384 = rom.ReadString(Rom.SHA384Key);
+ string? sha384 = rom.SHA384;
bool sha384Null = string.IsNullOrEmpty(sha384) || string.Equals(sha384, HashType.SHA384.ZeroString, StringComparison.OrdinalIgnoreCase);
- string? sha512 = rom.ReadString(Rom.SHA512Key);
+ string? sha512 = rom.SHA512;
bool sha512Null = string.IsNullOrEmpty(sha512) || string.Equals(sha512, HashType.SHA512.ZeroString, StringComparison.OrdinalIgnoreCase);
- string? spamsum = rom.ReadString(Rom.SpamSumKey);
+ string? spamsum = rom.SpamSum;
bool spamsumNull = string.IsNullOrEmpty(spamsum) || string.Equals(spamsum, HashType.SpamSum.ZeroString, StringComparison.OrdinalIgnoreCase);
return crc16Null
@@ -513,44 +513,44 @@ namespace SabreTools.Data.Extensions
///
private static bool HasCommonHash(this Rom self, Rom other)
{
- bool crc16Null = string.IsNullOrEmpty(self.ReadString(Rom.CRC16Key));
- crc16Null ^= string.IsNullOrEmpty(other.ReadString(Rom.CRC16Key));
+ bool crc16Null = string.IsNullOrEmpty(self.CRC16);
+ crc16Null ^= string.IsNullOrEmpty(other.CRC16);
- bool crcNull = string.IsNullOrEmpty(self.ReadString(Rom.CRCKey));
- crcNull ^= string.IsNullOrEmpty(other.ReadString(Rom.CRCKey));
+ bool crcNull = string.IsNullOrEmpty(self.CRC);
+ crcNull ^= string.IsNullOrEmpty(other.CRC);
- bool crc64Null = string.IsNullOrEmpty(self.ReadString(Rom.CRC64Key));
- crc64Null ^= string.IsNullOrEmpty(other.ReadString(Rom.CRC64Key));
+ bool crc64Null = string.IsNullOrEmpty(self.CRC64);
+ crc64Null ^= string.IsNullOrEmpty(other.CRC64);
- bool md2Null = string.IsNullOrEmpty(self.ReadString(Rom.MD2Key));
- md2Null ^= string.IsNullOrEmpty(other.ReadString(Rom.MD2Key));
+ bool md2Null = string.IsNullOrEmpty(self.MD2);
+ md2Null ^= string.IsNullOrEmpty(other.MD2);
- bool md4Null = string.IsNullOrEmpty(self.ReadString(Rom.MD4Key));
- md4Null ^= string.IsNullOrEmpty(other.ReadString(Rom.MD4Key));
+ bool md4Null = string.IsNullOrEmpty(self.MD4);
+ md4Null ^= string.IsNullOrEmpty(other.MD4);
- bool md5Null = string.IsNullOrEmpty(self.ReadString(Rom.MD5Key));
- md5Null ^= string.IsNullOrEmpty(other.ReadString(Rom.MD5Key));
+ bool md5Null = string.IsNullOrEmpty(self.MD5);
+ md5Null ^= string.IsNullOrEmpty(other.MD5);
- bool ripeMD128Null = string.IsNullOrEmpty(self.ReadString(Rom.RIPEMD128Key));
- ripeMD128Null ^= string.IsNullOrEmpty(other.ReadString(Rom.RIPEMD128Key));
+ bool ripeMD128Null = string.IsNullOrEmpty(self.RIPEMD128);
+ ripeMD128Null ^= string.IsNullOrEmpty(other.RIPEMD128);
- bool ripeMD160Null = string.IsNullOrEmpty(self.ReadString(Rom.RIPEMD160Key));
- ripeMD160Null ^= string.IsNullOrEmpty(other.ReadString(Rom.RIPEMD160Key));
+ bool ripeMD160Null = string.IsNullOrEmpty(self.RIPEMD160);
+ ripeMD160Null ^= string.IsNullOrEmpty(other.RIPEMD160);
- bool sha1Null = string.IsNullOrEmpty(self.ReadString(Rom.SHA1Key));
- sha1Null ^= string.IsNullOrEmpty(other.ReadString(Rom.SHA1Key));
+ bool sha1Null = string.IsNullOrEmpty(self.SHA1);
+ sha1Null ^= string.IsNullOrEmpty(other.SHA1);
- bool sha256Null = string.IsNullOrEmpty(self.ReadString(Rom.SHA256Key));
- sha256Null ^= string.IsNullOrEmpty(other.ReadString(Rom.SHA256Key));
+ bool sha256Null = string.IsNullOrEmpty(self.SHA256);
+ sha256Null ^= string.IsNullOrEmpty(other.SHA256);
- bool sha384Null = string.IsNullOrEmpty(self.ReadString(Rom.SHA384Key));
- sha384Null ^= string.IsNullOrEmpty(other.ReadString(Rom.SHA384Key));
+ bool sha384Null = string.IsNullOrEmpty(self.SHA384);
+ sha384Null ^= string.IsNullOrEmpty(other.SHA384);
- bool sha512Null = string.IsNullOrEmpty(self.ReadString(Rom.SHA512Key));
- sha512Null ^= string.IsNullOrEmpty(other.ReadString(Rom.SHA512Key));
+ bool sha512Null = string.IsNullOrEmpty(self.SHA512);
+ sha512Null ^= string.IsNullOrEmpty(other.SHA512);
- bool spamsumNull = string.IsNullOrEmpty(self.ReadString(Rom.SpamSumKey));
- spamsumNull ^= string.IsNullOrEmpty(other.ReadString(Rom.SpamSumKey));
+ bool spamsumNull = string.IsNullOrEmpty(self.SpamSum);
+ spamsumNull ^= string.IsNullOrEmpty(other.SpamSum);
return !crc16Null
|| !crcNull
@@ -632,70 +632,70 @@ namespace SabreTools.Data.Extensions
if (selfSize is null && otherSize is not null)
self.Size = otherSize;
- string? selfCrc16 = self.ReadString(Rom.CRC16Key);
- string? otherCrc16 = other.ReadString(Rom.CRC16Key);
+ string? selfCrc16 = self.CRC16;
+ string? otherCrc16 = other.CRC16;
if (string.IsNullOrEmpty(selfCrc16) && !string.IsNullOrEmpty(otherCrc16))
- self[Rom.CRC16Key] = otherCrc16;
+ self.CRC16 = otherCrc16;
- string? selfCrc = self.ReadString(Rom.CRCKey);
- string? otherCrc = other.ReadString(Rom.CRCKey);
+ string? selfCrc = self.CRC;
+ string? otherCrc = other.CRC;
if (string.IsNullOrEmpty(selfCrc) && !string.IsNullOrEmpty(otherCrc))
- self[Rom.CRCKey] = otherCrc;
+ self.CRC = otherCrc;
- string? selfCrc64 = self.ReadString(Rom.CRC64Key);
- string? otherCrc64 = other.ReadString(Rom.CRC64Key);
+ string? selfCrc64 = self.CRC64;
+ string? otherCrc64 = other.CRC64;
if (string.IsNullOrEmpty(selfCrc64) && !string.IsNullOrEmpty(otherCrc64))
- self[Rom.CRC64Key] = otherCrc64;
+ self.CRC64 = otherCrc64;
- string? selfMd2 = self.ReadString(Rom.MD2Key);
- string? otherMd2 = other.ReadString(Rom.MD2Key);
+ string? selfMd2 = self.MD2;
+ string? otherMd2 = other.MD2;
if (string.IsNullOrEmpty(selfMd2) && !string.IsNullOrEmpty(otherMd2))
- self[Rom.MD2Key] = otherMd2;
+ self.MD2 = otherMd2;
- string? selfMd4 = self.ReadString(Rom.MD4Key);
- string? otherMd4 = other.ReadString(Rom.MD4Key);
+ string? selfMd4 = self.MD4;
+ string? otherMd4 = other.MD4;
if (string.IsNullOrEmpty(selfMd4) && !string.IsNullOrEmpty(otherMd4))
- self[Rom.MD4Key] = otherMd4;
+ self.MD4 = otherMd4;
- string? selfMd5 = self.ReadString(Rom.MD5Key);
- string? otherMd5 = other.ReadString(Rom.MD5Key);
+ string? selfMd5 = self.MD5;
+ string? otherMd5 = other.MD5;
if (string.IsNullOrEmpty(selfMd5) && !string.IsNullOrEmpty(otherMd5))
- self[Rom.MD5Key] = otherMd5;
+ self.MD5 = otherMd5;
- string? selfRipeMD128 = self.ReadString(Rom.RIPEMD128Key);
- string? otherRipeMD128 = other.ReadString(Rom.RIPEMD128Key);
+ string? selfRipeMD128 = self.RIPEMD128;
+ string? otherRipeMD128 = other.RIPEMD128;
if (string.IsNullOrEmpty(selfRipeMD128) && !string.IsNullOrEmpty(otherRipeMD128))
- self[Rom.RIPEMD128Key] = otherRipeMD128;
+ self.RIPEMD128 = otherRipeMD128;
- string? selfRipeMD160 = self.ReadString(Rom.RIPEMD160Key);
- string? otherRipeMD160 = other.ReadString(Rom.RIPEMD160Key);
+ string? selfRipeMD160 = self.RIPEMD160;
+ string? otherRipeMD160 = other.RIPEMD160;
if (string.IsNullOrEmpty(selfRipeMD160) && !string.IsNullOrEmpty(otherRipeMD160))
- self[Rom.RIPEMD160Key] = otherRipeMD160;
+ self.RIPEMD160 = otherRipeMD160;
- string? selfSha1 = self.ReadString(Rom.SHA1Key);
- string? otherSha1 = other.ReadString(Rom.SHA1Key);
+ string? selfSha1 = self.SHA1;
+ string? otherSha1 = other.SHA1;
if (string.IsNullOrEmpty(selfSha1) && !string.IsNullOrEmpty(otherSha1))
- self[Rom.SHA1Key] = otherSha1;
+ self.SHA1 = otherSha1;
- string? selfSha256 = self.ReadString(Rom.SHA256Key);
- string? otherSha256 = other.ReadString(Rom.SHA256Key);
+ string? selfSha256 = self.SHA256;
+ string? otherSha256 = other.SHA256;
if (string.IsNullOrEmpty(selfSha256) && !string.IsNullOrEmpty(otherSha256))
- self[Rom.SHA256Key] = otherSha256;
+ self.SHA256 = otherSha256;
- string? selfSha384 = self.ReadString(Rom.SHA384Key);
- string? otherSha384 = other.ReadString(Rom.SHA384Key);
+ string? selfSha384 = self.SHA384;
+ string? otherSha384 = other.SHA384;
if (string.IsNullOrEmpty(selfSha384) && !string.IsNullOrEmpty(otherSha384))
- self[Rom.SHA384Key] = otherSha384;
+ self.SHA384 = otherSha384;
- string? selfSha512 = self.ReadString(Rom.SHA512Key);
- string? otherSha512 = other.ReadString(Rom.SHA512Key);
+ string? selfSha512 = self.SHA512;
+ string? otherSha512 = other.SHA512;
if (string.IsNullOrEmpty(selfSha512) && !string.IsNullOrEmpty(otherSha512))
- self[Rom.SHA512Key] = otherSha512;
+ self.SHA512 = otherSha512;
- string? selfSpamSum = self.ReadString(Rom.SpamSumKey);
- string? otherSpamSum = other.ReadString(Rom.SpamSumKey);
+ string? selfSpamSum = self.SpamSum;
+ string? otherSpamSum = other.SpamSum;
if (string.IsNullOrEmpty(selfSpamSum) && !string.IsNullOrEmpty(otherSpamSum))
- self[Rom.SpamSumKey] = otherSpamSum;
+ self.SpamSum = otherSpamSum;
}
#endregion
diff --git a/SabreTools.Data.Models/Metadata/Rom.cs b/SabreTools.Data.Models/Metadata/Rom.cs
index a5ca4991..4432bdac 100644
--- a/SabreTools.Data.Models/Metadata/Rom.cs
+++ b/SabreTools.Data.Models/Metadata/Rom.cs
@@ -30,7 +30,7 @@ namespace SabreTools.Data.Models.Metadata
public string? Name { get; set; }
- /// string; OpenMSX.RomBase
+ /// OpenMSX.RomBase
public OpenMSXSubType? OpenMSXMediaType { get; set; }
/// (yes|no) "no"
@@ -50,254 +50,233 @@ namespace SabreTools.Data.Models.Metadata
#region Keys
- /// string; ArchiveDotOrg.File
- public const string AlbumKey = "album";
+ /// ArchiveDotOrg.File
+ public string? Album { get; set; }
- /// string; AttractMode.Row
- public const string AltRomnameKey = "alt_romname";
+ /// AttractMode.Row
+ public string? AltRomname { get; set; }
- /// string; AttractMode.Row
- public const string AltTitleKey = "alt_title";
+ /// AttractMode.Row
+ public string? AltTitle { get; set; }
- /// string; ArchiveDotOrg.File
- public const string ArtistKey = "artist";
+ /// ArchiveDotOrg.File
+ public string? Artist { get; set; }
- /// string; ArchiveDotOrg.File
- public const string ASRDetectedLangKey = "asr_detected_lang";
+ /// ArchiveDotOrg.File
+ public string? ASRDetectedLang { get; set; }
- /// string; ArchiveDotOrg.File
- public const string ASRDetectedLangConfKey = "asr_detected_lang_conf";
+ /// ArchiveDotOrg.File
+ public string? ASRDetectedLangConf { get; set; }
- /// string; ArchiveDotOrg.File
- public const string ASRTranscribedLangKey = "asr_transcribed_lang";
+ /// ArchiveDotOrg.File
+ public string? ASRTranscribedLang { get; set; }
- /// string
- public const string BiosKey = "bios";
+ public string? Bios { get; set; }
- /// string; ArchiveDotOrg.File
- public const string BitrateKey = "bitrate";
+ /// ArchiveDotOrg.File
+ public string? Bitrate { get; set; }
- /// string; ArchiveDotOrg.File
- public const string BitTorrentMagnetHashKey = "btih";
+ /// ArchiveDotOrg.File
+ public string? BitTorrentMagnetHash { get; set; }
- /// string; ArchiveDotOrg.File
- public const string ClothCoverDetectionModuleVersionKey = "cloth_cover_detection_module_version";
+ /// ArchiveDotOrg.File
+ public string? ClothCoverDetectionModuleVersion { get; set; }
- /// string; ArchiveDotOrg.File
- public const string CollectionCatalogNumberKey = "collection-catalog-number";
+ /// ArchiveDotOrg.File
+ public string? CollectionCatalogNumber { get; set; }
- /// string; ArchiveDotOrg.File
- public const string CommentKey = "comment";
+ /// ArchiveDotOrg.File
+ public string? Comment { get; set; }
- /// string; Also "crc32" in ArchiveDotOrg.File
- public const string CRCKey = "crc";
+ /// Also "crc32" in ArchiveDotOrg.File
+ public string? CRC { get; set; }
- /// string
- public const string CRC16Key = "crc16";
+ public string? CRC16 { get; set; }
- /// string
- public const string CRC64Key = "crc64";
+ public string? CRC64 { get; set; }
- /// string; ArchiveDotOrg.File
- public const string CreatorKey = "creator";
+ /// ArchiveDotOrg.File
+ public string? Creator { get; set; }
- /// string
- public const string DateKey = "date";
+ public string? Date { get; set; }
- /// string; OfflineList.FileRomCRC
- public const string ExtensionKey = "extension";
+ /// OfflineList.FileRomCRC
+ public string? Extension { get; set; }
- /// string
- public const string FlagsKey = "flags";
+ public string? Flags { get; set; }
- /// string; ArchiveDotOrg.File
- public const string FormatKey = "format";
+ /// ArchiveDotOrg.File
+ public string? Format { get; set; }
- /// string
- public const string HeaderKey = "header";
+ public string? Header { get; set; }
- /// string, possibly long; ArchiveDotOrg.File
- public const string HeightKey = "height";
+ /// Possibly long; ArchiveDotOrg.File
+ public string? Height { get; set; }
- /// string; ArchiveDotOrg.File
- public const string hOCRCharToWordhOCRVersionKey = "hocr_char_to_word_hocr_version";
+ /// ArchiveDotOrg.File
+ public string? hOCRCharToWordhOCRVersion { get; set; }
- /// string; ArchiveDotOrg.File
- public const string hOCRCharToWordModuleVersionKey = "hocr_char_to_word_module_version";
+ /// ArchiveDotOrg.File
+ public string? hOCRCharToWordModuleVersion { get; set; }
- /// string; ArchiveDotOrg.File
- public const string hOCRFtsTexthOCRVersionKey = "hocr_fts_text_hocr_version";
+ /// ArchiveDotOrg.File
+ public string? hOCRFtsTexthOCRVersion { get; set; }
- /// string; ArchiveDotOrg.File
- public const string hOCRFtsTextModuleVersionKey = "hocr_fts_text_module_version";
+ /// ArchiveDotOrg.File
+ public string? hOCRFtsTextModuleVersion { get; set; }
- /// string; ArchiveDotOrg.File
- public const string hOCRPageIndexhOCRVersionKey = "hocr_pageindex_hocr_version";
+ /// ArchiveDotOrg.File
+ public string? hOCRPageIndexhOCRVersion { get; set; }
- /// string; ArchiveDotOrg.File
- public const string hOCRPageIndexModuleVersionKey = "hocr_pageindex_module_version";
+ /// ArchiveDotOrg.File
+ public string? hOCRPageIndexModuleVersion { get; set; }
- /// long; ArchiveDotOrg.File
- public const string LastModifiedTimeKey = "mtime";
+ /// Possibly long; ArchiveDotOrg.File
+ public string? LastModifiedTime { get; set; }
- /// string, possibly long; Also in ArchiveDotOrg.File
- public const string LengthKey = "length";
+ /// Possibly long; Also in ArchiveDotOrg.File
+ public string? Length { get; set; }
- /// string; ArchiveDotOrg.File
- public const string MatrixNumberKey = "matrix_number";
+ /// ArchiveDotOrg.File
+ public string? MatrixNumber { get; set; }
- /// string
- public const string MD2Key = "md2";
+ public string? MD2 { get; set; }
- /// string
- public const string MD4Key = "md4";
+ public string? MD4 { get; set; }
- /// string
- public const string MD5Key = "md5";
+ public string? MD5 { get; set; }
- /// string
- public const string MergeKey = "merge";
+ public string? Merge { get; set; }
- /// string; ArchiveDotOrg.File
- public const string TesseractOCRKey = "ocr";
+ /// Possibly long; Originally "offs"
+ public string? Offset { get; set; }
- /// string; ArchiveDotOrg.File
- public const string TesseractOCRConvertedKey = "ocr_converted";
+ /// OpenMSX.RomBase
+ public string? OpenMSXType { get; set; }
- /// string; ArchiveDotOrg.File
- public const string TesseractOCRDetectedLangKey = "ocr_detected_lang";
+ /// ArchiveDotOrg.File
+ public string? Original { get; set; }
- /// string; ArchiveDotOrg.File
- public const string TesseractOCRDetectedLangConfKey = "ocr_detected_lang_conf";
+ /// ArchiveDotOrg.File
+ public string? PDFModuleVersion { get; set; }
- /// string; ArchiveDotOrg.File
- public const string TesseractOCRDetectedScriptKey = "ocr_detected_script";
+ /// ArchiveDotOrg.File
+ public string? PreviewImage { get; set; }
- /// string; ArchiveDotOrg.File
- public const string TesseractOCRDetectedScriptConfKey = "ocr_detected_script_conf";
+ /// ArchiveDotOrg.File
+ public string? Publisher { get; set; }
- /// string; ArchiveDotOrg.File
- public const string TesseractOCRModuleVersionKey = "ocr_module_version";
+ public string? Region { get; set; }
- /// string; ArchiveDotOrg.File
- public const string TesseractOCRParametersKey = "ocr_parameters";
+ /// OpenMSX.RomBase
+ public string? Remark { get; set; }
- /// string, possibly long; Originally "offs"
- public const string OffsetKey = "offset";
+ public string? RIPEMD128 { get; set; }
- /// string; ArchiveDotOrg.File
- public const string OriginalKey = "original";
+ public string? RIPEMD160 { get; set; }
- /// string; ArchiveDotOrg.File
- public const string PDFModuleVersionKey = "pdf_module_version";
+ /// Possibly long; ArchiveDotOrg.File
+ public string? Rotation { get; set; }
- /// string; ArchiveDotOrg.File
- public const string PreviewImageKey = "preview-image";
+ public string? Serial { get; set; }
- /// string; ArchiveDotOrg.File
- public const string PublisherKey = "publisher";
+ public string? SHA1 { get; set; }
- /// string
- public const string RegionKey = "region";
+ public string? SHA256 { get; set; }
- /// string; OpenMSX.RomBase
- public const string RemarkKey = "remark";
+ public string? SHA384 { get; set; }
- /// string
- public const string RIPEMD128Key = "ripemd128";
+ public string? SHA512 { get; set; }
- /// string
- public const string RIPEMD160Key = "ripemd160";
+ /// ArchiveDotOrg.File
+ public string? Source { get; set; }
- /// string, possibly long; ArchiveDotOrg.File
- public const string RotationKey = "rotation";
+ public string? SpamSum { get; set; }
- /// string
- public const string SerialKey = "serial";
+ /// Possibly long; OpenMSX.RomBase
+ public string? Start { get; set; }
- /// string
- public const string SHA1Key = "sha1";
+ /// ArchiveDotOrg.File
+ public string? Summation { get; set; }
- /// string
- public const string SHA256Key = "sha256";
+ /// ArchiveDotOrg.File
+ public string? TesseractOCR { get; set; }
- /// string
- public const string SHA384Key = "sha384";
+ /// ArchiveDotOrg.File
+ public string? TesseractOCRConverted { get; set; }
- /// string
- public const string SHA512Key = "sha512";
+ /// ArchiveDotOrg.File
+ public string? TesseractOCRDetectedLang { get; set; }
- /// string; ArchiveDotOrg.File
- public const string SourceKey = "source";
+ /// ArchiveDotOrg.File
+ public string? TesseractOCRDetectedLangConf { get; set; }
- /// string
- public const string SpamSumKey = "spamsum";
+ /// ArchiveDotOrg.File
+ public string? TesseractOCRDetectedScript { get; set; }
- /// string, possibly long; OpenMSX.RomBase
- public const string StartKey = "start";
+ /// ArchiveDotOrg.File
+ public string? TesseractOCRDetectedScriptConf { get; set; }
- /// string; ArchiveDotOrg.File
- public const string SummationKey = "summation";
+ /// ArchiveDotOrg.File
+ public string? TesseractOCRModuleVersion { get; set; }
- /// string; ArchiveDotOrg.File
- public const string TitleKey = "title";
+ /// ArchiveDotOrg.File
+ public string? TesseractOCRParameters { get; set; }
- /// string, possibly long; ArchiveDotOrg.File
- public const string TrackKey = "track";
+ /// ArchiveDotOrg.File
+ public string? Title { get; set; }
- /// string; OpenMSX.RomBase
- public const string OpenMSXType = "type";
+ /// Possibly long; ArchiveDotOrg.File
+ public string? Track { get; set; }
- /// string; ArchiveDotOrg.File
- public const string WhisperASRModuleVersionKey = "whisper_asr_module_version";
+ /// ArchiveDotOrg.File
+ public string? WhisperASRModuleVersion { get; set; }
- /// string; ArchiveDotOrg.File
- public const string WhisperModelHashKey = "whisper_model_hash";
+ /// ArchiveDotOrg.File
+ public string? WhisperModelHash { get; set; }
- /// string; ArchiveDotOrg.File
- public const string WhisperModelNameKey = "whisper_model_name";
+ /// ArchiveDotOrg.File
+ public string? WhisperModelName { get; set; }
- /// string; ArchiveDotOrg.File
- public const string WhisperVersionKey = "whisper_version";
+ /// ArchiveDotOrg.File
+ public string? WhisperVersion { get; set; }
- /// string, possibly long; ArchiveDotOrg.File
- public const string WidthKey = "width";
+ /// Possibly long; ArchiveDotOrg.File
+ public string? Width { get; set; }
- /// string; ArchiveDotOrg.File
- public const string WordConfidenceInterval0To10Key = "word_conf_0_10";
+ /// ArchiveDotOrg.File
+ public string? WordConfidenceInterval0To10 { get; set; }
- /// string; ArchiveDotOrg.File
- public const string WordConfidenceInterval11To20Key = "word_conf_11_20";
+ /// ArchiveDotOrg.File
+ public string? WordConfidenceInterval11To20 { get; set; }
- /// string; ArchiveDotOrg.File
- public const string WordConfidenceInterval21To30Key = "word_conf_21_30";
+ /// ArchiveDotOrg.File
+ public string? WordConfidenceInterval21To30 { get; set; }
- /// string; ArchiveDotOrg.File
- public const string WordConfidenceInterval31To40Key = "word_conf_31_40";
+ /// ArchiveDotOrg.File
+ public string? WordConfidenceInterval31To40 { get; set; }
- /// string; ArchiveDotOrg.File
- public const string WordConfidenceInterval41To50Key = "word_conf_41_50";
+ /// ArchiveDotOrg.File
+ public string? WordConfidenceInterval41To50 { get; set; }
- /// string; ArchiveDotOrg.File
- public const string WordConfidenceInterval51To60Key = "word_conf_51_60";
+ /// ArchiveDotOrg.File
+ public string? WordConfidenceInterval51To60 { get; set; }
- /// string; ArchiveDotOrg.File
- public const string WordConfidenceInterval61To70Key = "word_conf_61_70";
+ /// ArchiveDotOrg.File
+ public string? WordConfidenceInterval61To70 { get; set; }
- /// string; ArchiveDotOrg.File
- public const string WordConfidenceInterval71To80Key = "word_conf_71_80";
+ /// ArchiveDotOrg.File
+ public string? WordConfidenceInterval71To80 { get; set; }
- /// string; ArchiveDotOrg.File
- public const string WordConfidenceInterval81To90Key = "word_conf_81_90";
+ /// ArchiveDotOrg.File
+ public string? WordConfidenceInterval81To90 { get; set; }
- /// string; ArchiveDotOrg.File
- public const string WordConfidenceInterval91To100Key = "word_conf_91_100";
+ /// ArchiveDotOrg.File
+ public string? WordConfidenceInterval91To100 { get; set; }
- /// string
- public const string xxHash364Key = "xxh3_64";
+ public string? xxHash364 { get; set; }
- /// string
- public const string xxHash3128Key = "xxh3_128";
+ public string? xxHash3128 { get; set; }
#endregion
@@ -308,187 +287,102 @@ namespace SabreTools.Data.Models.Metadata
{
var obj = new Rom();
+ obj.Album = Album;
+ obj.AltRomname = AltRomname;
+ obj.AltTitle = AltTitle;
+ obj.Artist = Artist;
+ obj.ASRDetectedLang = ASRDetectedLang;
+ obj.ASRDetectedLangConf = ASRDetectedLangConf;
+ obj.ASRTranscribedLang = ASRTranscribedLang;
+ obj.Bios = Bios;
+ obj.Bitrate = Bitrate;
+ obj.BitTorrentMagnetHash = BitTorrentMagnetHash;
+ obj.ClothCoverDetectionModuleVersion = ClothCoverDetectionModuleVersion;
+ obj.CollectionCatalogNumber = CollectionCatalogNumber;
+ obj.Comment = Comment;
+ obj.CRC = CRC;
+ obj.CRC16 = CRC16;
+ obj.CRC64 = CRC64;
+ obj.Creator = Creator;
+ obj.Date = Date;
obj.Dispose = Dispose;
+ obj.Extension = Extension;
obj.FileCount = FileCount;
obj.FileIsAvailable = FileIsAvailable;
+ obj.Flags = Flags;
+ obj.Format = Format;
+ obj.Header = Header;
+ obj.Height = Height;
+ obj.hOCRCharToWordhOCRVersion = hOCRCharToWordhOCRVersion;
+ obj.hOCRCharToWordModuleVersion = hOCRCharToWordModuleVersion;
+ obj.hOCRFtsTexthOCRVersion = hOCRFtsTexthOCRVersion;
+ obj.hOCRFtsTextModuleVersion = hOCRFtsTextModuleVersion;
+ obj.hOCRPageIndexhOCRVersion = hOCRPageIndexhOCRVersion;
+ obj.hOCRPageIndexModuleVersion = hOCRPageIndexModuleVersion;
obj.Inverted = Inverted;
+ obj.LastModifiedTime = LastModifiedTime;
+ obj.Length = Length;
obj.LoadFlag = LoadFlag;
+ obj.MatrixNumber = MatrixNumber;
+ obj.MD2 = MD2;
+ obj.MD4 = MD4;
+ obj.MD5 = MD5;
+ obj.Merge = Merge;
obj.MIA = MIA;
obj.Name = Name;
+ obj.Offset = Offset;
+ obj.OpenMSXType = OpenMSXType;
obj.OpenMSXMediaType = OpenMSXMediaType;
obj.Optional = Optional;
+ obj.Original = Original;
+ obj.PDFModuleVersion = PDFModuleVersion;
+ obj.PreviewImage = PreviewImage;
+ obj.Publisher = Publisher;
+ obj.Region = Region;
+ obj.Remark = Remark;
+ obj.RIPEMD128 = RIPEMD128;
+ obj.RIPEMD160 = RIPEMD160;
+ obj.Rotation = Rotation;
+ obj.Serial = Serial;
+ obj.SHA1 = SHA1;
+ obj.SHA256 = SHA256;
+ obj.SHA384 = SHA384;
+ obj.SHA512 = SHA512;
obj.Size = Size;
obj.SoundOnly = SoundOnly;
+ obj.Source = Source;
+ obj.SpamSum = SpamSum;
+ obj.Start = Start;
obj.Status = Status;
+ obj.Summation = Summation;
+ obj.TesseractOCR = TesseractOCR;
+ obj.TesseractOCRConverted = TesseractOCRConverted;
+ obj.TesseractOCRDetectedLang = TesseractOCRDetectedLang;
+ obj.TesseractOCRDetectedLangConf = TesseractOCRDetectedLangConf;
+ obj.TesseractOCRDetectedScript = TesseractOCRDetectedScript;
+ obj.TesseractOCRDetectedScriptConf = TesseractOCRDetectedScriptConf;
+ obj.TesseractOCRModuleVersion = TesseractOCRModuleVersion;
+ obj.TesseractOCRParameters = TesseractOCRParameters;
+ obj.Title = Title;
+ obj.Track = Track;
obj.Value = Value;
-
- // TODO: Replace these when moving away from keys
- if (TryGetValue(AlbumKey, out var Album))
- obj[AlbumKey] = Album;
- if (TryGetValue(AltRomnameKey, out var AltRomname))
- obj[AltRomnameKey] = AltRomname;
- if (TryGetValue(AltTitleKey, out var AltTitle))
- obj[AltTitleKey] = AltTitle;
- if (TryGetValue(ArtistKey, out var Artist))
- obj[ArtistKey] = Artist;
- if (TryGetValue(ASRDetectedLangKey, out var ASRDetectedLang))
- obj[ASRDetectedLangKey] = ASRDetectedLang;
- if (TryGetValue(ASRDetectedLangConfKey, out var ASRDetectedLangConf))
- obj[ASRDetectedLangConfKey] = ASRDetectedLangConf;
- if (TryGetValue(ASRTranscribedLangKey, out var ASRTranscribedLang))
- obj[ASRTranscribedLangKey] = ASRTranscribedLang;
- if (TryGetValue(BiosKey, out var Bios))
- obj[BiosKey] = Bios;
- if (TryGetValue(BitrateKey, out var Bitrate))
- obj[BitrateKey] = Bitrate;
- if (TryGetValue(BitTorrentMagnetHashKey, out var BitTorrentMagnetHash))
- obj[BitTorrentMagnetHashKey] = BitTorrentMagnetHash;
- if (TryGetValue(ClothCoverDetectionModuleVersionKey, out var ClothCoverDetectionModuleVersion))
- obj[ClothCoverDetectionModuleVersionKey] = ClothCoverDetectionModuleVersion;
- if (TryGetValue(CollectionCatalogNumberKey, out var CollectionCatalogNumber))
- obj[CollectionCatalogNumberKey] = CollectionCatalogNumber;
- if (TryGetValue(CommentKey, out var Comment))
- obj[CommentKey] = Comment;
- if (TryGetValue(CRCKey, out var CRC))
- obj[CRCKey] = CRC;
- if (TryGetValue(CRC16Key, out var CRC16))
- obj[CRC16Key] = CRC16;
- if (TryGetValue(CRC64Key, out var CRC64))
- obj[CRC64Key] = CRC64;
- if (TryGetValue(CreatorKey, out var Creator))
- obj[CreatorKey] = Creator;
- if (TryGetValue(DateKey, out var Date))
- obj[DateKey] = Date;
- if (TryGetValue(ExtensionKey, out var Extension))
- obj[ExtensionKey] = Extension;
- if (TryGetValue(FlagsKey, out var Flags))
- obj[FlagsKey] = Flags;
- if (TryGetValue(FormatKey, out var Format))
- obj[FormatKey] = Format;
- if (TryGetValue(HeaderKey, out var Header))
- obj[HeaderKey] = Header;
- if (TryGetValue(HeightKey, out var Height))
- obj[HeightKey] = Height;
- if (TryGetValue(hOCRCharToWordhOCRVersionKey, out var hOCRCharToWordhOCRVersion))
- obj[hOCRCharToWordhOCRVersionKey] = hOCRCharToWordhOCRVersion;
- if (TryGetValue(hOCRCharToWordModuleVersionKey, out var hOCRCharToWordModuleVersion))
- obj[hOCRCharToWordModuleVersionKey] = hOCRCharToWordModuleVersion;
- if (TryGetValue(hOCRFtsTexthOCRVersionKey, out var hOCRFtsTexthOCRVersion))
- obj[hOCRFtsTexthOCRVersionKey] = hOCRFtsTexthOCRVersion;
- if (TryGetValue(hOCRFtsTextModuleVersionKey, out var hOCRFtsTextModuleVersion))
- obj[hOCRFtsTextModuleVersionKey] = hOCRFtsTextModuleVersion;
- if (TryGetValue(hOCRPageIndexhOCRVersionKey, out var hOCRPageIndexhOCRVersion))
- obj[hOCRPageIndexhOCRVersionKey] = hOCRPageIndexhOCRVersion;
- if (TryGetValue(hOCRPageIndexModuleVersionKey, out var hOCRPageIndexModuleVersion))
- obj[hOCRPageIndexModuleVersionKey] = hOCRPageIndexModuleVersion;
- if (TryGetValue(LastModifiedTimeKey, out var LastModifiedTime))
- obj[LastModifiedTimeKey] = LastModifiedTime;
- if (TryGetValue(LengthKey, out var Length))
- obj[LengthKey] = Length;
- if (TryGetValue(MatrixNumberKey, out var MatrixNumber))
- obj[MatrixNumberKey] = MatrixNumber;
- if (TryGetValue(MD2Key, out var MD2))
- obj[MD2Key] = MD2;
- if (TryGetValue(MD4Key, out var MD4))
- obj[MD4Key] = MD4;
- if (TryGetValue(MD5Key, out var MD5))
- obj[MD5Key] = MD5;
- if (TryGetValue(MergeKey, out var Merge))
- obj[MergeKey] = Merge;
- if (TryGetValue(TesseractOCRKey, out var TesseractOCR))
- obj[TesseractOCRKey] = TesseractOCR;
- if (TryGetValue(TesseractOCRConvertedKey, out var TesseractOCRConverted))
- obj[TesseractOCRConvertedKey] = TesseractOCRConverted;
- if (TryGetValue(TesseractOCRDetectedLangKey, out var TesseractOCRDetectedLang))
- obj[TesseractOCRDetectedLangKey] = TesseractOCRDetectedLang;
- if (TryGetValue(TesseractOCRDetectedLangConfKey, out var TesseractOCRDetectedLangConf))
- obj[TesseractOCRDetectedLangConfKey] = TesseractOCRDetectedLangConf;
- if (TryGetValue(TesseractOCRDetectedScriptKey, out var TesseractOCRDetectedScript))
- obj[TesseractOCRDetectedScriptKey] = TesseractOCRDetectedScript;
- if (TryGetValue(TesseractOCRDetectedScriptConfKey, out var TesseractOCRDetectedScriptConf))
- obj[TesseractOCRDetectedScriptConfKey] = TesseractOCRDetectedScriptConf;
- if (TryGetValue(TesseractOCRModuleVersionKey, out var TesseractOCRModuleVersion))
- obj[TesseractOCRModuleVersionKey] = TesseractOCRModuleVersion;
- if (TryGetValue(TesseractOCRParametersKey, out var TesseractOCRParameters))
- obj[TesseractOCRParametersKey] = TesseractOCRParameters;
- if (TryGetValue(OffsetKey, out var Offset))
- obj[OffsetKey] = Offset;
- if (TryGetValue(OriginalKey, out var Original))
- obj[OriginalKey] = Original;
- if (TryGetValue(PDFModuleVersionKey, out var PDFModuleVersion))
- obj[PDFModuleVersionKey] = PDFModuleVersion;
- if (TryGetValue(PreviewImageKey, out var PreviewImage))
- obj[PreviewImageKey] = PreviewImage;
- if (TryGetValue(PublisherKey, out var Publisher))
- obj[PublisherKey] = Publisher;
- if (TryGetValue(RegionKey, out var Region))
- obj[RegionKey] = Region;
- if (TryGetValue(RemarkKey, out var Remark))
- obj[RemarkKey] = Remark;
- if (TryGetValue(RIPEMD128Key, out var RIPEMD128))
- obj[RIPEMD128Key] = RIPEMD128;
- if (TryGetValue(RIPEMD160Key, out var RIPEMD160))
- obj[RIPEMD160Key] = RIPEMD160;
- if (TryGetValue(RotationKey, out var Rotation))
- obj[RotationKey] = Rotation;
- if (TryGetValue(SerialKey, out var Serial))
- obj[SerialKey] = Serial;
- if (TryGetValue(SHA1Key, out var SHA1))
- obj[SHA1Key] = SHA1;
- if (TryGetValue(SHA256Key, out var SHA256))
- obj[SHA256Key] = SHA256;
- if (TryGetValue(SHA384Key, out var SHA384))
- obj[SHA384Key] = SHA384;
- if (TryGetValue(SHA512Key, out var SHA512))
- obj[SHA512Key] = SHA512;
- if (TryGetValue(SourceKey, out var Source))
- obj[SourceKey] = Source;
- if (TryGetValue(SpamSumKey, out var SpamSum))
- obj[SpamSumKey] = SpamSum;
- if (TryGetValue(StartKey, out var Start))
- obj[StartKey] = Start;
- if (TryGetValue(SummationKey, out var Summation))
- obj[SummationKey] = Summation;
- if (TryGetValue(TitleKey, out var Title))
- obj[TitleKey] = Title;
- if (TryGetValue(TrackKey, out var Track))
- obj[TrackKey] = Track;
- if (TryGetValue(OpenMSXType, out var OpenMSXTypeValue))
- obj[OpenMSXType] = OpenMSXTypeValue;
- if (TryGetValue(WhisperASRModuleVersionKey, out var WhisperASRModuleVersion))
- obj[WhisperASRModuleVersionKey] = WhisperASRModuleVersion;
- if (TryGetValue(WhisperModelHashKey, out var WhisperModelHash))
- obj[WhisperModelHashKey] = WhisperModelHash;
- if (TryGetValue(WhisperModelNameKey, out var WhisperModelName))
- obj[WhisperModelNameKey] = WhisperModelName;
- if (TryGetValue(WhisperVersionKey, out var WhisperVersion))
- obj[WhisperVersionKey] = WhisperVersion;
- if (TryGetValue(WidthKey, out var Width))
- obj[WidthKey] = Width;
- if (TryGetValue(WordConfidenceInterval0To10Key, out var WordConfidenceInterval0To10))
- obj[WordConfidenceInterval0To10Key] = WordConfidenceInterval0To10;
- if (TryGetValue(WordConfidenceInterval11To20Key, out var WordConfidenceInterval11To20))
- obj[WordConfidenceInterval11To20Key] = WordConfidenceInterval11To20;
- if (TryGetValue(WordConfidenceInterval21To30Key, out var WordConfidenceInterval21To30))
- obj[WordConfidenceInterval21To30Key] = WordConfidenceInterval21To30;
- if (TryGetValue(WordConfidenceInterval31To40Key, out var WordConfidenceInterval31To40))
- obj[WordConfidenceInterval31To40Key] = WordConfidenceInterval31To40;
- if (TryGetValue(WordConfidenceInterval41To50Key, out var WordConfidenceInterval41To50))
- obj[WordConfidenceInterval41To50Key] = WordConfidenceInterval41To50;
- if (TryGetValue(WordConfidenceInterval51To60Key, out var WordConfidenceInterval51To60))
- obj[WordConfidenceInterval51To60Key] = WordConfidenceInterval51To60;
- if (TryGetValue(WordConfidenceInterval61To70Key, out var WordConfidenceInterval61To70))
- obj[WordConfidenceInterval61To70Key] = WordConfidenceInterval61To70;
- if (TryGetValue(WordConfidenceInterval71To80Key, out var WordConfidenceInterval71To80))
- obj[WordConfidenceInterval71To80Key] = WordConfidenceInterval71To80;
- if (TryGetValue(WordConfidenceInterval81To90Key, out var WordConfidenceInterval81To90))
- obj[WordConfidenceInterval81To90Key] = WordConfidenceInterval81To90;
- if (TryGetValue(WordConfidenceInterval91To100Key, out var WordConfidenceInterval91To100))
- obj[WordConfidenceInterval91To100Key] = WordConfidenceInterval91To100;
- if (TryGetValue(xxHash364Key, out var xxHash364))
- obj[xxHash364Key] = xxHash364;
- if (TryGetValue(xxHash3128Key, out var xxHash3128))
- obj[xxHash3128Key] = xxHash3128;
+ obj.WhisperASRModuleVersion = WhisperASRModuleVersion;
+ obj.WhisperModelHash = WhisperModelHash;
+ obj.WhisperModelName = WhisperModelName;
+ obj.WhisperVersion = WhisperVersion;
+ obj.Width = Width;
+ obj.WordConfidenceInterval0To10 = WordConfidenceInterval0To10;
+ obj.WordConfidenceInterval11To20 = WordConfidenceInterval11To20;
+ obj.WordConfidenceInterval21To30 = WordConfidenceInterval21To30;
+ obj.WordConfidenceInterval31To40 = WordConfidenceInterval31To40;
+ obj.WordConfidenceInterval41To50 = WordConfidenceInterval41To50;
+ obj.WordConfidenceInterval51To60 = WordConfidenceInterval51To60;
+ obj.WordConfidenceInterval61To70 = WordConfidenceInterval61To70;
+ obj.WordConfidenceInterval71To80 = WordConfidenceInterval71To80;
+ obj.WordConfidenceInterval81To90 = WordConfidenceInterval81To90;
+ obj.WordConfidenceInterval91To100 = WordConfidenceInterval91To100;
+ obj.xxHash364 = xxHash364;
+ obj.xxHash3128 = xxHash3128;
return obj;
}
diff --git a/SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs b/SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs
index a7b556c3..ab29e76f 100644
--- a/SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs
+++ b/SabreTools.Metadata.DatFiles.Test/DatFileTests.Filtering.cs
@@ -21,10 +21,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine { Name = "machine" };
- DatItem datItem = new Rom { Name = "rom.bin", };
- datItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- datItem.Machine = machine;
- datItem.Source = source;
+ DatItem datItem = new Rom
+ {
+ Name = "rom.bin",
+ CRC = "deadbeef",
+ Machine = machine,
+ Source = source
+ };
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(datItem, statsOnly: false);
@@ -47,10 +50,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine { Name = "machine" };
- DatItem datItem = new Rom { Name = "rom.bin" };
- datItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- datItem.Machine = machine;
- datItem.Source = source;
+ DatItem datItem = new Rom
+ {
+ Name = "rom.bin",
+ CRC = "deadbeef",
+ Machine = machine,
+ Source = source
+ };
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long sourceIndex = datFile.AddSourceDB(source);
diff --git a/SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs b/SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs
index cc83a9fd..bf5feeff 100644
--- a/SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs
+++ b/SabreTools.Metadata.DatFiles.Test/DatFileTests.FromMetadata.cs
@@ -781,102 +781,102 @@ namespace SabreTools.Metadata.DatFiles.Test
{
return new Data.Models.Metadata.Rom
{
- [Data.Models.Metadata.Rom.AlbumKey] = "album",
- [Data.Models.Metadata.Rom.AltRomnameKey] = "alt_romname",
- [Data.Models.Metadata.Rom.AltTitleKey] = "alt_title",
- [Data.Models.Metadata.Rom.ArtistKey] = "artist",
- [Data.Models.Metadata.Rom.ASRDetectedLangKey] = "asr_detected_lang",
- [Data.Models.Metadata.Rom.ASRDetectedLangConfKey] = "asr_detected_lang_conf",
- [Data.Models.Metadata.Rom.ASRTranscribedLangKey] = "asr_transcribed_lang",
- [Data.Models.Metadata.Rom.BiosKey] = "bios",
- [Data.Models.Metadata.Rom.BitrateKey] = "bitrate",
- [Data.Models.Metadata.Rom.BitTorrentMagnetHashKey] = "btih",
- [Data.Models.Metadata.Rom.ClothCoverDetectionModuleVersionKey] = "cloth_cover_detection_module_version",
- [Data.Models.Metadata.Rom.CollectionCatalogNumberKey] = "collection-catalog-number",
- [Data.Models.Metadata.Rom.CommentKey] = "comment",
- [Data.Models.Metadata.Rom.CRCKey] = HashType.CRC32.ZeroString,
- [Data.Models.Metadata.Rom.CRC16Key] = HashType.CRC16.ZeroString,
- [Data.Models.Metadata.Rom.CRC64Key] = HashType.CRC64.ZeroString,
- [Data.Models.Metadata.Rom.CreatorKey] = "creator",
- [Data.Models.Metadata.Rom.DateKey] = "date",
+ Album = "album",
+ AltRomname = "alt_romname",
+ AltTitle = "alt_title",
+ Artist = "artist",
+ ASRDetectedLang = "asr_detected_lang",
+ ASRDetectedLangConf = "asr_detected_lang_conf",
+ ASRTranscribedLang = "asr_transcribed_lang",
+ Bios = "bios",
+ Bitrate = "bitrate",
+ BitTorrentMagnetHash = "btih",
+ ClothCoverDetectionModuleVersion = "cloth_cover_detection_module_version",
+ CollectionCatalogNumber = "collection-catalog-number",
+ Comment = "comment",
+ CRC = HashType.CRC32.ZeroString,
+ CRC16 = HashType.CRC16.ZeroString,
+ CRC64 = HashType.CRC64.ZeroString,
+ Creator = "creator",
+ Date = "date",
Dispose = true,
- [Data.Models.Metadata.Rom.ExtensionKey] = "extension",
+ Extension = "extension",
FileCount = 12345,
FileIsAvailable = true,
- [Data.Models.Metadata.Rom.FlagsKey] = "flags",
- [Data.Models.Metadata.Rom.FormatKey] = "format",
- [Data.Models.Metadata.Rom.HeaderKey] = "header",
- [Data.Models.Metadata.Rom.HeightKey] = "height",
- [Data.Models.Metadata.Rom.hOCRCharToWordhOCRVersionKey] = "hocr_char_to_word_hocr_version",
- [Data.Models.Metadata.Rom.hOCRCharToWordModuleVersionKey] = "hocr_char_to_word_module_version",
- [Data.Models.Metadata.Rom.hOCRFtsTexthOCRVersionKey] = "hocr_fts_text_hocr_version",
- [Data.Models.Metadata.Rom.hOCRFtsTextModuleVersionKey] = "hocr_fts_text_module_version",
- [Data.Models.Metadata.Rom.hOCRPageIndexhOCRVersionKey] = "hocr_pageindex_hocr_version",
- [Data.Models.Metadata.Rom.hOCRPageIndexModuleVersionKey] = "hocr_pageindex_module_version",
+ Flags = "flags",
+ Format = "format",
+ Header = "header",
+ Height = "height",
+ hOCRCharToWordhOCRVersion = "hocr_char_to_word_hocr_version",
+ hOCRCharToWordModuleVersion = "hocr_char_to_word_module_version",
+ hOCRFtsTexthOCRVersion = "hocr_fts_text_hocr_version",
+ hOCRFtsTextModuleVersion = "hocr_fts_text_module_version",
+ hOCRPageIndexhOCRVersion = "hocr_pageindex_hocr_version",
+ hOCRPageIndexModuleVersion = "hocr_pageindex_module_version",
Inverted = true,
- [Data.Models.Metadata.Rom.LastModifiedTimeKey] = "mtime",
- [Data.Models.Metadata.Rom.LengthKey] = "length",
+ LastModifiedTime = "mtime",
+ Length = "length",
LoadFlag = Data.Models.Metadata.LoadFlag.Load16Byte,
- [Data.Models.Metadata.Rom.MatrixNumberKey] = "matrix_number",
- [Data.Models.Metadata.Rom.MD2Key] = HashType.MD2.ZeroString,
- [Data.Models.Metadata.Rom.MD4Key] = HashType.MD4.ZeroString,
- [Data.Models.Metadata.Rom.MD5Key] = HashType.MD5.ZeroString,
+ MatrixNumber = "matrix_number",
+ MD2 = HashType.MD2.ZeroString,
+ MD4 = HashType.MD4.ZeroString,
+ MD5 = HashType.MD5.ZeroString,
// [Data.Models.Metadata.Rom.OpenMSXMediaType] = null, // Omit due to other test
- [Data.Models.Metadata.Rom.MergeKey] = "merge",
+ OpenMSXType = "type",
+ Merge = "merge",
MIA = true,
Name = "name",
- [Data.Models.Metadata.Rom.TesseractOCRKey] = "ocr",
- [Data.Models.Metadata.Rom.TesseractOCRConvertedKey] = "ocr_converted",
- [Data.Models.Metadata.Rom.TesseractOCRDetectedLangKey] = "ocr_detected_lang",
- [Data.Models.Metadata.Rom.TesseractOCRDetectedLangConfKey] = "ocr_detected_lang_conf",
- [Data.Models.Metadata.Rom.TesseractOCRDetectedScriptKey] = "ocr_detected_script",
- [Data.Models.Metadata.Rom.TesseractOCRDetectedScriptConfKey] = "ocr_detected_script_conf",
- [Data.Models.Metadata.Rom.TesseractOCRModuleVersionKey] = "ocr_module_version",
- [Data.Models.Metadata.Rom.TesseractOCRParametersKey] = "ocr_parameters",
- [Data.Models.Metadata.Rom.OffsetKey] = "offset",
+ Offset = "offset",
Optional = true,
- [Data.Models.Metadata.Rom.OriginalKey] = "original",
- [Data.Models.Metadata.Rom.PDFModuleVersionKey] = "pdf_module_version",
- [Data.Models.Metadata.Rom.PreviewImageKey] = "preview-image",
- [Data.Models.Metadata.Rom.PublisherKey] = "publisher",
- [Data.Models.Metadata.Rom.RegionKey] = "region",
- [Data.Models.Metadata.Rom.RemarkKey] = "remark",
- [Data.Models.Metadata.Rom.RIPEMD128Key] = HashType.RIPEMD128.ZeroString,
- [Data.Models.Metadata.Rom.RIPEMD160Key] = HashType.RIPEMD160.ZeroString,
- [Data.Models.Metadata.Rom.RotationKey] = "rotation",
- [Data.Models.Metadata.Rom.SerialKey] = "serial",
- [Data.Models.Metadata.Rom.SHA1Key] = HashType.SHA1.ZeroString,
- [Data.Models.Metadata.Rom.SHA256Key] = HashType.SHA256.ZeroString,
- [Data.Models.Metadata.Rom.SHA384Key] = HashType.SHA384.ZeroString,
- [Data.Models.Metadata.Rom.SHA512Key] = HashType.SHA512.ZeroString,
+ Original = "original",
+ PDFModuleVersion = "pdf_module_version",
+ PreviewImage = "preview-image",
+ Publisher = "publisher",
+ Region = "region",
+ Remark = "remark",
+ RIPEMD128 = HashType.RIPEMD128.ZeroString,
+ RIPEMD160 = HashType.RIPEMD160.ZeroString,
+ Rotation = "rotation",
+ Serial = "serial",
+ SHA1 = HashType.SHA1.ZeroString,
+ SHA256 = HashType.SHA256.ZeroString,
+ SHA384 = HashType.SHA384.ZeroString,
+ SHA512 = HashType.SHA512.ZeroString,
Size = 12345,
SoundOnly = true,
- [Data.Models.Metadata.Rom.SourceKey] = "source",
- [Data.Models.Metadata.Rom.SpamSumKey] = HashType.SpamSum.ZeroString,
- [Data.Models.Metadata.Rom.StartKey] = "start",
+ Source = "source",
+ SpamSum = HashType.SpamSum.ZeroString,
+ Start = "start",
Status = Data.Models.Metadata.ItemStatus.Good,
- [Data.Models.Metadata.Rom.SummationKey] = "summation",
- [Data.Models.Metadata.Rom.TitleKey] = "title",
- [Data.Models.Metadata.Rom.TrackKey] = "track",
- [Data.Models.Metadata.Rom.OpenMSXType] = "type",
+ Summation = "summation",
+ TesseractOCR = "ocr",
+ TesseractOCRConverted = "ocr_converted",
+ TesseractOCRDetectedLang = "ocr_detected_lang",
+ TesseractOCRDetectedLangConf = "ocr_detected_lang_conf",
+ TesseractOCRDetectedScript = "ocr_detected_script",
+ TesseractOCRDetectedScriptConf = "ocr_detected_script_conf",
+ TesseractOCRModuleVersion = "ocr_module_version",
+ TesseractOCRParameters = "ocr_parameters",
+ Title = "title",
+ Track = "track",
Value = "value",
- [Data.Models.Metadata.Rom.WhisperASRModuleVersionKey] = "whisper_asr_module_version",
- [Data.Models.Metadata.Rom.WhisperModelHashKey] = "whisper_model_hash",
- [Data.Models.Metadata.Rom.WhisperModelNameKey] = "whisper_model_name",
- [Data.Models.Metadata.Rom.WhisperVersionKey] = "whisper_version",
- [Data.Models.Metadata.Rom.WidthKey] = "width",
- [Data.Models.Metadata.Rom.WordConfidenceInterval0To10Key] = "word_conf_0_10",
- [Data.Models.Metadata.Rom.WordConfidenceInterval11To20Key] = "word_conf_11_20",
- [Data.Models.Metadata.Rom.WordConfidenceInterval21To30Key] = "word_conf_21_30",
- [Data.Models.Metadata.Rom.WordConfidenceInterval31To40Key] = "word_conf_31_40",
- [Data.Models.Metadata.Rom.WordConfidenceInterval41To50Key] = "word_conf_41_50",
- [Data.Models.Metadata.Rom.WordConfidenceInterval51To60Key] = "word_conf_51_60",
- [Data.Models.Metadata.Rom.WordConfidenceInterval61To70Key] = "word_conf_61_70",
- [Data.Models.Metadata.Rom.WordConfidenceInterval71To80Key] = "word_conf_71_80",
- [Data.Models.Metadata.Rom.WordConfidenceInterval81To90Key] = "word_conf_81_90",
- [Data.Models.Metadata.Rom.WordConfidenceInterval91To100Key] = "word_conf_91_100",
- [Data.Models.Metadata.Rom.xxHash364Key] = HashType.XxHash3.ZeroString,
- [Data.Models.Metadata.Rom.xxHash3128Key] = HashType.XxHash128.ZeroString,
+ WhisperASRModuleVersion = "whisper_asr_module_version",
+ WhisperModelHash = "whisper_model_hash",
+ WhisperModelName = "whisper_model_name",
+ WhisperVersion = "whisper_version",
+ Width = "width",
+ WordConfidenceInterval0To10 = "word_conf_0_10",
+ WordConfidenceInterval11To20 = "word_conf_11_20",
+ WordConfidenceInterval21To30 = "word_conf_21_30",
+ WordConfidenceInterval31To40 = "word_conf_31_40",
+ WordConfidenceInterval41To50 = "word_conf_41_50",
+ WordConfidenceInterval51To60 = "word_conf_51_60",
+ WordConfidenceInterval61To70 = "word_conf_61_70",
+ WordConfidenceInterval71To80 = "word_conf_71_80",
+ WordConfidenceInterval81To90 = "word_conf_81_90",
+ WordConfidenceInterval91To100 = "word_conf_91_100",
+ xxHash364 = HashType.XxHash3.ZeroString,
+ xxHash3128 = HashType.XxHash128.ZeroString,
};
}
@@ -1493,102 +1493,102 @@ namespace SabreTools.Metadata.DatFiles.Test
private static void ValidateRom(Rom? rom)
{
Assert.NotNull(rom);
- Assert.Equal("album", rom.ReadString(Data.Models.Metadata.Rom.AlbumKey));
- Assert.Equal("alt_romname", rom.ReadString(Data.Models.Metadata.Rom.AltRomnameKey));
- Assert.Equal("alt_title", rom.ReadString(Data.Models.Metadata.Rom.AltTitleKey));
- Assert.Equal("artist", rom.ReadString(Data.Models.Metadata.Rom.ArtistKey));
- Assert.Equal("asr_detected_lang", rom.ReadString(Data.Models.Metadata.Rom.ASRDetectedLangKey));
- Assert.Equal("asr_detected_lang_conf", rom.ReadString(Data.Models.Metadata.Rom.ASRDetectedLangConfKey));
- Assert.Equal("asr_transcribed_lang", rom.ReadString(Data.Models.Metadata.Rom.ASRTranscribedLangKey));
- Assert.Equal("bios", rom.ReadString(Data.Models.Metadata.Rom.BiosKey));
- Assert.Equal("bitrate", rom.ReadString(Data.Models.Metadata.Rom.BitrateKey));
- Assert.Equal("btih", rom.ReadString(Data.Models.Metadata.Rom.BitTorrentMagnetHashKey));
- Assert.Equal("cloth_cover_detection_module_version", rom.ReadString(Data.Models.Metadata.Rom.ClothCoverDetectionModuleVersionKey));
- Assert.Equal("collection-catalog-number", rom.ReadString(Data.Models.Metadata.Rom.CollectionCatalogNumberKey));
- Assert.Equal("comment", rom.ReadString(Data.Models.Metadata.Rom.CommentKey));
- Assert.Equal(HashType.CRC32.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.CRCKey));
- Assert.Equal(HashType.CRC16.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.CRC16Key));
- Assert.Equal(HashType.CRC64.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.CRC64Key));
- Assert.Equal("creator", rom.ReadString(Data.Models.Metadata.Rom.CreatorKey));
- Assert.Equal("date", rom.ReadString(Data.Models.Metadata.Rom.DateKey));
+ Assert.Equal("album", rom.Album);
+ Assert.Equal("alt_romname", rom.AltRomname);
+ Assert.Equal("alt_title", rom.AltTitle);
+ Assert.Equal("artist", rom.Artist);
+ Assert.Equal("asr_detected_lang", rom.ASRDetectedLang);
+ Assert.Equal("asr_detected_lang_conf", rom.ASRDetectedLangConf);
+ Assert.Equal("asr_transcribed_lang", rom.ASRTranscribedLang);
+ Assert.Equal("bios", rom.Bios);
+ Assert.Equal("bitrate", rom.Bitrate);
+ Assert.Equal("btih", rom.BitTorrentMagnetHash);
+ 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.CRC64.ZeroString, rom.CRC64);
+ Assert.Equal("creator", rom.Creator);
+ Assert.Equal("date", rom.Date);
Assert.True(rom.Dispose);
- Assert.Equal("extension", rom.ReadString(Data.Models.Metadata.Rom.ExtensionKey));
+ Assert.Equal("extension", rom.Extension);
Assert.Equal(12345, rom.FileCount);
Assert.True(rom.FileIsAvailable);
- Assert.Equal("flags", rom.ReadString(Data.Models.Metadata.Rom.FlagsKey));
- Assert.Equal("format", rom.ReadString(Data.Models.Metadata.Rom.FormatKey));
- Assert.Equal("header", rom.ReadString(Data.Models.Metadata.Rom.HeaderKey));
- Assert.Equal("height", rom.ReadString(Data.Models.Metadata.Rom.HeightKey));
- Assert.Equal("hocr_char_to_word_hocr_version", rom.ReadString(Data.Models.Metadata.Rom.hOCRCharToWordhOCRVersionKey));
- Assert.Equal("hocr_char_to_word_module_version", rom.ReadString(Data.Models.Metadata.Rom.hOCRCharToWordModuleVersionKey));
- Assert.Equal("hocr_fts_text_hocr_version", rom.ReadString(Data.Models.Metadata.Rom.hOCRFtsTexthOCRVersionKey));
- Assert.Equal("hocr_fts_text_module_version", rom.ReadString(Data.Models.Metadata.Rom.hOCRFtsTextModuleVersionKey));
- Assert.Equal("hocr_pageindex_hocr_version", rom.ReadString(Data.Models.Metadata.Rom.hOCRPageIndexhOCRVersionKey));
- Assert.Equal("hocr_pageindex_module_version", rom.ReadString(Data.Models.Metadata.Rom.hOCRPageIndexModuleVersionKey));
+ Assert.Equal("flags", rom.Flags);
+ Assert.Equal("format", rom.Format);
+ Assert.Equal("header", rom.Header);
+ Assert.Equal("height", rom.Height);
+ Assert.Equal("hocr_char_to_word_hocr_version", rom.hOCRCharToWordhOCRVersion);
+ Assert.Equal("hocr_char_to_word_module_version", rom.hOCRCharToWordModuleVersion);
+ Assert.Equal("hocr_fts_text_hocr_version", rom.hOCRFtsTexthOCRVersion);
+ Assert.Equal("hocr_fts_text_module_version", rom.hOCRFtsTextModuleVersion);
+ Assert.Equal("hocr_pageindex_hocr_version", rom.hOCRPageIndexhOCRVersion);
+ Assert.Equal("hocr_pageindex_module_version", rom.hOCRPageIndexModuleVersion);
Assert.True(rom.Inverted);
- Assert.Equal("mtime", rom.ReadString(Data.Models.Metadata.Rom.LastModifiedTimeKey));
- Assert.Equal("length", rom.ReadString(Data.Models.Metadata.Rom.LengthKey));
+ Assert.Equal("mtime", rom.LastModifiedTime);
+ Assert.Equal("length", rom.Length);
Assert.Equal(Data.Models.Metadata.LoadFlag.Load16Byte, rom.LoadFlag);
- Assert.Equal("matrix_number", rom.ReadString(Data.Models.Metadata.Rom.MatrixNumberKey));
- Assert.Equal(HashType.MD2.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.MD2Key));
- Assert.Equal(HashType.MD4.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.MD4Key));
- Assert.Equal(HashType.MD5.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.MD5Key));
+ Assert.Equal("matrix_number", rom.MatrixNumber);
+ Assert.Equal(HashType.MD2.ZeroString, rom.MD2);
+ Assert.Equal(HashType.MD4.ZeroString, rom.MD4);
+ Assert.Equal(HashType.MD5.ZeroString, rom.MD5);
Assert.Null(rom.OpenMSXMediaType); // Omit due to other test
- Assert.Equal("merge", rom.ReadString(Data.Models.Metadata.Rom.MergeKey));
+ Assert.Equal("type", rom.OpenMSXType);
+ Assert.Equal("merge", rom.Merge);
Assert.True(rom.MIA);
Assert.Equal("name", rom.Name);
- Assert.Equal("ocr", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRKey));
- Assert.Equal("ocr_converted", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRConvertedKey));
- Assert.Equal("ocr_detected_lang", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRDetectedLangKey));
- Assert.Equal("ocr_detected_lang_conf", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRDetectedLangConfKey));
- Assert.Equal("ocr_detected_script", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRDetectedScriptKey));
- Assert.Equal("ocr_detected_script_conf", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRDetectedScriptConfKey));
- Assert.Equal("ocr_module_version", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRModuleVersionKey));
- Assert.Equal("ocr_parameters", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRParametersKey));
- Assert.Equal("offset", rom.ReadString(Data.Models.Metadata.Rom.OffsetKey));
+ Assert.Equal("offset", rom.Offset);
Assert.True(rom.Optional);
- Assert.Equal("original", rom.ReadString(Data.Models.Metadata.Rom.OriginalKey));
- Assert.Equal("pdf_module_version", rom.ReadString(Data.Models.Metadata.Rom.PDFModuleVersionKey));
- Assert.Equal("preview-image", rom.ReadString(Data.Models.Metadata.Rom.PreviewImageKey));
- Assert.Equal("publisher", rom.ReadString(Data.Models.Metadata.Rom.PublisherKey));
- Assert.Equal("region", rom.ReadString(Data.Models.Metadata.Rom.RegionKey));
- Assert.Equal("remark", rom.ReadString(Data.Models.Metadata.Rom.RemarkKey));
- Assert.Equal(HashType.RIPEMD128.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key));
- Assert.Equal(HashType.RIPEMD160.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key));
- Assert.Equal("rotation", rom.ReadString(Data.Models.Metadata.Rom.RotationKey));
- Assert.Equal("serial", rom.ReadString(Data.Models.Metadata.Rom.SerialKey));
- Assert.Equal(HashType.SHA1.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA1Key));
- Assert.Equal(HashType.SHA256.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA256Key));
- Assert.Equal(HashType.SHA384.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA384Key));
- Assert.Equal(HashType.SHA512.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA512Key));
+ Assert.Equal("original", rom.OriginalProperty);
+ Assert.Equal("pdf_module_version", rom.PDFModuleVersion);
+ Assert.Equal("preview-image", rom.PreviewImage);
+ Assert.Equal("publisher", rom.Publisher);
+ Assert.Equal("region", rom.Region);
+ Assert.Equal("remark", rom.Remark);
+ Assert.Equal(HashType.RIPEMD128.ZeroString, rom.RIPEMD128);
+ Assert.Equal(HashType.RIPEMD160.ZeroString, rom.RIPEMD160);
+ Assert.Equal("rotation", rom.Rotation);
+ Assert.Equal("serial", rom.Serial);
+ Assert.Equal(HashType.SHA1.ZeroString, rom.SHA1);
+ Assert.Equal(HashType.SHA256.ZeroString, rom.SHA256);
+ Assert.Equal(HashType.SHA384.ZeroString, rom.SHA384);
+ Assert.Equal(HashType.SHA512.ZeroString, rom.SHA512);
Assert.Equal(12345, rom.Size);
Assert.True(rom.SoundOnly);
- Assert.Equal("source", rom.ReadString(Data.Models.Metadata.Rom.SourceKey));
- Assert.Equal(HashType.SpamSum.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey));
- Assert.Equal("start", rom.ReadString(Data.Models.Metadata.Rom.StartKey));
+ Assert.Equal("source", rom.SourceProperty);
+ Assert.Equal(HashType.SpamSum.ZeroString, rom.SpamSum);
+ Assert.Equal("start", rom.Start);
Assert.Equal(Data.Models.Metadata.ItemStatus.Good, rom.Status);
- Assert.Equal("summation", rom.ReadString(Data.Models.Metadata.Rom.SummationKey));
- Assert.Equal("title", rom.ReadString(Data.Models.Metadata.Rom.TitleKey));
- Assert.Equal("track", rom.ReadString(Data.Models.Metadata.Rom.TrackKey));
- Assert.Equal("type", rom.ReadString(Data.Models.Metadata.Rom.OpenMSXType));
+ Assert.Equal("summation", rom.Summation);
+ Assert.Equal("ocr", rom.TesseractOCR);
+ Assert.Equal("ocr_converted", rom.TesseractOCRConverted);
+ Assert.Equal("ocr_detected_lang", rom.TesseractOCRDetectedLang);
+ Assert.Equal("ocr_detected_lang_conf", rom.TesseractOCRDetectedLangConf);
+ Assert.Equal("ocr_detected_script", rom.TesseractOCRDetectedScript);
+ Assert.Equal("ocr_detected_script_conf", rom.TesseractOCRDetectedScriptConf);
+ Assert.Equal("ocr_module_version", rom.TesseractOCRModuleVersion);
+ Assert.Equal("ocr_parameters", rom.TesseractOCRParameters);
+ Assert.Equal("title", rom.Title);
+ Assert.Equal("track", rom.Track);
Assert.Equal("value", rom.Value);
- Assert.Equal("whisper_asr_module_version", rom.ReadString(Data.Models.Metadata.Rom.WhisperASRModuleVersionKey));
- Assert.Equal("whisper_model_hash", rom.ReadString(Data.Models.Metadata.Rom.WhisperModelHashKey));
- Assert.Equal("whisper_model_name", rom.ReadString(Data.Models.Metadata.Rom.WhisperModelNameKey));
- Assert.Equal("whisper_version", rom.ReadString(Data.Models.Metadata.Rom.WhisperVersionKey));
- Assert.Equal("width", rom.ReadString(Data.Models.Metadata.Rom.WidthKey));
- Assert.Equal("word_conf_0_10", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval0To10Key));
- Assert.Equal("word_conf_11_20", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval11To20Key));
- Assert.Equal("word_conf_21_30", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval21To30Key));
- Assert.Equal("word_conf_31_40", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval31To40Key));
- Assert.Equal("word_conf_41_50", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval41To50Key));
- Assert.Equal("word_conf_51_60", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval51To60Key));
- Assert.Equal("word_conf_61_70", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval61To70Key));
- Assert.Equal("word_conf_71_80", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval71To80Key));
- Assert.Equal("word_conf_81_90", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval81To90Key));
- Assert.Equal("word_conf_91_100", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval91To100Key));
- Assert.Equal(HashType.XxHash3.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.xxHash364Key));
- Assert.Equal(HashType.XxHash128.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.xxHash3128Key));
+ Assert.Equal("whisper_asr_module_version", rom.WhisperASRModuleVersion);
+ Assert.Equal("whisper_model_hash", rom.WhisperModelHash);
+ Assert.Equal("whisper_model_name", rom.WhisperModelName);
+ Assert.Equal("whisper_version", rom.WhisperVersion);
+ Assert.Equal("width", rom.Width);
+ Assert.Equal("word_conf_0_10", rom.WordConfidenceInterval0To10);
+ Assert.Equal("word_conf_11_20", rom.WordConfidenceInterval11To20);
+ Assert.Equal("word_conf_21_30", rom.WordConfidenceInterval21To30);
+ Assert.Equal("word_conf_31_40", rom.WordConfidenceInterval31To40);
+ Assert.Equal("word_conf_41_50", rom.WordConfidenceInterval41To50);
+ Assert.Equal("word_conf_51_60", rom.WordConfidenceInterval51To60);
+ Assert.Equal("word_conf_61_70", rom.WordConfidenceInterval61To70);
+ Assert.Equal("word_conf_71_80", rom.WordConfidenceInterval71To80);
+ Assert.Equal("word_conf_81_90", rom.WordConfidenceInterval81To90);
+ Assert.Equal("word_conf_91_100", rom.WordConfidenceInterval91To100);
+ Assert.Equal(HashType.XxHash3.ZeroString, rom.xxHash364);
+ Assert.Equal(HashType.XxHash128.ZeroString, rom.xxHash3128);
}
private static void ValidateSample(Sample? sample)
diff --git a/SabreTools.Metadata.DatFiles.Test/DatFileTests.Splitting.cs b/SabreTools.Metadata.DatFiles.Test/DatFileTests.Splitting.cs
index 99783c73..7b33f0ab 100644
--- a/SabreTools.Metadata.DatFiles.Test/DatFileTests.Splitting.cs
+++ b/SabreTools.Metadata.DatFiles.Test/DatFileTests.Splitting.cs
@@ -27,28 +27,28 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = parentMachine,
+ Source = source
};
- parentItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- parentItem.Machine = parentMachine;
- parentItem.Source = source;
DatItem matchChildItem = new Rom
{
Name = "match_child_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = childMachine,
+ Source = source
};
- matchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- matchChildItem.Machine = childMachine;
- matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom
{
Name = "no_match_child_rom",
Size = 12345,
+ CRC = "beefdead",
+ Machine = childMachine,
+ Source = source
};
- noMatchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "beefdead");
- noMatchChildItem.Machine = childMachine;
- noMatchChildItem.Source = source;
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(parentItem, statsOnly: false);
@@ -79,28 +79,28 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = parentMachine,
+ Source = source
};
- parentItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- parentItem.Machine = parentMachine;
- parentItem.Source = source;
DatItem matchChildItem = new Rom
{
Name = "match_child_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = childMachine,
+ Source = source
};
- matchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- matchChildItem.Machine = childMachine;
- matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom
{
Name = "no_match_child_rom",
Size = 12345,
+ CRC = "beefdead",
+ Machine = childMachine,
+ Source = source
};
- noMatchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "beefdead");
- noMatchChildItem.Machine = childMachine;
- noMatchChildItem.Source = source;
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(parentItem, statsOnly: false);
@@ -131,28 +131,28 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = parentMachine,
+ Source = source
};
- parentItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- parentItem.Machine = parentMachine;
- parentItem.Source = source;
DatItem matchChildItem = new Rom
{
Name = "match_child_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = childMachine,
+ Source = source
};
- matchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- matchChildItem.Machine = childMachine;
- matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom
{
Name = "no_match_child_rom",
Size = 12345,
+ CRC = "beefdead",
+ Machine = childMachine,
+ Source = source
};
- noMatchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "beefdead");
- noMatchChildItem.Machine = childMachine;
- noMatchChildItem.Source = source;
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
@@ -186,28 +186,28 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = parentMachine,
+ Source = source
};
- parentItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- parentItem.Machine = parentMachine;
- parentItem.Source = source;
DatItem matchChildItem = new Rom
{
Name = "match_child_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = childMachine,
+ Source = source
};
- matchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- matchChildItem.Machine = childMachine;
- matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom
{
Name = "no_match_child_rom",
Size = 12345,
+ CRC = "beefdead",
+ Machine = childMachine,
+ Source = source
};
- noMatchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "beefdead");
- noMatchChildItem.Machine = childMachine;
- noMatchChildItem.Source = source;
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
@@ -245,28 +245,28 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = parentMachine,
+ Source = source
};
- parentItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- parentItem.Machine = parentMachine;
- parentItem.Source = source;
DatItem matchChildItem = new Rom
{
Name = "match_child_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = childMachine,
+ Source = source
};
- matchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- matchChildItem.Machine = childMachine;
- matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom
{
Name = "no_match_child_rom",
Size = 12345,
+ CRC = "beefdead",
+ Machine = childMachine,
+ Source = source
};
- noMatchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "beefdead");
- noMatchChildItem.Machine = childMachine;
- noMatchChildItem.Source = source;
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(parentItem, statsOnly: false);
@@ -297,28 +297,28 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = parentMachine,
+ Source = source
};
- parentItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- parentItem.Machine = parentMachine;
- parentItem.Source = source;
DatItem matchChildItem = new Rom
{
Name = "match_child_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = childMachine,
+ Source = source
};
- matchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- matchChildItem.Machine = childMachine;
- matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom
{
Name = "no_match_child_rom",
Size = 12345,
+ CRC = "beefdead",
+ Machine = childMachine,
+ Source = source
};
- noMatchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "beefdead");
- noMatchChildItem.Machine = childMachine;
- noMatchChildItem.Source = source;
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
@@ -375,10 +375,10 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = itemMachine,
+ Source = source
};
- datItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- datItem.Machine = itemMachine;
- datItem.Source = source;
DatItem deviceRef = new DeviceRef
{
@@ -434,8 +434,8 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom",
Size = 12345,
+ CRC = "deadbeef"
};
- datItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
DatItem deviceRef = new DeviceRef
{
@@ -486,28 +486,28 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = parentMachine,
+ Source = source
};
- parentItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- parentItem.Machine = parentMachine;
- parentItem.Source = source;
DatItem matchChildItem = new Rom
{
Name = "match_child_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = childMachine,
+ Source = source
};
- matchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- matchChildItem.Machine = childMachine;
- matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom
{
Name = "no_match_child_rom",
Size = 12345,
+ CRC = "beefdead",
+ Machine = childMachine,
+ Source = source
};
- noMatchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "beefdead");
- noMatchChildItem.Machine = childMachine;
- noMatchChildItem.Source = source;
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(parentItem, statsOnly: false);
@@ -538,28 +538,28 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = parentMachine,
+ Source = source
};
- parentItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- parentItem.Machine = parentMachine;
- parentItem.Source = source;
DatItem matchChildItem = new Rom
{
Name = "match_child_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = childMachine,
+ Source = source
};
- matchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- matchChildItem.Machine = childMachine;
- matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom
{
Name = "no_match_child_rom",
Size = 12345,
+ CRC = "beefdead",
+ Machine = childMachine,
+ Source = source
};
- noMatchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "beefdead");
- noMatchChildItem.Machine = childMachine;
- noMatchChildItem.Source = source;
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
@@ -677,28 +677,28 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = parentMachine,
+ Source = source
};
- parentItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- parentItem.Machine = parentMachine;
- parentItem.Source = source;
DatItem matchChildItem = new Rom
{
Name = "match_child_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = childMachine,
+ Source = source
};
- matchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- matchChildItem.Machine = childMachine;
- matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom
{
Name = "no_match_child_rom",
Size = 12345,
+ CRC = "beefdead",
+ Machine = childMachine,
+ Source = source
};
- noMatchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "beefdead");
- noMatchChildItem.Machine = childMachine;
- noMatchChildItem.Source = source;
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(parentItem, statsOnly: false);
@@ -737,28 +737,28 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = parentMachine,
+ Source = source
};
- parentItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- parentItem.Machine = parentMachine;
- parentItem.Source = source;
DatItem matchChildItem = new Rom
{
Name = "match_child_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = childMachine,
+ Source = source
};
- matchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- matchChildItem.Machine = childMachine;
- matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom
{
Name = "no_match_child_rom",
Size = 12345,
+ CRC = "beefdead",
+ Machine = childMachine,
+ Source = source
};
- noMatchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "beefdead");
- noMatchChildItem.Machine = childMachine;
- noMatchChildItem.Source = source;
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
@@ -801,28 +801,28 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = parentMachine,
+ Source = source
};
- parentItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- parentItem.Machine = parentMachine;
- parentItem.Source = source;
DatItem matchChildItem = new Rom
{
Name = "match_child_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = childMachine,
+ Source = source
};
- matchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- matchChildItem.Machine = childMachine;
- matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom
{
Name = "no_match_child_rom",
Size = 12345,
+ CRC = "beefdead",
+ Machine = childMachine,
+ Source = source
};
- noMatchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "beefdead");
- noMatchChildItem.Machine = childMachine;
- noMatchChildItem.Source = source;
DatFile datFile = new Logiqx(datFile: null, useGame: false);
datFile.AddItem(parentItem, statsOnly: false);
@@ -857,28 +857,28 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "parent_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = parentMachine,
+ Source = source
};
- parentItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- parentItem.Machine = parentMachine;
- parentItem.Source = source;
DatItem matchChildItem = new Rom
{
Name = "match_child_rom",
Size = 12345,
+ CRC = "deadbeef",
+ Machine = childMachine,
+ Source = source
};
- matchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- matchChildItem.Machine = childMachine;
- matchChildItem.Source = source;
DatItem noMatchChildItem = new Rom
{
Name = "no_match_child_rom",
Size = 12345,
+ CRC = "beefdead",
+ Machine = childMachine,
+ Source = source
};
- noMatchChildItem.Write(Data.Models.Metadata.Rom.CRCKey, "beefdead");
- noMatchChildItem.Machine = childMachine;
- noMatchChildItem.Source = source;
DatFile datFile = new Logiqx(datFile: null, useGame: false);
long biosMachineIndex = datFile.AddMachineDB(parentMachine);
diff --git a/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs b/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs
index a3045f03..305af4d3 100644
--- a/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs
+++ b/SabreTools.Metadata.DatFiles.Test/DatFileTests.ToMetadata.cs
@@ -1025,102 +1025,102 @@ namespace SabreTools.Metadata.DatFiles.Test
private static void ValidateMetadataRom(Data.Models.Metadata.Rom? rom)
{
Assert.NotNull(rom);
- Assert.Equal("album", rom.ReadString(Data.Models.Metadata.Rom.AlbumKey));
- Assert.Equal("alt_romname", rom.ReadString(Data.Models.Metadata.Rom.AltRomnameKey));
- Assert.Equal("alt_title", rom.ReadString(Data.Models.Metadata.Rom.AltTitleKey));
- Assert.Equal("artist", rom.ReadString(Data.Models.Metadata.Rom.ArtistKey));
- Assert.Equal("asr_detected_lang", rom.ReadString(Data.Models.Metadata.Rom.ASRDetectedLangKey));
- Assert.Equal("asr_detected_lang_conf", rom.ReadString(Data.Models.Metadata.Rom.ASRDetectedLangConfKey));
- Assert.Equal("asr_transcribed_lang", rom.ReadString(Data.Models.Metadata.Rom.ASRTranscribedLangKey));
- Assert.Equal("bios", rom.ReadString(Data.Models.Metadata.Rom.BiosKey));
- Assert.Equal("bitrate", rom.ReadString(Data.Models.Metadata.Rom.BitrateKey));
- Assert.Equal("btih", rom.ReadString(Data.Models.Metadata.Rom.BitTorrentMagnetHashKey));
- Assert.Equal("cloth_cover_detection_module_version", rom.ReadString(Data.Models.Metadata.Rom.ClothCoverDetectionModuleVersionKey));
- Assert.Equal("collection-catalog-number", rom.ReadString(Data.Models.Metadata.Rom.CollectionCatalogNumberKey));
- Assert.Equal("comment", rom.ReadString(Data.Models.Metadata.Rom.CommentKey));
- Assert.Equal(HashType.CRC32.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.CRCKey));
- Assert.Equal(HashType.CRC16.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.CRC16Key));
- Assert.Equal(HashType.CRC64.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.CRC64Key));
- Assert.Equal("creator", rom.ReadString(Data.Models.Metadata.Rom.CreatorKey));
- Assert.Equal("date", rom.ReadString(Data.Models.Metadata.Rom.DateKey));
+ Assert.Equal("album", rom.Album);
+ Assert.Equal("alt_romname", rom.AltRomname);
+ Assert.Equal("alt_title", rom.AltTitle);
+ Assert.Equal("artist", rom.Artist);
+ Assert.Equal("asr_detected_lang", rom.ASRDetectedLang);
+ Assert.Equal("asr_detected_lang_conf", rom.ASRDetectedLangConf);
+ Assert.Equal("asr_transcribed_lang", rom.ASRTranscribedLang);
+ Assert.Equal("bios", rom.Bios);
+ Assert.Equal("bitrate", rom.Bitrate);
+ Assert.Equal("btih", rom.BitTorrentMagnetHash);
+ 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.CRC64.ZeroString, rom.CRC64);
+ Assert.Equal("creator", rom.Creator);
+ Assert.Equal("date", rom.Date);
Assert.True(rom.Dispose);
- Assert.Equal("extension", rom.ReadString(Data.Models.Metadata.Rom.ExtensionKey));
+ Assert.Equal("extension", rom.Extension);
Assert.Equal(12345, rom.FileCount);
Assert.True(rom.FileIsAvailable);
- Assert.Equal("flags", rom.ReadString(Data.Models.Metadata.Rom.FlagsKey));
- Assert.Equal("format", rom.ReadString(Data.Models.Metadata.Rom.FormatKey));
- Assert.Equal("header", rom.ReadString(Data.Models.Metadata.Rom.HeaderKey));
- Assert.Equal("height", rom.ReadString(Data.Models.Metadata.Rom.HeightKey));
- Assert.Equal("hocr_char_to_word_hocr_version", rom.ReadString(Data.Models.Metadata.Rom.hOCRCharToWordhOCRVersionKey));
- Assert.Equal("hocr_char_to_word_module_version", rom.ReadString(Data.Models.Metadata.Rom.hOCRCharToWordModuleVersionKey));
- Assert.Equal("hocr_fts_text_hocr_version", rom.ReadString(Data.Models.Metadata.Rom.hOCRFtsTexthOCRVersionKey));
- Assert.Equal("hocr_fts_text_module_version", rom.ReadString(Data.Models.Metadata.Rom.hOCRFtsTextModuleVersionKey));
- Assert.Equal("hocr_pageindex_hocr_version", rom.ReadString(Data.Models.Metadata.Rom.hOCRPageIndexhOCRVersionKey));
- Assert.Equal("hocr_pageindex_module_version", rom.ReadString(Data.Models.Metadata.Rom.hOCRPageIndexModuleVersionKey));
+ Assert.Equal("flags", rom.Flags);
+ Assert.Equal("format", rom.Format);
+ Assert.Equal("header", rom.Header);
+ Assert.Equal("height", rom.Height);
+ Assert.Equal("hocr_char_to_word_hocr_version", rom.hOCRCharToWordhOCRVersion);
+ Assert.Equal("hocr_char_to_word_module_version", rom.hOCRCharToWordModuleVersion);
+ Assert.Equal("hocr_fts_text_hocr_version", rom.hOCRFtsTexthOCRVersion);
+ Assert.Equal("hocr_fts_text_module_version", rom.hOCRFtsTextModuleVersion);
+ Assert.Equal("hocr_pageindex_hocr_version", rom.hOCRPageIndexhOCRVersion);
+ Assert.Equal("hocr_pageindex_module_version", rom.hOCRPageIndexModuleVersion);
Assert.True(rom.Inverted);
- Assert.Equal("mtime", rom.ReadString(Data.Models.Metadata.Rom.LastModifiedTimeKey));
- Assert.Equal("length", rom.ReadString(Data.Models.Metadata.Rom.LengthKey));
+ Assert.Equal("mtime", rom.LastModifiedTime);
+ Assert.Equal("length", rom.Length);
Assert.Equal(Data.Models.Metadata.LoadFlag.Load16Byte, rom.LoadFlag);
- Assert.Equal("matrix_number", rom.ReadString(Data.Models.Metadata.Rom.MatrixNumberKey));
- Assert.Equal(HashType.MD2.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.MD2Key));
- Assert.Equal(HashType.MD4.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.MD4Key));
- Assert.Equal(HashType.MD5.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.MD5Key));
+ Assert.Equal("matrix_number", rom.MatrixNumber);
+ Assert.Equal(HashType.MD2.ZeroString, rom.MD2);
+ Assert.Equal(HashType.MD4.ZeroString, rom.MD4);
+ Assert.Equal(HashType.MD5.ZeroString, rom.MD5);
Assert.Null(rom.OpenMSXMediaType); // Omit due to other test
- Assert.Equal("merge", rom.ReadString(Data.Models.Metadata.Rom.MergeKey));
+ Assert.Equal("type", rom.OpenMSXType);
+ Assert.Equal("merge", rom.Merge);
Assert.True(rom.MIA);
Assert.Equal("name", rom.Name);
- Assert.Equal("ocr", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRKey));
- Assert.Equal("ocr_converted", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRConvertedKey));
- Assert.Equal("ocr_detected_lang", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRDetectedLangKey));
- Assert.Equal("ocr_detected_lang_conf", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRDetectedLangConfKey));
- Assert.Equal("ocr_detected_script", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRDetectedScriptKey));
- Assert.Equal("ocr_detected_script_conf", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRDetectedScriptConfKey));
- Assert.Equal("ocr_module_version", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRModuleVersionKey));
- Assert.Equal("ocr_parameters", rom.ReadString(Data.Models.Metadata.Rom.TesseractOCRParametersKey));
- Assert.Equal("offset", rom.ReadString(Data.Models.Metadata.Rom.OffsetKey));
+ Assert.Equal("offset", rom.Offset);
Assert.True(rom.Optional);
- Assert.Equal("original", rom.ReadString(Data.Models.Metadata.Rom.OriginalKey));
- Assert.Equal("pdf_module_version", rom.ReadString(Data.Models.Metadata.Rom.PDFModuleVersionKey));
- Assert.Equal("preview-image", rom.ReadString(Data.Models.Metadata.Rom.PreviewImageKey));
- Assert.Equal("publisher", rom.ReadString(Data.Models.Metadata.Rom.PublisherKey));
- Assert.Equal("region", rom.ReadString(Data.Models.Metadata.Rom.RegionKey));
- Assert.Equal("remark", rom.ReadString(Data.Models.Metadata.Rom.RemarkKey));
- Assert.Equal(HashType.RIPEMD128.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key));
- Assert.Equal(HashType.RIPEMD160.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key));
- Assert.Equal("rotation", rom.ReadString(Data.Models.Metadata.Rom.RotationKey));
- Assert.Equal("serial", rom.ReadString(Data.Models.Metadata.Rom.SerialKey));
- Assert.Equal(HashType.SHA1.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA1Key));
- Assert.Equal(HashType.SHA256.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA256Key));
- Assert.Equal(HashType.SHA384.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA384Key));
- Assert.Equal(HashType.SHA512.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA512Key));
+ Assert.Equal("original", rom.Original);
+ Assert.Equal("pdf_module_version", rom.PDFModuleVersion);
+ Assert.Equal("preview-image", rom.PreviewImage);
+ Assert.Equal("publisher", rom.Publisher);
+ Assert.Equal("region", rom.Region);
+ Assert.Equal("remark", rom.Remark);
+ Assert.Equal(HashType.RIPEMD128.ZeroString, rom.RIPEMD128);
+ Assert.Equal(HashType.RIPEMD160.ZeroString, rom.RIPEMD160);
+ Assert.Equal("rotation", rom.Rotation);
+ Assert.Equal("serial", rom.Serial);
+ Assert.Equal(HashType.SHA1.ZeroString, rom.SHA1);
+ Assert.Equal(HashType.SHA256.ZeroString, rom.SHA256);
+ Assert.Equal(HashType.SHA384.ZeroString, rom.SHA384);
+ Assert.Equal(HashType.SHA512.ZeroString, rom.SHA512);
Assert.Equal(12345, rom.Size);
Assert.True(rom.SoundOnly);
- Assert.Equal("source", rom.ReadString(Data.Models.Metadata.Rom.SourceKey));
- Assert.Equal(HashType.SpamSum.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey));
- Assert.Equal("start", rom.ReadString(Data.Models.Metadata.Rom.StartKey));
+ Assert.Equal("source", rom.Source);
+ Assert.Equal(HashType.SpamSum.ZeroString, rom.SpamSum);
+ Assert.Equal("start", rom.Start);
Assert.Equal(Data.Models.Metadata.ItemStatus.Good, rom.Status);
- Assert.Equal("summation", rom.ReadString(Data.Models.Metadata.Rom.SummationKey));
- Assert.Equal("title", rom.ReadString(Data.Models.Metadata.Rom.TitleKey));
- Assert.Equal("track", rom.ReadString(Data.Models.Metadata.Rom.TrackKey));
- Assert.Equal("type", rom.ReadString(Data.Models.Metadata.Rom.OpenMSXType));
+ Assert.Equal("summation", rom.Summation);
+ Assert.Equal("ocr", rom.TesseractOCR);
+ Assert.Equal("ocr_converted", rom.TesseractOCRConverted);
+ Assert.Equal("ocr_detected_lang", rom.TesseractOCRDetectedLang);
+ Assert.Equal("ocr_detected_lang_conf", rom.TesseractOCRDetectedLangConf);
+ Assert.Equal("ocr_detected_script", rom.TesseractOCRDetectedScript);
+ Assert.Equal("ocr_detected_script_conf", rom.TesseractOCRDetectedScriptConf);
+ Assert.Equal("ocr_module_version", rom.TesseractOCRModuleVersion);
+ Assert.Equal("ocr_parameters", rom.TesseractOCRParameters);
+ Assert.Equal("title", rom.Title);
+ Assert.Equal("track", rom.Track);
Assert.Equal("value", rom.Value);
- Assert.Equal("whisper_asr_module_version", rom.ReadString(Data.Models.Metadata.Rom.WhisperASRModuleVersionKey));
- Assert.Equal("whisper_model_hash", rom.ReadString(Data.Models.Metadata.Rom.WhisperModelHashKey));
- Assert.Equal("whisper_model_name", rom.ReadString(Data.Models.Metadata.Rom.WhisperModelNameKey));
- Assert.Equal("whisper_version", rom.ReadString(Data.Models.Metadata.Rom.WhisperVersionKey));
- Assert.Equal("width", rom.ReadString(Data.Models.Metadata.Rom.WidthKey));
- Assert.Equal("word_conf_0_10", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval0To10Key));
- Assert.Equal("word_conf_11_20", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval11To20Key));
- Assert.Equal("word_conf_21_30", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval21To30Key));
- Assert.Equal("word_conf_31_40", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval31To40Key));
- Assert.Equal("word_conf_41_50", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval41To50Key));
- Assert.Equal("word_conf_51_60", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval51To60Key));
- Assert.Equal("word_conf_61_70", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval61To70Key));
- Assert.Equal("word_conf_71_80", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval71To80Key));
- Assert.Equal("word_conf_81_90", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval81To90Key));
- Assert.Equal("word_conf_91_100", rom.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval91To100Key));
- Assert.Equal(HashType.XxHash3.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.xxHash364Key));
- Assert.Equal(HashType.XxHash128.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.xxHash3128Key));
+ Assert.Equal("whisper_asr_module_version", rom.WhisperASRModuleVersion);
+ Assert.Equal("whisper_model_hash", rom.WhisperModelHash);
+ Assert.Equal("whisper_model_name", rom.WhisperModelName);
+ Assert.Equal("whisper_version", rom.WhisperVersion);
+ Assert.Equal("width", rom.Width);
+ Assert.Equal("word_conf_0_10", rom.WordConfidenceInterval0To10);
+ Assert.Equal("word_conf_11_20", rom.WordConfidenceInterval11To20);
+ Assert.Equal("word_conf_21_30", rom.WordConfidenceInterval21To30);
+ Assert.Equal("word_conf_31_40", rom.WordConfidenceInterval31To40);
+ Assert.Equal("word_conf_41_50", rom.WordConfidenceInterval41To50);
+ Assert.Equal("word_conf_51_60", rom.WordConfidenceInterval51To60);
+ Assert.Equal("word_conf_61_70", rom.WordConfidenceInterval61To70);
+ Assert.Equal("word_conf_71_80", rom.WordConfidenceInterval71To80);
+ Assert.Equal("word_conf_81_90", rom.WordConfidenceInterval81To90);
+ Assert.Equal("word_conf_91_100", rom.WordConfidenceInterval91To100);
+ Assert.Equal(HashType.XxHash3.ZeroString, rom.xxHash364);
+ Assert.Equal(HashType.XxHash128.ZeroString, rom.xxHash3128);
}
private static void ValidateMetadataSample(Data.Models.Metadata.Sample? sample)
diff --git a/SabreTools.Metadata.DatFiles.Test/DatFileTests.cs b/SabreTools.Metadata.DatFiles.Test/DatFileTests.cs
index 954dd0b8..7bf11cde 100644
--- a/SabreTools.Metadata.DatFiles.Test/DatFileTests.cs
+++ b/SabreTools.Metadata.DatFiles.Test/DatFileTests.cs
@@ -32,10 +32,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine { Name = "key" };
- DatItem rom = new Rom { Name = "rom" };
- rom.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- rom.Source = source;
- rom.Machine = machine;
+ DatItem rom = new Rom
+ {
+ Name = "rom",
+ CRC = "deadbeef",
+ Source = source,
+ Machine = machine
+ };
DatFile? datFile = new Logiqx(datFile: null, useGame: false);
datFile.Header.Name = "name";
@@ -1329,8 +1332,11 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Machine machine = new Machine { Name = "machine" };
- DatItem item = new Rom { Name = "name" };
- item.Write(Data.Models.Metadata.Rom.SHA1Key, HashType.SHA1.ZeroString);
+ DatItem item = new Rom
+ {
+ Name = "name",
+ SHA1 = HashType.SHA1.ZeroString
+ };
DatFile? datFile = new Logiqx(datFile: null, useGame: false);
datFile.Modifiers.Prefix = fix;
@@ -1371,20 +1377,20 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "name",
Size = 12345,
+ CRC16 = "crc16",
+ CRC = "crc",
+ CRC64 = "crc64",
+ MD2 = "md2",
+ MD4 = "md4",
+ MD5 = "md5",
+ RIPEMD128 = "ripemd128",
+ RIPEMD160 = "ripemd160",
+ SHA1 = "sha1",
+ SHA256 = "sha256",
+ SHA384 = "sha384",
+ SHA512 = "sha512",
+ SpamSum = "spamsum"
};
- item.Write(Data.Models.Metadata.Rom.CRC16Key, "crc16");
- item.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
- item.Write(Data.Models.Metadata.Rom.CRC64Key, "crc64");
- item.Write(Data.Models.Metadata.Rom.MD2Key, "md2");
- item.Write(Data.Models.Metadata.Rom.MD4Key, "md4");
- item.Write(Data.Models.Metadata.Rom.MD5Key, "md5");
- item.Write(Data.Models.Metadata.Rom.RIPEMD128Key, "ripemd128");
- item.Write(Data.Models.Metadata.Rom.RIPEMD160Key, "ripemd160");
- item.Write(Data.Models.Metadata.Rom.SHA1Key, "sha1");
- item.Write(Data.Models.Metadata.Rom.SHA256Key, "sha256");
- item.Write(Data.Models.Metadata.Rom.SHA384Key, "sha384");
- item.Write(Data.Models.Metadata.Rom.SHA512Key, "sha512");
- item.Write(Data.Models.Metadata.Rom.SpamSumKey, "spamsum");
string actual = DatFile.FormatPrefixPostfix(item, machine, fix);
Assert.Equal(expected, actual);
@@ -1489,20 +1495,20 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "name",
Size = 12345,
+ CRC16 = "crc16",
+ CRC = "crc",
+ CRC64 = "crc64",
+ MD2 = "md2",
+ MD4 = "md4",
+ MD5 = "md5",
+ RIPEMD128 = "ripemd128",
+ RIPEMD160 = "ripemd160",
+ SHA1 = "sha1",
+ SHA256 = "sha256",
+ SHA384 = "sha384",
+ SHA512 = "sha512",
+ SpamSum = "spamsum"
};
- item.Write(Data.Models.Metadata.Rom.CRC16Key, "crc16");
- item.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
- item.Write(Data.Models.Metadata.Rom.CRC64Key, "crc64");
- item.Write(Data.Models.Metadata.Rom.MD2Key, "md2");
- item.Write(Data.Models.Metadata.Rom.MD4Key, "md4");
- item.Write(Data.Models.Metadata.Rom.MD5Key, "md5");
- item.Write(Data.Models.Metadata.Rom.RIPEMD128Key, "ripemd128");
- item.Write(Data.Models.Metadata.Rom.RIPEMD160Key, "ripemd160");
- item.Write(Data.Models.Metadata.Rom.SHA1Key, "sha1");
- item.Write(Data.Models.Metadata.Rom.SHA256Key, "sha256");
- item.Write(Data.Models.Metadata.Rom.SHA384Key, "sha384");
- item.Write(Data.Models.Metadata.Rom.SHA512Key, "sha512");
- item.Write(Data.Models.Metadata.Rom.SpamSumKey, "spamsum");
string actual = DatFile.FormatPrefixPostfix(item, machine, fix);
Assert.Equal(expected, actual);
@@ -1512,30 +1518,6 @@ namespace SabreTools.Metadata.DatFiles.Test
#region ProcessNullifiedItem
- [Fact]
- public void ProcessNullifiedItem_NonRom()
- {
- DatItem item = new Sample();
-
- DatItem actual = DatFile.ProcessNullifiedItem(item);
- Sample? sample = actual as Sample;
- Assert.NotNull(sample);
- Assert.Null(sample.ReadString("size"));
- Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.CRC16Key));
- Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.CRCKey));
- Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.CRC64Key));
- Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.MD2Key));
- Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.MD4Key));
- Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.MD5Key));
- Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key));
- Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key));
- Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.SHA1Key));
- Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.SHA256Key));
- Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.SHA384Key));
- Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.SHA512Key));
- Assert.Null(sample.ReadString(Data.Models.Metadata.Rom.SpamSumKey));
- }
-
[Fact]
public void ProcessNullifiedItem_SizeNonNull()
{
@@ -1548,79 +1530,83 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? rom = actual as Rom;
Assert.NotNull(rom);
Assert.Equal(12345, rom.Size);
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.CRC16Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.CRCKey));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.CRC64Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.MD2Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.MD4Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.MD5Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.SHA384Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.SHA512Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey));
+ Assert.Null(rom.CRC16);
+ Assert.Null(rom.CRC);
+ Assert.Null(rom.CRC64);
+ Assert.Null(rom.MD2);
+ Assert.Null(rom.MD4);
+ Assert.Null(rom.MD5);
+ Assert.Null(rom.RIPEMD128);
+ Assert.Null(rom.RIPEMD160);
+ Assert.Null(rom.SHA1);
+ Assert.Null(rom.SHA256);
+ Assert.Null(rom.SHA384);
+ Assert.Null(rom.SHA512);
+ Assert.Null(rom.SpamSum);
}
[Fact]
public void ProcessNullifiedItem_CrcNonNull()
{
- DatItem item = new Rom();
- item.Write(Data.Models.Metadata.Rom.CRCKey, HashType.CRC32.ZeroString);
+ DatItem item = new Rom
+ {
+ CRC = 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.ReadString(Data.Models.Metadata.Rom.CRCKey));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.MD2Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.MD4Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.MD5Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.SHA384Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.SHA512Key));
- Assert.Null(rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey));
+ Assert.Equal(HashType.CRC32.ZeroString, rom.CRC);
+ Assert.Null(rom.MD2);
+ Assert.Null(rom.MD4);
+ Assert.Null(rom.MD5);
+ Assert.Null(rom.RIPEMD128);
+ Assert.Null(rom.RIPEMD160);
+ Assert.Null(rom.SHA1);
+ Assert.Null(rom.SHA256);
+ Assert.Null(rom.SHA384);
+ Assert.Null(rom.SHA512);
+ Assert.Null(rom.SpamSum);
}
[Fact]
public void ProcessNullifiedItem_AllNull()
{
- DatItem item = new Rom();
- item.Write(Data.Models.Metadata.Rom.CRC16Key, "null");
- item.Write(Data.Models.Metadata.Rom.CRCKey, "null");
- item.Write(Data.Models.Metadata.Rom.CRC64Key, "null");
- item.Write(Data.Models.Metadata.Rom.MD2Key, "null");
- item.Write(Data.Models.Metadata.Rom.MD4Key, "null");
- item.Write(Data.Models.Metadata.Rom.MD5Key, "null");
- item.Write(Data.Models.Metadata.Rom.RIPEMD128Key, "null");
- item.Write(Data.Models.Metadata.Rom.RIPEMD160Key, "null");
- item.Write(Data.Models.Metadata.Rom.SHA1Key, "null");
- item.Write(Data.Models.Metadata.Rom.SHA256Key, "null");
- item.Write(Data.Models.Metadata.Rom.SHA384Key, "null");
- item.Write(Data.Models.Metadata.Rom.SHA512Key, "null");
- item.Write(Data.Models.Metadata.Rom.SpamSumKey, "null");
+ DatItem item = new Rom
+ {
+ CRC16 = "null",
+ CRC = "null",
+ CRC64 = "null",
+ MD2 = "null",
+ MD4 = "null",
+ MD5 = "null",
+ RIPEMD128 = "null",
+ RIPEMD160 = "null",
+ SHA1 = "null",
+ SHA256 = "null",
+ SHA384 = "null",
+ SHA512 = "null",
+ SpamSum = "null"
+ };
DatItem actual = DatFile.ProcessNullifiedItem(item);
Rom? rom = actual as Rom;
Assert.NotNull(rom);
Assert.Equal(0, rom.Size);
- Assert.Equal(HashType.CRC16.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.CRC16Key));
- Assert.Equal(HashType.CRC32.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.CRCKey));
- Assert.Equal(HashType.CRC64.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.CRC64Key));
- Assert.Equal(HashType.MD2.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.MD2Key));
- Assert.Equal(HashType.MD4.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.MD4Key));
- Assert.Equal(HashType.MD5.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.MD5Key));
- Assert.Equal(HashType.RIPEMD128.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key));
- Assert.Equal(HashType.RIPEMD160.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key));
- Assert.Equal(HashType.SHA1.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA1Key));
- Assert.Equal(HashType.SHA256.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA256Key));
- Assert.Equal(HashType.SHA384.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA384Key));
- Assert.Equal(HashType.SHA512.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SHA512Key));
- Assert.Equal(HashType.SpamSum.ZeroString, rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey));
+ Assert.Equal(HashType.CRC16.ZeroString, rom.CRC16);
+ Assert.Equal(HashType.CRC32.ZeroString, rom.CRC);
+ Assert.Equal(HashType.CRC64.ZeroString, rom.CRC64);
+ Assert.Equal(HashType.MD2.ZeroString, rom.MD2);
+ Assert.Equal(HashType.MD4.ZeroString, rom.MD4);
+ Assert.Equal(HashType.MD5.ZeroString, rom.MD5);
+ Assert.Equal(HashType.RIPEMD128.ZeroString, rom.RIPEMD128);
+ Assert.Equal(HashType.RIPEMD160.ZeroString, rom.RIPEMD160);
+ Assert.Equal(HashType.SHA1.ZeroString, rom.SHA1);
+ Assert.Equal(HashType.SHA256.ZeroString, rom.SHA256);
+ Assert.Equal(HashType.SHA384.ZeroString, rom.SHA384);
+ Assert.Equal(HashType.SHA512.ZeroString, rom.SHA512);
+ Assert.Equal(HashType.SpamSum.ZeroString, rom.SpamSum);
}
#endregion
@@ -1797,8 +1783,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Rom_CRC16()
{
string hash = "XXXXXX";
- DatItem datItem = new Rom();
- datItem.Write(Data.Models.Metadata.Rom.CRC16Key, hash);
+ DatItem datItem = new Rom
+ {
+ CRC16 = hash
+ };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1808,8 +1796,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Rom_CRC()
{
string hash = "XXXXXX";
- DatItem datItem = new Rom();
- datItem.Write(Data.Models.Metadata.Rom.CRCKey, hash);
+ DatItem datItem = new Rom
+ {
+ CRC = hash
+ };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1819,8 +1809,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Rom_CRC64()
{
string hash = "XXXXXX";
- DatItem datItem = new Rom();
- datItem.Write(Data.Models.Metadata.Rom.CRC64Key, hash);
+ DatItem datItem = new Rom
+ {
+ CRC64 = hash
+ };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1830,8 +1822,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Rom_MD2()
{
string hash = "XXXXXX";
- DatItem datItem = new Rom();
- datItem.Write(Data.Models.Metadata.Rom.MD2Key, hash);
+ DatItem datItem = new Rom
+ {
+ MD2 = hash
+ };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1841,8 +1835,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Rom_MD4()
{
string hash = "XXXXXX";
- DatItem datItem = new Rom();
- datItem.Write(Data.Models.Metadata.Rom.MD4Key, hash);
+ DatItem datItem = new Rom
+ {
+ MD4 = hash
+ };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1852,8 +1848,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Rom_MD5()
{
string hash = "XXXXXX";
- DatItem datItem = new Rom();
- datItem.Write(Data.Models.Metadata.Rom.MD5Key, hash);
+ DatItem datItem = new Rom
+ {
+ MD5 = hash
+ };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1863,8 +1861,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Rom_RIPEMD128()
{
string hash = "XXXXXX";
- DatItem datItem = new Rom();
- datItem.Write(Data.Models.Metadata.Rom.RIPEMD128Key, hash);
+ DatItem datItem = new Rom
+ {
+ RIPEMD128 = hash
+ };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1874,8 +1874,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Rom_RIPEMD160()
{
string hash = "XXXXXX";
- DatItem datItem = new Rom();
- datItem.Write(Data.Models.Metadata.Rom.RIPEMD160Key, hash);
+ DatItem datItem = new Rom
+ {
+ RIPEMD160 = hash
+ };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1885,8 +1887,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Rom_SHA1()
{
string hash = "XXXXXX";
- DatItem datItem = new Rom();
- datItem.Write(Data.Models.Metadata.Rom.SHA1Key, hash);
+ DatItem datItem = new Rom
+ {
+ SHA1 = hash
+ };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1896,8 +1900,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Rom_SHA256()
{
string hash = "XXXXXX";
- DatItem datItem = new Rom();
- datItem.Write(Data.Models.Metadata.Rom.SHA256Key, hash);
+ DatItem datItem = new Rom
+ {
+ SHA256 = hash
+ };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1907,8 +1913,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Rom_SHA384()
{
string hash = "XXXXXX";
- DatItem datItem = new Rom();
- datItem.Write(Data.Models.Metadata.Rom.SHA384Key, hash);
+ DatItem datItem = new Rom
+ {
+ SHA384 = hash
+ };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1918,8 +1926,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Rom_SHA512()
{
string hash = "XXXXXX";
- DatItem datItem = new Rom();
- datItem.Write(Data.Models.Metadata.Rom.SHA512Key, hash);
+ DatItem datItem = new Rom
+ {
+ SHA512 = hash
+ };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1929,8 +1939,10 @@ namespace SabreTools.Metadata.DatFiles.Test
public void GetDuplicateSuffix_Rom_SpamSum()
{
string hash = "XXXXXX";
- DatItem datItem = new Rom();
- datItem.Write(Data.Models.Metadata.Rom.SpamSumKey, hash);
+ DatItem datItem = new Rom
+ {
+ SpamSum = hash
+ };
string actual = DatFile.GetDuplicateSuffix(datItem);
Assert.Equal($"_{hash}", actual);
@@ -1969,11 +1981,11 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom
{
Name = "name",
- Size = 12345
+ Size = 12345,
+ CRC = "crc",
+ Machine = (Machine)machine.Clone(),
+ Source = (Source)source.Clone()
};
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
- romA.Machine = (Machine)machine.Clone();
- romA.Source = (Source)source.Clone();
List datItems = [romA];
@@ -1985,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.ReadString(Data.Models.Metadata.Rom.CRCKey));
+ Assert.Equal("crc", actualRomA.CRC);
}
[Fact]
@@ -1998,20 +2010,20 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom
{
Name = "romA",
- Size = 12345
+ Size = 12345,
+ CRC = "crc",
+ Machine = (Machine)machine.Clone(),
+ Source = (Source)source.Clone()
};
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
- romA.Machine = (Machine)machine.Clone();
- romA.Source = (Source)source.Clone();
Rom romB = new Rom
{
Name = "romB",
- Size = 23456
+ Size = 23456,
+ CRC = "crc2",
+ Machine = (Machine)machine.Clone(),
+ Source = (Source)source.Clone()
};
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "crc2");
- romB.Machine = (Machine)machine.Clone();
- romB.Source = (Source)source.Clone();
List datItems = [romA, romB];
@@ -2024,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.ReadString(Data.Models.Metadata.Rom.CRCKey));
+ Assert.Equal("crc", actualRomA.CRC);
Rom? actualRomB = actual[1] as Rom;
Assert.NotNull(actualRomB);
Assert.Equal("romB", actualRomB.Name);
Assert.Equal(23456, actualRomB.Size);
- Assert.Equal("crc2", actualRomB.ReadString(Data.Models.Metadata.Rom.CRCKey));
+ Assert.Equal("crc2", actualRomB.CRC);
}
[Fact]
@@ -2043,20 +2055,20 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom
{
Name = "rom",
- Size = 12345
+ Size = 12345,
+ CRC = "crc",
+ Machine = (Machine)machine.Clone(),
+ Source = (Source)source.Clone()
};
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
- romA.Machine = (Machine)machine.Clone();
- romA.Source = (Source)source.Clone();
Rom romB = new Rom
{
Name = "rom",
- Size = 12345
+ Size = 12345,
+ CRC = "crc",
+ Machine = (Machine)machine.Clone(),
+ Source = (Source)source.Clone()
};
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
- romB.Machine = (Machine)machine.Clone();
- romB.Source = (Source)source.Clone();
List datItems = [romA, romB];
@@ -2068,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.ReadString(Data.Models.Metadata.Rom.CRCKey));
+ Assert.Equal("crc", actualRomA.CRC);
}
[Fact]
@@ -2081,20 +2093,20 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom
{
Name = "rom",
- Size = 12345
+ Size = 12345,
+ CRC = "crc",
+ Machine = (Machine)machine.Clone(),
+ Source = (Source)source.Clone()
};
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
- romA.Machine = (Machine)machine.Clone();
- romA.Source = (Source)source.Clone();
Rom romB = new Rom
{
Name = "rom",
- Size = 23456
+ Size = 23456,
+ CRC = "crc2",
+ Machine = (Machine)machine.Clone(),
+ Source = (Source)source.Clone()
};
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "crc2");
- romB.Machine = (Machine)machine.Clone();
- romB.Source = (Source)source.Clone();
List datItems = [romA, romB];
@@ -2107,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.ReadString(Data.Models.Metadata.Rom.CRCKey));
+ Assert.Equal("crc", actualRomA.CRC);
Rom? actualRomB = actual[1] as Rom;
Assert.NotNull(actualRomB);
Assert.Equal("rom_crc2", actualRomB.Name);
Assert.Equal(23456, actualRomB.Size);
- Assert.Equal("crc2", actualRomB.ReadString(Data.Models.Metadata.Rom.CRCKey));
+ Assert.Equal("crc2", actualRomB.CRC);
}
#endregion
@@ -2141,11 +2153,11 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom
{
Name = "name",
- Size = 12345
+ Size = 12345,
+ CRC = "crc",
+ Machine = (Machine)machine.Clone(),
+ Source = (Source)source.Clone()
};
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
- romA.Machine = (Machine)machine.Clone();
- romA.Source = (Source)source.Clone();
List> mappings =
[
@@ -2159,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.ReadString(Data.Models.Metadata.Rom.CRCKey));
+ Assert.Equal("crc", actualRomA.CRC);
}
[Fact]
@@ -2172,20 +2184,20 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom
{
Name = "romA",
- Size = 12345
+ Size = 12345,
+ CRC = "crc",
+ Machine = (Machine)machine.Clone(),
+ Source = (Source)source.Clone()
};
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
- romA.Machine = (Machine)machine.Clone();
- romA.Source = (Source)source.Clone();
Rom romB = new Rom
{
Name = "romB",
- Size = 23456
+ Size = 23456,
+ CRC = "crc2",
+ Machine = (Machine)machine.Clone(),
+ Source = (Source)source.Clone()
};
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "crc2");
- romB.Machine = (Machine)machine.Clone();
- romB.Source = (Source)source.Clone();
List> mappings =
[
@@ -2201,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.ReadString(Data.Models.Metadata.Rom.CRCKey));
+ Assert.Equal("crc", actualRomA.CRC);
Rom? actualRomB = actual[1].Value as Rom;
Assert.NotNull(actualRomB);
Assert.Equal("romB", actualRomB.Name);
Assert.Equal(23456, actualRomB.Size);
- Assert.Equal("crc2", actualRomB.ReadString(Data.Models.Metadata.Rom.CRCKey));
+ Assert.Equal("crc2", actualRomB.CRC);
}
[Fact]
@@ -2224,17 +2236,17 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom
{
Name = "rom",
- Size = 12345
+ Size = 12345,
+ CRC = "crc"
};
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
long romAIndex = datFile.AddItemDB(romA, machineIndex, sourceIndex, statsOnly: false);
Rom romB = new Rom
{
Name = "rom",
- Size = 12345
+ Size = 12345,
+ CRC = "crc"
};
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
long romBIndex = datFile.AddItemDB(romB, machineIndex, sourceIndex, statsOnly: false);
List> mappings =
@@ -2249,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.ReadString(Data.Models.Metadata.Rom.CRCKey));
+ Assert.Equal("crc", actualRomA.CRC);
}
[Fact]
@@ -2262,20 +2274,20 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom romA = new Rom
{
Name = "rom",
- Size = 12345
+ Size = 12345,
+ CRC = "crc",
+ Machine = (Machine)machine.Clone(),
+ Source = (Source)source.Clone()
};
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
- romA.Machine = (Machine)machine.Clone();
- romA.Source = (Source)source.Clone();
Rom romB = new Rom
{
Name = "rom",
- Size = 23456
+ Size = 23456,
+ CRC = "crc2",
+ Machine = (Machine)machine.Clone(),
+ Source = (Source)source.Clone()
};
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "crc2");
- romB.Machine = (Machine)machine.Clone();
- romB.Source = (Source)source.Clone();
List> mappings =
[
@@ -2291,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.ReadString(Data.Models.Metadata.Rom.CRCKey));
+ Assert.Equal("crc", actualRomA.CRC);
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.ReadString(Data.Models.Metadata.Rom.CRCKey));
+ Assert.Equal("crc2", actualRomB.CRC);
}
#endregion
@@ -2351,8 +2363,8 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "name",
Size = 12345,
+ CRC = "crc"
};
- datItem.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
DatFile datFile = new Logiqx(null, useGame: false);
bool actual = datFile.ShouldIgnore(datItem, ignoreBlanks: false);
@@ -2390,18 +2402,18 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "name",
Size = 12345,
+ CRC = "crc",
+ MD2 = "crc",
+ MD4 = "crc",
+ MD5 = "crc",
+ RIPEMD128 = "crc",
+ RIPEMD160 = "crc",
+ SHA1 = "crc",
+ SHA256 = "crc",
+ SHA384 = "crc",
+ SHA512 = "crc",
+ SpamSum = "crc"
};
- datItem.Write(Data.Models.Metadata.Rom.CRCKey, "crc");
- datItem.Write(Data.Models.Metadata.Rom.MD2Key, "crc");
- datItem.Write(Data.Models.Metadata.Rom.MD4Key, "crc");
- datItem.Write(Data.Models.Metadata.Rom.MD5Key, "crc");
- datItem.Write(Data.Models.Metadata.Rom.RIPEMD128Key, "crc");
- datItem.Write(Data.Models.Metadata.Rom.RIPEMD160Key, "crc");
- datItem.Write(Data.Models.Metadata.Rom.SHA1Key, "crc");
- datItem.Write(Data.Models.Metadata.Rom.SHA256Key, "crc");
- datItem.Write(Data.Models.Metadata.Rom.SHA384Key, "crc");
- datItem.Write(Data.Models.Metadata.Rom.SHA512Key, "crc");
- datItem.Write(Data.Models.Metadata.Rom.SpamSumKey, "crc");
DatFile datFile = new Logiqx(null, useGame: false);
bool actual = datFile.ShouldIgnore(datItem, ignoreBlanks: true);
diff --git a/SabreTools.Metadata.DatFiles.Test/DatStatisticsTests.cs b/SabreTools.Metadata.DatFiles.Test/DatStatisticsTests.cs
index a03ed1cf..b5b16cb7 100644
--- a/SabreTools.Metadata.DatFiles.Test/DatStatisticsTests.cs
+++ b/SabreTools.Metadata.DatFiles.Test/DatStatisticsTests.cs
@@ -304,19 +304,19 @@ namespace SabreTools.Metadata.DatFiles.Test
Status = ItemStatus.Good,
Size = 1
};
- rom.Write(Data.Models.Metadata.Rom.CRC16Key, HashType.CRC16.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.CRCKey, HashType.CRC32.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.CRC64Key, HashType.CRC64.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.MD2Key, HashType.MD2.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.MD4Key, HashType.MD4.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.MD5Key, HashType.MD5.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.RIPEMD128Key, HashType.RIPEMD128.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.RIPEMD160Key, HashType.RIPEMD160.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.SHA1Key, HashType.SHA1.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.SHA256Key, HashType.SHA256.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.SHA384Key, HashType.SHA384.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.SHA512Key, HashType.SHA512.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.SpamSumKey, HashType.SpamSum.ZeroString);
+ rom.CRC16 = HashType.CRC16.ZeroString;
+ rom.CRC = HashType.CRC32.ZeroString;
+ rom.CRC64 = HashType.CRC64.ZeroString;
+ rom.MD2 = HashType.MD2.ZeroString;
+ rom.MD4 = HashType.MD4.ZeroString;
+ rom.MD5 = HashType.MD5.ZeroString;
+ rom.RIPEMD128 = HashType.RIPEMD128.ZeroString;
+ rom.RIPEMD160 = HashType.RIPEMD160.ZeroString;
+ rom.SHA1 = HashType.SHA1.ZeroString;
+ rom.SHA256 = HashType.SHA256.ZeroString;
+ rom.SHA384 = HashType.SHA384.ZeroString;
+ rom.SHA512 = HashType.SHA512.ZeroString;
+ rom.SpamSum = HashType.SpamSum.ZeroString;
return rom;
}
diff --git a/SabreTools.Metadata.DatFiles.Test/FormatsTests.cs b/SabreTools.Metadata.DatFiles.Test/FormatsTests.cs
index f2f9174c..775abe28 100644
--- a/SabreTools.Metadata.DatFiles.Test/FormatsTests.cs
+++ b/SabreTools.Metadata.DatFiles.Test/FormatsTests.cs
@@ -128,7 +128,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
nameof(Data.Models.Metadata.Rom.Size),
- Data.Models.Metadata.Rom.SHA1Key,
+ nameof(Data.Models.Metadata.Rom.SHA1),
]));
}
@@ -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),
- Data.Models.Metadata.Rom.CRCKey,
+ nameof(Data.Models.Metadata.Rom.CRC),
]));
}
@@ -318,10 +318,10 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
- Data.Models.Metadata.Rom.SHA256Key,
- Data.Models.Metadata.Rom.SHA1Key,
- Data.Models.Metadata.Rom.MD5Key,
- Data.Models.Metadata.Rom.CRCKey,
+ nameof(Data.Models.Metadata.Rom.SHA256),
+ nameof(Data.Models.Metadata.Rom.SHA1),
+ nameof(Data.Models.Metadata.Rom.MD5),
+ nameof(Data.Models.Metadata.Rom.CRC),
]));
}
@@ -350,7 +350,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
- Data.Models.Metadata.Rom.CRCKey,
+ nameof(Data.Models.Metadata.Rom.CRC),
]));
}
@@ -375,7 +375,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
- Data.Models.Metadata.Rom.MD2Key,
+ nameof(Data.Models.Metadata.Rom.MD2),
]));
}
@@ -400,7 +400,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
- Data.Models.Metadata.Rom.MD4Key,
+ nameof(Data.Models.Metadata.Rom.MD4),
]));
}
@@ -457,7 +457,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
- Data.Models.Metadata.Rom.MD5Key,
+ nameof(Data.Models.Metadata.Rom.MD5),
]));
}
@@ -482,7 +482,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
- Data.Models.Metadata.Rom.RIPEMD128Key,
+ nameof(Data.Models.Metadata.Rom.RIPEMD128),
]));
}
@@ -507,7 +507,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
- Data.Models.Metadata.Rom.RIPEMD160Key,
+ nameof(Data.Models.Metadata.Rom.RIPEMD160),
]));
}
@@ -564,7 +564,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
- Data.Models.Metadata.Rom.SHA1Key,
+ nameof(Data.Models.Metadata.Rom.SHA1),
]));
}
@@ -605,7 +605,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
- Data.Models.Metadata.Rom.SHA256Key,
+ nameof(Data.Models.Metadata.Rom.SHA256),
]));
}
@@ -630,7 +630,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
- Data.Models.Metadata.Rom.SHA384Key,
+ nameof(Data.Models.Metadata.Rom.SHA384),
]));
}
@@ -655,7 +655,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
- Data.Models.Metadata.Rom.SHA512Key,
+ nameof(Data.Models.Metadata.Rom.SHA512),
]));
}
@@ -696,7 +696,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
- Data.Models.Metadata.Rom.SpamSumKey,
+ nameof(Data.Models.Metadata.Rom.SpamSum),
]));
}
@@ -742,8 +742,8 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
nameof(Data.Models.Metadata.Rom.Size),
- Data.Models.Metadata.Rom.CRCKey,
- Data.Models.Metadata.Rom.SHA1Key,
+ nameof(Data.Models.Metadata.Rom.CRC),
+ nameof(Data.Models.Metadata.Rom.SHA1),
]));
}
@@ -807,7 +807,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
nameof(Data.Models.Metadata.Rom.Size),
- Data.Models.Metadata.Rom.SHA1Key,
+ nameof(Data.Models.Metadata.Rom.SHA1),
]));
}
@@ -1124,7 +1124,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
nameof(Data.Models.Metadata.Rom.Size),
- Data.Models.Metadata.Rom.SHA1Key,
+ 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),
- Data.Models.Metadata.Rom.CRCKey,
+ nameof(Data.Models.Metadata.Rom.CRC),
]));
}
@@ -1306,7 +1306,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
- Data.Models.Metadata.Rom.SHA1Key,
+ nameof(Data.Models.Metadata.Rom.SHA1),
]));
}
@@ -1335,7 +1335,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.NotNull(actual);
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
- Data.Models.Metadata.Rom.CRCKey,
+ nameof(Data.Models.Metadata.Rom.CRC),
nameof(Data.Models.Metadata.Rom.Size),
]));
}
@@ -1422,7 +1422,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
nameof(Data.Models.Metadata.Rom.Size),
- Data.Models.Metadata.Rom.SHA1Key,
+ nameof(Data.Models.Metadata.Rom.SHA1),
]));
}
@@ -1480,7 +1480,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
nameof(Data.Models.Metadata.Rom.Size),
- Data.Models.Metadata.Rom.SHA1Key,
+ nameof(Data.Models.Metadata.Rom.SHA1),
]));
}
@@ -1538,7 +1538,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.True(actual.SequenceEqual([
nameof(Data.Models.Metadata.Rom.Name),
nameof(Data.Models.Metadata.Rom.Size),
- Data.Models.Metadata.Rom.SHA1Key,
+ nameof(Data.Models.Metadata.Rom.SHA1),
]));
}
diff --git a/SabreTools.Metadata.DatFiles.Test/ItemDictionaryDBTests.cs b/SabreTools.Metadata.DatFiles.Test/ItemDictionaryDBTests.cs
index bcef1da0..86f5968f 100644
--- a/SabreTools.Metadata.DatFiles.Test/ItemDictionaryDBTests.cs
+++ b/SabreTools.Metadata.DatFiles.Test/ItemDictionaryDBTests.cs
@@ -137,12 +137,12 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
- DatItem rom = new Rom()
+ DatItem rom = new Rom
{
Name = "item",
Size = 12345,
+ SHA1 = "deadbeef"
};
- rom.Write(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -153,7 +153,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Equal(12345, actualRom.Size);
- Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
+ Assert.Equal("deadbeef", actualRom.SHA1);
Assert.Equal(Data.Models.Metadata.ItemStatus.None, actualRom.Status);
}
@@ -178,7 +178,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Equal(12345, actualRom.Size);
- Assert.Null(actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
+ Assert.Null(actualRom.SHA1);
Assert.Equal(Data.Models.Metadata.ItemStatus.Nodump, actualRom.Status);
}
@@ -188,8 +188,11 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
- DatItem rom = new Rom { Name = "item" };
- rom.Write(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
+ DatItem rom = new Rom
+ {
+ Name = "item",
+ SHA1 = "deadbeef"
+ };
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -200,7 +203,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Null(actualRom.Size);
- Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
+ Assert.Equal("deadbeef", actualRom.SHA1);
Assert.Equal(Data.Models.Metadata.ItemStatus.None, actualRom.Status);
}
@@ -221,7 +224,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Equal(0, actualRom.Size);
- Assert.Equal(HashType.SHA1.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
+ Assert.Equal(HashType.SHA1.ZeroString, actualRom.SHA1);
Assert.Equal(Data.Models.Metadata.ItemStatus.None, actualRom.Status);
}
@@ -299,22 +302,22 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine { Name = "game-1" };
- DatItem rom1 = new Rom()
+ DatItem rom1 = new Rom
{
Name = "rom-1",
Size = 1024,
+ CRC = "DEADBEEF",
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom1.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- rom1.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
- DatItem rom2 = new Rom()
+ DatItem rom2 = new Rom
{
Name = "rom-2",
Size = 1024,
+ CRC = "DEADBEEF",
+ RemoveFlag = true,
+ SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
- rom2.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- rom2.RemoveFlag = true;
- rom2.Write(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
// Setup the dictionary
var dict = new ItemDictionaryDB();
@@ -543,13 +546,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine { Name = "game-1" };
- DatItem datItem = new Rom()
+ DatItem datItem = new Rom
{
Name = "rom-1",
Size = 1024,
+ CRC = "DEADBEEF",
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- datItem.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -572,13 +575,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine { Name = "game-1" };
- DatItem datItem = new Rom()
+ DatItem datItem = new Rom
{
Name = "rom-1",
Size = 1024,
+ CRC = "DEADBEEF",
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- datItem.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -628,33 +631,33 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
+ CRC = "DEADBEEF",
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom1.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- rom1.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
DatItem rom2 = new Rom
{
Name = "rom-2",
Size = 1024,
+ CRC = "DEADBEEF",
+ SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
- rom2.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- rom2.Write(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
DatItem rom3 = new Rom
{
Name = "rom-3",
Size = 1024,
+ CRC = "DEADBEEF",
+ SHA1 = "00000ea4014ce66679e7e17d56ac510f67e39e26"
};
- rom3.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- rom3.Write(Data.Models.Metadata.Rom.SHA1Key, "00000ea4014ce66679e7e17d56ac510f67e39e26");
DatItem rom4 = new Rom
{
Name = "rom-4",
Size = 1024,
+ CRC = "DEADBEEF",
+ SHA1 = "00000151d437442e74e5134023fab8bf694a2487"
};
- rom4.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- rom4.Write(Data.Models.Metadata.Rom.SHA1Key, "00000151d437442e74e5134023fab8bf694a2487");
// Setup the dictionary
var dict = new ItemDictionaryDB();
@@ -686,15 +689,15 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom1.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
DatItem rom2 = new Rom
{
Name = "rom-2",
Size = 1024,
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom2.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
// Setup the dictionary
var dict = new ItemDictionaryDB();
@@ -756,13 +759,19 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine? machineB = new Machine { Name = "name-same" };
long machineBIndex = dict.AddMachine(machineB);
- var romA = new Rom { Name = "same-name" };
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "BEEFDEAD");
+ var romA = new Rom
+ {
+ Name = "same-name",
+ CRC = "BEEFDEAD"
+ };
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair? romAPair = new KeyValuePair(romAIndex, romA);
- var romB = new Rom { Name = "same-name" };
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
+ var romB = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF"
+ };
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair? romBPair = new KeyValuePair(romBIndex, romB);
@@ -786,13 +795,19 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine? machineB = new Machine { Name = "name-same" };
long machineBIndex = dict.AddMachine(machineB);
- var romA = new Rom { Name = "same-name" };
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
+ var romA = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF"
+ };
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair? romAPair = new KeyValuePair(romAIndex, romA);
- var romB = new Rom { Name = "same-name" };
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
+ var romB = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF"
+ };
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair? romBPair = new KeyValuePair(romBIndex, romB);
@@ -816,13 +831,19 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine? machineB = new Machine { Name = "not-name-same" };
long machineBIndex = dict.AddMachine(machineB);
- var romA = new Rom { Name = "same-name" };
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
+ var romA = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF"
+ };
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair? romAPair = new KeyValuePair(romAIndex, romA);
- var romB = new Rom { Name = "same-name" };
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
+ var romB = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF"
+ };
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair? romBPair = new KeyValuePair(romBIndex, romB);
@@ -846,13 +867,19 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine? machineB = new Machine { Name = "name-same" };
long machineBIndex = dict.AddMachine(machineB);
- var romA = new Rom { Name = "same-name" };
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
+ var romA = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF"
+ };
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair? romAPair = new KeyValuePair(romAIndex, romA);
- var romB = new Rom { Name = "same-name" };
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
+ var romB = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF"
+ };
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair? romBPair = new KeyValuePair(romBIndex, romB);
@@ -876,13 +903,19 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine? machineB = new Machine { Name = "not-name-same" };
long machineBIndex = dict.AddMachine(machineB);
- var romA = new Rom { Name = "same-name" };
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
+ var romA = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF"
+ };
long romAIndex = dict.AddItem(romA, machineAIndex, sourceAIndex);
KeyValuePair? romAPair = new KeyValuePair(romAIndex, romA);
- var romB = new Rom { Name = "same-name" };
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
+ var romB = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF"
+ };
long romBIndex = dict.AddItem(romB, machineBIndex, sourceBIndex);
KeyValuePair? romBPair = new KeyValuePair(romBIndex, romB);
@@ -908,15 +941,15 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom1.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
DatItem rom2 = new Rom
{
Name = "rom-2",
Size = 1024,
+ SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
- rom2.Write(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
// Setup the dictionary
var dict = new ItemDictionaryDB();
@@ -930,8 +963,8 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = hasDuplicate ? 1024 : 2048,
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
var actual = dict.GetDuplicates(new KeyValuePair(-1, rom));
Assert.Equal(expected, actual.Count);
@@ -955,15 +988,15 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom1.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
DatItem rom2 = new Rom
{
Name = "rom-2",
Size = 1024,
+ SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
- rom2.Write(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
// Setup the dictionary
var dict = new ItemDictionaryDB();
@@ -977,8 +1010,8 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = expected ? 1024 : 2048,
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
bool actual = dict.HasDuplicates(new KeyValuePair(-1, rom));
Assert.Equal(expected, actual);
@@ -995,12 +1028,12 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine { Name = "machine" };
- DatItem item = new Rom
+ var item = new Rom
{
Name = "rom",
Size = 12345,
+ CRC = "deadbeef"
};
- item.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
var dict = new ItemDictionaryDB();
long sourceIndex = dict.AddSource(source);
@@ -1013,7 +1046,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.Equal(1, dict.DatStatistics.GetHashCount(HashType.CRC32));
Assert.Equal(0, dict.DatStatistics.GetHashCount(HashType.MD5));
- item.Write(Data.Models.Metadata.Rom.MD5Key, "deadbeef");
+ item.MD5 = "deadbeef";
dict.RecalculateStats();
diff --git a/SabreTools.Metadata.DatFiles.Test/ItemDictionaryTests.cs b/SabreTools.Metadata.DatFiles.Test/ItemDictionaryTests.cs
index 90b8fa45..a7608bb2 100644
--- a/SabreTools.Metadata.DatFiles.Test/ItemDictionaryTests.cs
+++ b/SabreTools.Metadata.DatFiles.Test/ItemDictionaryTests.cs
@@ -145,14 +145,14 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
- DatItem rom = new Rom()
+ DatItem rom = new Rom
{
Name = "item",
Size = 12345,
+ SHA1 = "deadbeef",
+ Source = source,
+ Machine = machine
};
- rom.Write(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
- rom.Source = source;
- rom.Machine = machine;
var dict = new ItemDictionary();
_ = dict.AddItem(rom, statsOnly: false);
@@ -161,7 +161,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Equal(12345, actualRom.Size);
- Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
+ Assert.Equal("deadbeef", actualRom.SHA1);
Assert.Equal(Data.Models.Metadata.ItemStatus.None, actualRom.Status);
}
@@ -186,7 +186,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Equal(12345, actualRom.Size);
- Assert.Null(actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
+ Assert.Null(actualRom.SHA1);
Assert.Equal(Data.Models.Metadata.ItemStatus.Nodump, actualRom.Status);
}
@@ -196,10 +196,13 @@ namespace SabreTools.Metadata.DatFiles.Test
Source source = new Source(0, source: null);
Machine machine = new Machine();
- DatItem rom = new Rom { Name = "item" };
- rom.Write(Data.Models.Metadata.Rom.SHA1Key, "deadbeef");
- rom.Source = source;
- rom.Machine = machine;
+ DatItem rom = new Rom
+ {
+ Name = "item",
+ SHA1 = "deadbeef",
+ Source = source,
+ Machine = machine
+ };
var dict = new ItemDictionary();
_ = dict.AddItem(rom, statsOnly: false);
@@ -208,7 +211,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Null(actualRom.Size);
- Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
+ Assert.Equal("deadbeef", actualRom.SHA1);
Assert.Equal(Data.Models.Metadata.ItemStatus.None, actualRom.Status);
}
@@ -232,7 +235,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Rom? actualRom = actual as Rom;
Assert.NotNull(actualRom);
Assert.Equal(0, actualRom.Size);
- Assert.Equal(HashType.SHA1.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
+ Assert.Equal(HashType.SHA1.ZeroString, actualRom.SHA1);
Assert.Equal(Data.Models.Metadata.ItemStatus.None, actualRom.Status);
}
@@ -288,19 +291,19 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
+ CRC = "DEAEEF",
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom1.Write(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
- rom1.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.CopyMachineInformation(machine);
DatItem rom2 = new Rom
{
Name = "rom-2",
Size = 1024,
+ CRC = "DEAEEF",
+ RemoveFlag = true,
+ SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
- rom2.Write(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
- rom2.RemoveFlag = true;
- rom2.Write(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.CopyMachineInformation(machine);
// Setup the dictionary
@@ -437,10 +440,10 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem datItem = new Rom
{
Size = 1024,
- Name = "rom-1"
+ Name = "rom-1",
+ CRC = "DEAEEF",
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- datItem.Write(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
- datItem.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
datItem.CopyMachineInformation(machine);
var dict = new ItemDictionary();
@@ -464,10 +467,10 @@ namespace SabreTools.Metadata.DatFiles.Test
DatItem datItem = new Rom
{
Size = 1024,
- Name = "rom-1"
+ Name = "rom-1",
+ CRC = "DEAEEF",
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- datItem.Write(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
- datItem.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
datItem.CopyMachineInformation(machine);
var dict = new ItemDictionary();
@@ -499,36 +502,36 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
+ CRC = "DEAEEF",
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom1.Write(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
- rom1.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.CopyMachineInformation(machine1);
DatItem rom2 = new Rom
{
Name = "rom-2",
Size = 1024,
+ CRC = "DEAEEF",
+ SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
- rom2.Write(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
- rom2.Write(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom1.CopyMachineInformation(machine1);
DatItem rom3 = new Rom
{
Name = "rom-3",
Size = 1024,
+ CRC = "DEAEEF",
+ SHA1 = "00000ea4014ce66679e7e17d56ac510f67e39e26"
};
- rom3.Write(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
- rom3.Write(Data.Models.Metadata.Rom.SHA1Key, "00000ea4014ce66679e7e17d56ac510f67e39e26");
rom1.CopyMachineInformation(machine2);
DatItem rom4 = new Rom
{
Name = "rom-4",
Size = 1024,
+ CRC = "DEAEEF",
+ SHA1 = "00000151d437442e74e5134023fab8bf694a2487"
};
- rom4.Write(Data.Models.Metadata.Rom.CRCKey, "DEAEEF");
- rom4.Write(Data.Models.Metadata.Rom.SHA1Key, "00000151d437442e74e5134023fab8bf694a2487");
rom1.CopyMachineInformation(machine2);
// Setup the dictionary
@@ -556,16 +559,16 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom1.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.CopyMachineInformation(machine);
DatItem rom2 = new Rom
{
Name = "rom-2",
Size = 1024,
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom2.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom2.CopyMachineInformation(machine);
// Setup the dictionary
@@ -610,14 +613,20 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine? machineB = new Machine { Name = "name-same" };
- var romA = new Rom { Name = "same-name" };
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "BEEFDEAD");
- romA.Source = new Source(0);
+ var romA = new Rom
+ {
+ Name = "same-name",
+ CRC = "BEEFDEAD",
+ Source = new Source(0)
+ };
romA.CopyMachineInformation(machineA);
- var romB = new Rom { Name = "same-name" };
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- romB.Source = new Source(1);
+ var romB = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF",
+ Source = new Source(1)
+ };
romB.CopyMachineInformation(machineB);
var actual = dict.GetDuplicateStatus(romA, romB);
@@ -633,14 +642,20 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine? machineB = new Machine { Name = "name-same" };
- var romA = new Rom { Name = "same-name" };
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- romA.Source = new Source(0);
+ var romA = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF",
+ Source = new Source(0)
+ };
romA.CopyMachineInformation(machineA);
- var romB = new Rom { Name = "same-name" };
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- romB.Source = new Source(1);
+ var romB = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF",
+ Source = new Source(1)
+ };
romB.CopyMachineInformation(machineB);
var actual = dict.GetDuplicateStatus(romA, romB);
@@ -656,14 +671,20 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine? machineB = new Machine { Name = "not-name-same" };
- var romA = new Rom { Name = "same-name" };
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- romA.Source = new Source(0);
+ var romA = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF",
+ Source = new Source(0)
+ };
romA.CopyMachineInformation(machineA);
- var romB = new Rom { Name = "same-name" };
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- romB.Source = new Source(1);
+ var romB = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF",
+ Source = new Source(1)
+ };
romB.CopyMachineInformation(machineB);
var actual = dict.GetDuplicateStatus(romA, romB);
@@ -679,14 +700,20 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine? machineB = new Machine { Name = "name-same" };
- var romA = new Rom { Name = "same-name" };
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- romA.Source = new Source(0);
+ var romA = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF",
+ Source = new Source(0)
+ };
romA.CopyMachineInformation(machineA);
- var romB = new Rom { Name = "same-name" };
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- romB.Source = new Source(0);
+ var romB = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF",
+ Source = new Source(0)
+ };
romB.CopyMachineInformation(machineB);
var actual = dict.GetDuplicateStatus(romA, romB);
@@ -702,14 +729,20 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine? machineB = new Machine { Name = "not-name-same" };
- var romA = new Rom { Name = "same-name" };
- romA.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- romA.Source = new Source(0);
+ var romA = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF",
+ Source = new Source(0)
+ };
romA.CopyMachineInformation(machineA);
- var romB = new Rom { Name = "same-name" };
- romB.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- romB.Source = new Source(0);
+ var romB = new Rom
+ {
+ Name = "same-name",
+ CRC = "DEADBEEF",
+ Source = new Source(0)
+ };
romB.CopyMachineInformation(machineB);
var actual = dict.GetDuplicateStatus(romA, romB);
@@ -732,16 +765,16 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom1.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.CopyMachineInformation(machine);
DatItem rom2 = new Rom
{
Name = "rom-2",
Size = 1024,
+ SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
- rom2.Write(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom2.CopyMachineInformation(machine);
// Setup the dictionary
@@ -754,8 +787,8 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = hasDuplicate ? 1024 : 2048,
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom.CopyMachineInformation(machine);
var actual = dict.GetDuplicates(rom);
@@ -778,16 +811,16 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = 1024,
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom1.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.CopyMachineInformation(machine);
DatItem rom2 = new Rom
{
Name = "rom-2",
Size = 1024,
+ SHA1 = "000000e948edcb4f7704b8af85a77a3339ecce44"
};
- rom2.Write(Data.Models.Metadata.Rom.SHA1Key, "000000e948edcb4f7704b8af85a77a3339ecce44");
rom1.CopyMachineInformation(machine);
// Setup the dictionary
@@ -800,8 +833,8 @@ namespace SabreTools.Metadata.DatFiles.Test
{
Name = "rom-1",
Size = expected ? 1024 : 2048,
+ SHA1 = "0000000fbbb37f8488100b1b4697012de631a5e6"
};
- rom.Write(Data.Models.Metadata.Rom.SHA1Key, "0000000fbbb37f8488100b1b4697012de631a5e6");
rom1.CopyMachineInformation(machine);
bool actual = dict.HasDuplicates(rom);
@@ -819,14 +852,14 @@ namespace SabreTools.Metadata.DatFiles.Test
Machine machine = new Machine { Name = "machine" };
- DatItem item = new Rom
+ var item = new Rom
{
Name = "rom",
Size = 12345,
+ CRC = "deadbeef",
+ Source = source,
+ Machine = machine
};
- item.Write(Data.Models.Metadata.Rom.CRCKey, "deadbeef");
- item.Source = source;
- item.Machine = machine;
var dict = new ItemDictionary();
_ = dict.AddItem(item, statsOnly: false);
@@ -837,7 +870,7 @@ namespace SabreTools.Metadata.DatFiles.Test
Assert.Equal(1, dict.DatStatistics.GetHashCount(HashType.CRC32));
Assert.Equal(0, dict.DatStatistics.GetHashCount(HashType.MD5));
- item.Write(Data.Models.Metadata.Rom.MD5Key, "deadbeef");
+ item.MD5 = "deadbeef";
dict.RecalculateStats();
diff --git a/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs b/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs
index 2b27899d..1727a456 100644
--- a/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs
+++ b/SabreTools.Metadata.DatFiles/DatFile.FromMetadata.cs
@@ -370,6 +370,17 @@ namespace SabreTools.Metadata.DatFiles
for (int i = 0; i < items.Length; i++)
{
var datItem = new Rom(items[i], machine, source, i);
+
+ var original = items[i].Original;
+ if (original is not null)
+ {
+ datItem.Original = new Original
+ {
+ Value = original.Value,
+ Content = original.Content,
+ };
+ }
+
if (datItem.Name is not null)
{
AddItem(datItem, statsOnly);
diff --git a/SabreTools.Metadata.DatFiles/DatFile.Splitting.cs b/SabreTools.Metadata.DatFiles/DatFile.Splitting.cs
index 2f179261..45637c1e 100644
--- a/SabreTools.Metadata.DatFiles/DatFile.Splitting.cs
+++ b/SabreTools.Metadata.DatFiles/DatFile.Splitting.cs
@@ -332,7 +332,7 @@ namespace SabreTools.Metadata.DatFiles
// Special rom handling
else if (item is Rom rom)
{
- string? mergeTag = rom.ReadString(Data.Models.Metadata.Rom.MergeKey);
+ string? mergeTag = rom.Merge;
// If the merge tag exists and the parent already contains it, skip
if (mergeTag is not null && GetItemsForBucket(cloneOf)
@@ -468,7 +468,7 @@ namespace SabreTools.Metadata.DatFiles
// Special rom handling
else if (item.Value is Rom rom)
{
- string? mergeTag = rom.ReadString(Data.Models.Metadata.Rom.MergeKey);
+ string? mergeTag = rom.Merge;
// If the merge tag exists and the parent already contains it, skip
if (mergeTag is not null && GetItemsForBucketDB(cloneOf).Values
@@ -1357,7 +1357,10 @@ namespace SabreTools.Metadata.DatFiles
foreach (DatItem item in items)
{
// Remove the merge tag
- item.Remove(Data.Models.Metadata.Rom.MergeKey);
+ if (item is Disk disk)
+ disk.Merge = null;
+ else if (item is Rom rom)
+ rom.Merge = null;
// Get the machine
var machine = item.Machine;
diff --git a/SabreTools.Metadata.DatFiles/DatFile.ToMetadata.cs b/SabreTools.Metadata.DatFiles/DatFile.ToMetadata.cs
index 620517c6..4f1be21e 100644
--- a/SabreTools.Metadata.DatFiles/DatFile.ToMetadata.cs
+++ b/SabreTools.Metadata.DatFiles/DatFile.ToMetadata.cs
@@ -208,7 +208,7 @@ namespace SabreTools.Metadata.DatFiles
machine.Release = [.. machine.Release, releaseItem];
break;
case DatItems.Formats.Rom rom:
- var romItem = ProcessItem(rom, machine);
+ var romItem = ProcessItem(rom, machine, rom.Original);
machine.Rom ??= [];
machine.Rom = [.. machine.Rom, romItem];
@@ -584,7 +584,7 @@ namespace SabreTools.Metadata.DatFiles
machine.Release = [.. machine.Release, releaseItem];
break;
case DatItems.Formats.Rom rom:
- var romItem = ProcessItem(rom, machine);
+ var romItem = ProcessItem(rom, machine, rom.Original);
machine.Rom ??= [];
machine.Rom = [.. machine.Rom, romItem];
@@ -853,11 +853,12 @@ namespace SabreTools.Metadata.DatFiles
///
/// Item to convert
/// Machine to use for Part and DataArea
+ /// Original for OpenMSX
///
/// This method is required because both a Rom and a Dump
/// item might be created and added for a given Rom input.
///
- private static Data.Models.Metadata.Rom ProcessItem(DatItems.Formats.Rom item, Data.Models.Metadata.Machine machine)
+ private static Data.Models.Metadata.Rom ProcessItem(DatItems.Formats.Rom item, Data.Models.Metadata.Machine machine, DatItems.Formats.Original? original)
{
var romItem = item.GetInternalClone();
@@ -869,21 +870,20 @@ namespace SabreTools.Metadata.DatFiles
var rom = new Data.Models.Metadata.Rom();
rom.Name = romItem.Name;
- rom[Data.Models.Metadata.Rom.OffsetKey] = romItem.ReadString(Data.Models.Metadata.Rom.StartKey) ?? romItem.ReadString(Data.Models.Metadata.Rom.OffsetKey);
- rom[Data.Models.Metadata.Rom.OpenMSXType] = romItem.ReadString(Data.Models.Metadata.Rom.OpenMSXType);
- rom[Data.Models.Metadata.Rom.RemarkKey] = romItem.ReadString(Data.Models.Metadata.Rom.RemarkKey);
- rom[Data.Models.Metadata.Rom.SHA1Key] = romItem.ReadString(Data.Models.Metadata.Rom.SHA1Key);
- rom[Data.Models.Metadata.Rom.StartKey] = romItem.ReadString(Data.Models.Metadata.Rom.StartKey) ?? romItem.ReadString(Data.Models.Metadata.Rom.OffsetKey);
+ rom.Offset = romItem.Start ?? romItem.Offset;
+ rom.OpenMSXType = romItem.OpenMSXType;
+ rom.Remark = romItem.Remark;
+ rom.SHA1 = romItem.SHA1;
+ rom.Start = romItem.Start ?? romItem.Offset;
dumpRom.Rom = rom;
- var romOriginal = romItem.Read("ORIGINAL");
- if (romOriginal is not null)
+ if (original is not null)
{
var newOriginal = new Data.Models.Metadata.Original
{
- Value = romOriginal.Value,
- Content = romOriginal.Content,
+ Value = original.Value,
+ Content = original.Content,
};
dumpRom.Original = newOriginal;
}
@@ -897,21 +897,20 @@ namespace SabreTools.Metadata.DatFiles
var megaRom = new Data.Models.Metadata.Rom();
megaRom.Name = romItem.Name;
- megaRom[Data.Models.Metadata.Rom.OffsetKey] = romItem.ReadString(Data.Models.Metadata.Rom.StartKey) ?? romItem.ReadString(Data.Models.Metadata.Rom.OffsetKey);
- megaRom[Data.Models.Metadata.Rom.OpenMSXType] = romItem.ReadString(Data.Models.Metadata.Rom.OpenMSXType);
- megaRom[Data.Models.Metadata.Rom.RemarkKey] = romItem.ReadString(Data.Models.Metadata.Rom.RemarkKey);
- megaRom[Data.Models.Metadata.Rom.SHA1Key] = romItem.ReadString(Data.Models.Metadata.Rom.SHA1Key);
- megaRom[Data.Models.Metadata.Rom.StartKey] = romItem.ReadString(Data.Models.Metadata.Rom.StartKey) ?? romItem.ReadString(Data.Models.Metadata.Rom.OffsetKey);
+ megaRom.Offset = romItem.Start ?? romItem.Offset;
+ megaRom.OpenMSXType = romItem.OpenMSXType;
+ megaRom.Remark = romItem.Remark;
+ megaRom.SHA1 = romItem.SHA1;
+ megaRom.Start = romItem.Start ?? romItem.Offset;
dumpMegaRom.MegaRom = megaRom;
- var megaRomOriginal = romItem.Read("ORIGINAL");
- if (megaRomOriginal is not null)
+ if (original is not null)
{
var newOriginal = new Data.Models.Metadata.Original
{
- Value = megaRomOriginal.Value,
- Content = megaRomOriginal.Content,
+ Value = original.Value,
+ Content = original.Content,
};
dumpMegaRom.Original = newOriginal;
}
@@ -925,21 +924,20 @@ namespace SabreTools.Metadata.DatFiles
var sccPlusCart = new Data.Models.Metadata.Rom();
sccPlusCart.Name = romItem.Name;
- sccPlusCart[Data.Models.Metadata.Rom.OffsetKey] = romItem.ReadString(Data.Models.Metadata.Rom.StartKey) ?? romItem.ReadString(Data.Models.Metadata.Rom.OffsetKey);
- sccPlusCart[Data.Models.Metadata.Rom.OpenMSXType] = romItem.ReadString(Data.Models.Metadata.Rom.OpenMSXType);
- sccPlusCart[Data.Models.Metadata.Rom.RemarkKey] = romItem.ReadString(Data.Models.Metadata.Rom.RemarkKey);
- sccPlusCart[Data.Models.Metadata.Rom.SHA1Key] = romItem.ReadString(Data.Models.Metadata.Rom.SHA1Key);
- sccPlusCart[Data.Models.Metadata.Rom.StartKey] = romItem.ReadString(Data.Models.Metadata.Rom.StartKey) ?? romItem.ReadString(Data.Models.Metadata.Rom.OffsetKey);
+ sccPlusCart.Offset = romItem.Start ?? romItem.Offset;
+ sccPlusCart.OpenMSXType = romItem.OpenMSXType;
+ sccPlusCart.Remark = romItem.Remark;
+ sccPlusCart.SHA1 = romItem.SHA1;
+ sccPlusCart.Start = romItem.Start ?? romItem.Offset;
dumpSccPlusCart.SCCPlusCart = sccPlusCart;
- var sccPlusCartOriginal = romItem.Read("ORIGINAL");
- if (sccPlusCartOriginal is not null)
+ if (original is not null)
{
var newOriginal = new Data.Models.Metadata.Original
{
- Value = sccPlusCartOriginal.Value,
- Content = sccPlusCartOriginal.Content,
+ Value = original.Value,
+ Content = original.Content,
};
dumpSccPlusCart.Original = newOriginal;
}
diff --git a/SabreTools.Metadata.DatFiles/DatFile.cs b/SabreTools.Metadata.DatFiles/DatFile.cs
index ea5b2449..ec283bcf 100644
--- a/SabreTools.Metadata.DatFiles/DatFile.cs
+++ b/SabreTools.Metadata.DatFiles/DatFile.cs
@@ -523,7 +523,7 @@ namespace SabreTools.Metadata.DatFiles
else if (item is Rom rom)
{
// We can only write out if there's a SHA-1
- string? sha1 = rom.ReadString(Data.Models.Metadata.Rom.SHA1Key);
+ string? sha1 = rom.SHA1;
if (!string.IsNullOrEmpty(sha1))
{
name = Utilities.GetDepotPath(sha1, Modifiers.OutputDepot.Depth)?.Replace('\\', '/');
@@ -617,20 +617,20 @@ namespace SabreTools.Metadata.DatFiles
}
else if (item is Rom rom)
{
- crc16 = rom.ReadString(Data.Models.Metadata.Rom.CRC16Key) ?? string.Empty;
- crc = rom.ReadString(Data.Models.Metadata.Rom.CRCKey) ?? string.Empty;
- crc64 = rom.ReadString(Data.Models.Metadata.Rom.CRC64Key) ?? string.Empty;
- md2 = rom.ReadString(Data.Models.Metadata.Rom.MD2Key) ?? string.Empty;
- md4 = rom.ReadString(Data.Models.Metadata.Rom.MD4Key) ?? string.Empty;
- md5 = rom.ReadString(Data.Models.Metadata.Rom.MD5Key) ?? string.Empty;
- ripemd128 = rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key) ?? string.Empty;
- ripemd160 = rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key) ?? string.Empty;
- sha1 = rom.ReadString(Data.Models.Metadata.Rom.SHA1Key) ?? string.Empty;
- sha256 = rom.ReadString(Data.Models.Metadata.Rom.SHA256Key) ?? string.Empty;
- sha384 = rom.ReadString(Data.Models.Metadata.Rom.SHA384Key) ?? string.Empty;
- sha512 = rom.ReadString(Data.Models.Metadata.Rom.SHA512Key) ?? string.Empty;
+ crc16 = rom.CRC16 ?? string.Empty;
+ crc = rom.CRC ?? string.Empty;
+ crc64 = rom.CRC64 ?? string.Empty;
+ md2 = rom.MD2 ?? string.Empty;
+ md4 = rom.MD4 ?? string.Empty;
+ md5 = rom.MD5 ?? string.Empty;
+ ripemd128 = rom.RIPEMD128 ?? string.Empty;
+ ripemd160 = rom.RIPEMD160 ?? string.Empty;
+ sha1 = rom.SHA1 ?? string.Empty;
+ sha256 = rom.SHA256 ?? string.Empty;
+ sha384 = rom.SHA384 ?? string.Empty;
+ sha512 = rom.SHA512 ?? string.Empty;
size = rom.Size.ToString() ?? string.Empty;
- spamsum = rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey) ?? string.Empty;
+ spamsum = rom.SpamSum ?? string.Empty;
}
// Now do bulk replacement where possible
@@ -675,38 +675,25 @@ namespace SabreTools.Metadata.DatFiles
return rom;
// If the item CRC isn't "null"
- if (rom.ReadString(Data.Models.Metadata.Rom.CRCKey) != "null")
+ if (rom.CRC != "null")
return rom;
// If the Rom has "null" characteristics, ensure all fields
rom.Name = rom.Name == "null" ? "-" : rom.Name;
rom.Size = 0;
- rom.Write(Data.Models.Metadata.Rom.CRC16Key,
- rom.ReadString(Data.Models.Metadata.Rom.CRC16Key) == "null" ? HashType.CRC16.ZeroString : null);
- rom.Write(Data.Models.Metadata.Rom.CRCKey,
- rom.ReadString(Data.Models.Metadata.Rom.CRCKey) == "null" ? HashType.CRC32.ZeroString : null);
- rom.Write(Data.Models.Metadata.Rom.CRC64Key,
- rom.ReadString(Data.Models.Metadata.Rom.CRC64Key) == "null" ? HashType.CRC64.ZeroString : null);
- rom.Write(Data.Models.Metadata.Rom.MD2Key,
- rom.ReadString(Data.Models.Metadata.Rom.MD2Key) == "null" ? HashType.MD2.ZeroString : null);
- rom.Write(Data.Models.Metadata.Rom.MD4Key,
- rom.ReadString(Data.Models.Metadata.Rom.MD4Key) == "null" ? HashType.MD4.ZeroString : null);
- rom.Write(Data.Models.Metadata.Rom.MD5Key,
- rom.ReadString(Data.Models.Metadata.Rom.MD5Key) == "null" ? HashType.MD5.ZeroString : null);
- rom.Write(Data.Models.Metadata.Rom.RIPEMD128Key,
- rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key) == "null" ? HashType.RIPEMD128.ZeroString : null);
- rom.Write(Data.Models.Metadata.Rom.RIPEMD160Key,
- rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key) == "null" ? HashType.RIPEMD160.ZeroString : null);
- rom.Write(Data.Models.Metadata.Rom.SHA1Key,
- rom.ReadString(Data.Models.Metadata.Rom.SHA1Key) == "null" ? HashType.SHA1.ZeroString : null);
- rom.Write(Data.Models.Metadata.Rom.SHA256Key,
- rom.ReadString(Data.Models.Metadata.Rom.SHA256Key) == "null" ? HashType.SHA256.ZeroString : null);
- rom.Write(Data.Models.Metadata.Rom.SHA384Key,
- rom.ReadString(Data.Models.Metadata.Rom.SHA384Key) == "null" ? HashType.SHA384.ZeroString : null);
- rom.Write(Data.Models.Metadata.Rom.SHA512Key,
- rom.ReadString(Data.Models.Metadata.Rom.SHA512Key) == "null" ? HashType.SHA512.ZeroString : null);
- rom.Write(Data.Models.Metadata.Rom.SpamSumKey,
- rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey) == "null" ? HashType.SpamSum.ZeroString : null);
+ rom.CRC16 = rom.CRC16 == "null" ? HashType.CRC16.ZeroString : null;
+ rom.CRC = rom.CRC == "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;
+ rom.MD5 = rom.MD5 == "null" ? HashType.MD5.ZeroString : null;
+ rom.RIPEMD128 = rom.RIPEMD128 == "null" ? HashType.RIPEMD128.ZeroString : null;
+ rom.RIPEMD160 = rom.RIPEMD160 == "null" ? HashType.RIPEMD160.ZeroString : null;
+ rom.SHA1 = rom.SHA1 == "null" ? HashType.SHA1.ZeroString : null;
+ rom.SHA256 = rom.SHA256 == "null" ? HashType.SHA256.ZeroString : null;
+ rom.SHA384 = rom.SHA384 == "null" ? HashType.SHA384.ZeroString : null;
+ rom.SHA512 = rom.SHA512 == "null" ? HashType.SHA512.ZeroString : null;
+ rom.SpamSum = rom.SpamSum == "null" ? HashType.SpamSum.ZeroString : null;
return rom;
}
@@ -1086,55 +1073,55 @@ namespace SabreTools.Metadata.DatFiles
///
private static string GetDuplicateSuffix(Rom datItem)
{
- string? crc16 = datItem.ReadString(Data.Models.Metadata.Rom.CRC16Key);
+ string? crc16 = datItem.CRC16;
if (!string.IsNullOrEmpty(crc16))
return $"_{crc16}";
- string? crc = datItem.ReadString(Data.Models.Metadata.Rom.CRCKey);
+ string? crc = datItem.CRC;
if (!string.IsNullOrEmpty(crc))
return $"_{crc}";
- string? crc64 = datItem.ReadString(Data.Models.Metadata.Rom.CRC64Key);
+ string? crc64 = datItem.CRC64;
if (!string.IsNullOrEmpty(crc64))
return $"_{crc64}";
- string? md2 = datItem.ReadString(Data.Models.Metadata.Rom.MD2Key);
+ string? md2 = datItem.MD2;
if (!string.IsNullOrEmpty(md2))
return $"_{md2}";
- string? md4 = datItem.ReadString(Data.Models.Metadata.Rom.MD4Key);
+ string? md4 = datItem.MD4;
if (!string.IsNullOrEmpty(md4))
return $"_{md4}";
- string? md5 = datItem.ReadString(Data.Models.Metadata.Rom.MD5Key);
+ string? md5 = datItem.MD5;
if (!string.IsNullOrEmpty(md5))
return $"_{md5}";
- string? ripemd128 = datItem.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key);
+ string? ripemd128 = datItem.RIPEMD128;
if (!string.IsNullOrEmpty(ripemd128))
return $"_{ripemd128}";
- string? ripemd160 = datItem.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key);
+ string? ripemd160 = datItem.RIPEMD160;
if (!string.IsNullOrEmpty(ripemd160))
return $"_{ripemd160}";
- string? sha1 = datItem.ReadString(Data.Models.Metadata.Rom.SHA1Key);
+ string? sha1 = datItem.SHA1;
if (!string.IsNullOrEmpty(sha1))
return $"_{sha1}";
- string? sha256 = datItem.ReadString(Data.Models.Metadata.Rom.SHA256Key);
+ string? sha256 = datItem.SHA256;
if (!string.IsNullOrEmpty(sha256))
return $"_{sha256}";
- string? sha384 = datItem.ReadString(Data.Models.Metadata.Rom.SHA384Key);
+ string? sha384 = datItem.SHA384;
if (!string.IsNullOrEmpty(sha384))
return $"_{sha384}";
- string? sha512 = datItem.ReadString(Data.Models.Metadata.Rom.SHA512Key);
+ string? sha512 = datItem.SHA512;
if (!string.IsNullOrEmpty(sha512))
return $"_{sha512}";
- string? spamSum = datItem.ReadString(Data.Models.Metadata.Rom.SpamSumKey);
+ string? spamSum = datItem.SpamSum;
if (!string.IsNullOrEmpty(spamSum))
return $"_{spamSum}";
diff --git a/SabreTools.Metadata.DatFiles/DatStatistics.cs b/SabreTools.Metadata.DatFiles/DatStatistics.cs
index 8b0af504..850d870e 100644
--- a/SabreTools.Metadata.DatFiles/DatStatistics.cs
+++ b/SabreTools.Metadata.DatFiles/DatStatistics.cs
@@ -375,19 +375,19 @@ namespace SabreTools.Metadata.DatFiles
if (status != ItemStatus.Nodump)
{
TotalSize += rom.Size ?? 0;
- AddHashCount(HashType.CRC16, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC16Key)) ? 0 : 1);
- AddHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)) ? 0 : 1);
- AddHashCount(HashType.CRC64, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC64Key)) ? 0 : 1);
- AddHashCount(HashType.MD2, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD2Key)) ? 0 : 1);
- AddHashCount(HashType.MD4, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD4Key)) ? 0 : 1);
- AddHashCount(HashType.MD5, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD5Key)) ? 0 : 1);
- AddHashCount(HashType.RIPEMD128, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key)) ? 0 : 1);
- AddHashCount(HashType.RIPEMD160, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key)) ? 0 : 1);
- AddHashCount(HashType.SHA1, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)) ? 0 : 1);
- AddHashCount(HashType.SHA256, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key)) ? 0 : 1);
- AddHashCount(HashType.SHA384, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA384Key)) ? 0 : 1);
- AddHashCount(HashType.SHA512, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA512Key)) ? 0 : 1);
- AddHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey)) ? 0 : 1);
+ AddHashCount(HashType.CRC16, string.IsNullOrEmpty(rom.CRC16) ? 0 : 1);
+ AddHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.CRC) ? 0 : 1);
+ AddHashCount(HashType.CRC64, string.IsNullOrEmpty(rom.CRC64) ? 0 : 1);
+ AddHashCount(HashType.MD2, string.IsNullOrEmpty(rom.MD2) ? 0 : 1);
+ AddHashCount(HashType.MD4, string.IsNullOrEmpty(rom.MD4) ? 0 : 1);
+ AddHashCount(HashType.MD5, string.IsNullOrEmpty(rom.MD5) ? 0 : 1);
+ AddHashCount(HashType.RIPEMD128, string.IsNullOrEmpty(rom.RIPEMD128) ? 0 : 1);
+ AddHashCount(HashType.RIPEMD160, string.IsNullOrEmpty(rom.RIPEMD160) ? 0 : 1);
+ AddHashCount(HashType.SHA1, string.IsNullOrEmpty(rom.SHA1) ? 0 : 1);
+ AddHashCount(HashType.SHA256, string.IsNullOrEmpty(rom.SHA256) ? 0 : 1);
+ AddHashCount(HashType.SHA384, string.IsNullOrEmpty(rom.SHA384) ? 0 : 1);
+ AddHashCount(HashType.SHA512, string.IsNullOrEmpty(rom.SHA512) ? 0 : 1);
+ AddHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.SpamSum) ? 0 : 1);
}
AddStatusCount(ItemStatus.BadDump, status == ItemStatus.BadDump ? 1 : 0);
@@ -504,19 +504,19 @@ namespace SabreTools.Metadata.DatFiles
if (status != ItemStatus.Nodump)
{
TotalSize -= rom.Size ?? 0;
- RemoveHashCount(HashType.CRC16, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC16Key)) ? 0 : 1);
- RemoveHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)) ? 0 : 1);
- RemoveHashCount(HashType.CRC64, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC64Key)) ? 0 : 1);
- RemoveHashCount(HashType.MD2, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD2Key)) ? 0 : 1);
- RemoveHashCount(HashType.MD4, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD4Key)) ? 0 : 1);
- RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD5Key)) ? 0 : 1);
- RemoveHashCount(HashType.RIPEMD128, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key)) ? 0 : 1);
- RemoveHashCount(HashType.RIPEMD160, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key)) ? 0 : 1);
- RemoveHashCount(HashType.SHA1, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)) ? 0 : 1);
- RemoveHashCount(HashType.SHA256, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key)) ? 0 : 1);
- RemoveHashCount(HashType.SHA384, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA384Key)) ? 0 : 1);
- RemoveHashCount(HashType.SHA512, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA512Key)) ? 0 : 1);
- RemoveHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey)) ? 0 : 1);
+ RemoveHashCount(HashType.CRC16, string.IsNullOrEmpty(rom.CRC16) ? 0 : 1);
+ RemoveHashCount(HashType.CRC32, string.IsNullOrEmpty(rom.CRC) ? 0 : 1);
+ RemoveHashCount(HashType.CRC64, string.IsNullOrEmpty(rom.CRC64) ? 0 : 1);
+ RemoveHashCount(HashType.MD2, string.IsNullOrEmpty(rom.MD2) ? 0 : 1);
+ RemoveHashCount(HashType.MD4, string.IsNullOrEmpty(rom.MD4) ? 0 : 1);
+ RemoveHashCount(HashType.MD5, string.IsNullOrEmpty(rom.MD5) ? 0 : 1);
+ RemoveHashCount(HashType.RIPEMD128, string.IsNullOrEmpty(rom.RIPEMD128) ? 0 : 1);
+ RemoveHashCount(HashType.RIPEMD160, string.IsNullOrEmpty(rom.RIPEMD160) ? 0 : 1);
+ RemoveHashCount(HashType.SHA1, string.IsNullOrEmpty(rom.SHA1) ? 0 : 1);
+ RemoveHashCount(HashType.SHA256, string.IsNullOrEmpty(rom.SHA256) ? 0 : 1);
+ RemoveHashCount(HashType.SHA384, string.IsNullOrEmpty(rom.SHA384) ? 0 : 1);
+ RemoveHashCount(HashType.SHA512, string.IsNullOrEmpty(rom.SHA512) ? 0 : 1);
+ RemoveHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.SpamSum) ? 0 : 1);
}
RemoveStatusCount(ItemStatus.BadDump, status == ItemStatus.BadDump ? 1 : 0);
diff --git a/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs b/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs
index eeeb506a..de90a89a 100644
--- a/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/ClrMamePro.cs
@@ -92,21 +92,21 @@ 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.ReadString(Data.Models.Metadata.Rom.CRC16Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC64Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD2Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD4Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD5Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA384Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA512Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey)))
+ if (string.IsNullOrEmpty(rom.CRC16)
+ && string.IsNullOrEmpty(rom.CRC)
+ && string.IsNullOrEmpty(rom.CRC64)
+ && string.IsNullOrEmpty(rom.MD2)
+ && string.IsNullOrEmpty(rom.MD4)
+ && string.IsNullOrEmpty(rom.MD5)
+ && string.IsNullOrEmpty(rom.RIPEMD128)
+ && string.IsNullOrEmpty(rom.RIPEMD160)
+ && string.IsNullOrEmpty(rom.SHA1)
+ && string.IsNullOrEmpty(rom.SHA256)
+ && string.IsNullOrEmpty(rom.SHA384)
+ && string.IsNullOrEmpty(rom.SHA512)
+ && string.IsNullOrEmpty(rom.SpamSum))
{
- missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA1));
}
break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/DosCenter.cs b/SabreTools.Metadata.DatFiles/Formats/DosCenter.cs
index 30af27c7..ecc5cd01 100644
--- a/SabreTools.Metadata.DatFiles/Formats/DosCenter.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/DosCenter.cs
@@ -39,11 +39,11 @@ 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.Date))
- // missingFields.Add(Data.Models.Metadata.Rom.DateKey);
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)))
- missingFields.Add(Data.Models.Metadata.Rom.CRCKey);
+ // 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.GetStringFieldValue(Data.Models.Metadata.Rom.SHA1Key)))
- // missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
+ // missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA1));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/EverdriveSmdb.cs b/SabreTools.Metadata.DatFiles/Formats/EverdriveSmdb.cs
index e680cc80..b40adf19 100644
--- a/SabreTools.Metadata.DatFiles/Formats/EverdriveSmdb.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/EverdriveSmdb.cs
@@ -36,14 +36,14 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key)))
- missingFields.Add(Data.Models.Metadata.Rom.SHA256Key);
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)))
- missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD5Key)))
- missingFields.Add(Data.Models.Metadata.Rom.MD5Key);
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)))
- missingFields.Add(Data.Models.Metadata.Rom.CRCKey);
+ if (string.IsNullOrEmpty(rom.SHA256))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA256));
+ if (string.IsNullOrEmpty(rom.SHA1))
+ 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));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/Listrom.cs b/SabreTools.Metadata.DatFiles/Formats/Listrom.cs
index 290caf11..05d822e8 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Listrom.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Listrom.cs
@@ -48,10 +48,10 @@ 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.ReadString(Data.Models.Metadata.Rom.CRCKey)))
- missingFields.Add(Data.Models.Metadata.Rom.CRCKey);
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)))
- missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
+ if (string.IsNullOrEmpty(rom.CRC))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC));
+ if (string.IsNullOrEmpty(rom.SHA1))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA1));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/Listxml.cs b/SabreTools.Metadata.DatFiles/Formats/Listxml.cs
index e85bb7d6..f0cb7dd1 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Listxml.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Listxml.cs
@@ -271,10 +271,10 @@ 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.ReadString(Data.Models.Metadata.Rom.CRCKey))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)))
+ if (string.IsNullOrEmpty(rom.CRC)
+ && string.IsNullOrEmpty(rom.SHA1))
{
- missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA1));
}
break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs b/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs
index dfb47dbe..976d16d8 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Logiqx.cs
@@ -284,21 +284,21 @@ 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.ReadString(Data.Models.Metadata.Rom.CRC16Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRC64Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD2Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD4Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD5Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA384Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA512Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey)))
+ if (string.IsNullOrEmpty(rom.CRC16)
+ && string.IsNullOrEmpty(rom.CRC)
+ && string.IsNullOrEmpty(rom.CRC64)
+ && string.IsNullOrEmpty(rom.MD2)
+ && string.IsNullOrEmpty(rom.MD4)
+ && string.IsNullOrEmpty(rom.MD5)
+ && string.IsNullOrEmpty(rom.RIPEMD128)
+ && string.IsNullOrEmpty(rom.RIPEMD160)
+ && string.IsNullOrEmpty(rom.SHA1)
+ && string.IsNullOrEmpty(rom.SHA256)
+ && string.IsNullOrEmpty(rom.SHA384)
+ && string.IsNullOrEmpty(rom.SHA512)
+ && string.IsNullOrEmpty(rom.SpamSum))
{
- missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA1));
}
break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/Md2File.cs b/SabreTools.Metadata.DatFiles/Formats/Md2File.cs
index b3457a79..72c9a1be 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Md2File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Md2File.cs
@@ -38,8 +38,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD2Key)))
- missingFields.Add(Data.Models.Metadata.Rom.MD2Key);
+ if (string.IsNullOrEmpty(rom.MD2))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.MD2));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/Md4File.cs b/SabreTools.Metadata.DatFiles/Formats/Md4File.cs
index d1f2d030..52b0ce11 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Md4File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Md4File.cs
@@ -38,8 +38,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD4Key)))
- missingFields.Add(Data.Models.Metadata.Rom.MD4Key);
+ if (string.IsNullOrEmpty(rom.MD4))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.MD4));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/Md5File.cs b/SabreTools.Metadata.DatFiles/Formats/Md5File.cs
index bfa09d09..b9dcf6ff 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Md5File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Md5File.cs
@@ -50,8 +50,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
break;
case Rom rom:
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD5Key)))
- missingFields.Add(Data.Models.Metadata.Rom.MD5Key);
+ if (string.IsNullOrEmpty(rom.MD5))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.MD5));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/OfflineList.cs b/SabreTools.Metadata.DatFiles/Formats/OfflineList.cs
index dfd9668f..f75f9b74 100644
--- a/SabreTools.Metadata.DatFiles/Formats/OfflineList.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/OfflineList.cs
@@ -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.ReadString(Data.Models.Metadata.Rom.CRCKey)))
- missingFields.Add(Data.Models.Metadata.Rom.CRCKey);
+ if (string.IsNullOrEmpty(rom.CRC))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs b/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs
index 64819f1d..7924f589 100644
--- a/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/OpenMSX.cs
@@ -75,8 +75,8 @@ The softwaredb.xml file contains information about rom mapper types
switch (datItem)
{
case Rom rom:
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)))
- missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
+ if (string.IsNullOrEmpty(rom.SHA1))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA1));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/RipeMD128File.cs b/SabreTools.Metadata.DatFiles/Formats/RipeMD128File.cs
index 28512ed5..4611ecf1 100644
--- a/SabreTools.Metadata.DatFiles/Formats/RipeMD128File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/RipeMD128File.cs
@@ -38,8 +38,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key)))
- missingFields.Add(Data.Models.Metadata.Rom.RIPEMD128Key);
+ if (string.IsNullOrEmpty(rom.RIPEMD128))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.RIPEMD128));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/RipeMD160File.cs b/SabreTools.Metadata.DatFiles/Formats/RipeMD160File.cs
index 4dbae14c..a42e39e8 100644
--- a/SabreTools.Metadata.DatFiles/Formats/RipeMD160File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/RipeMD160File.cs
@@ -38,8 +38,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key)))
- missingFields.Add(Data.Models.Metadata.Rom.RIPEMD160Key);
+ if (string.IsNullOrEmpty(rom.RIPEMD160))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.RIPEMD160));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/RomCenter.cs b/SabreTools.Metadata.DatFiles/Formats/RomCenter.cs
index 5e53ac89..a07d6860 100644
--- a/SabreTools.Metadata.DatFiles/Formats/RomCenter.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/RomCenter.cs
@@ -36,8 +36,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)))
- missingFields.Add(Data.Models.Metadata.Rom.CRCKey);
+ if (string.IsNullOrEmpty(rom.CRC))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC));
if (rom.Size is null || rom.Size < 0)
missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs b/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs
index c0bf2d1e..385331a7 100644
--- a/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/SeparatedValue.cs
@@ -95,15 +95,15 @@ 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.ReadString(Data.Models.Metadata.Rom.CRCKey))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.MD5Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA384Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA512Key))
- && string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey)))
+ if (string.IsNullOrEmpty(rom.CRC)
+ && string.IsNullOrEmpty(rom.MD5)
+ && string.IsNullOrEmpty(rom.SHA1)
+ && string.IsNullOrEmpty(rom.SHA256)
+ && string.IsNullOrEmpty(rom.SHA384)
+ && string.IsNullOrEmpty(rom.SHA512)
+ && string.IsNullOrEmpty(rom.SpamSum))
{
- missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA1));
}
break;
diff --git a/SabreTools.Metadata.DatFiles/Formats/SfvFile.cs b/SabreTools.Metadata.DatFiles/Formats/SfvFile.cs
index f106c6bd..6994ecc6 100644
--- a/SabreTools.Metadata.DatFiles/Formats/SfvFile.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/SfvFile.cs
@@ -38,8 +38,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.CRCKey)))
- missingFields.Add(Data.Models.Metadata.Rom.CRCKey);
+ if (string.IsNullOrEmpty(rom.CRC))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.CRC));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/Sha1File.cs b/SabreTools.Metadata.DatFiles/Formats/Sha1File.cs
index 8cb8a639..f602f8cd 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Sha1File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Sha1File.cs
@@ -50,8 +50,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
break;
case Rom rom:
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)))
- missingFields.Add(Data.Models.Metadata.Rom.SHA1Key);
+ if (string.IsNullOrEmpty(rom.SHA1))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA1));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/Sha256File.cs b/SabreTools.Metadata.DatFiles/Formats/Sha256File.cs
index 2a486680..53f4c750 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Sha256File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Sha256File.cs
@@ -44,8 +44,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
break;
case Rom rom:
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA256Key)))
- missingFields.Add(Data.Models.Metadata.Rom.SHA256Key);
+ if (string.IsNullOrEmpty(rom.SHA256))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA256));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/Sha384File.cs b/SabreTools.Metadata.DatFiles/Formats/Sha384File.cs
index 2ef52335..8b8cada1 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Sha384File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Sha384File.cs
@@ -38,8 +38,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA384Key)))
- missingFields.Add(Data.Models.Metadata.Rom.SHA384Key);
+ if (string.IsNullOrEmpty(rom.SHA384))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA384));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/Sha512File.cs b/SabreTools.Metadata.DatFiles/Formats/Sha512File.cs
index 81bf39a8..1fb4f576 100644
--- a/SabreTools.Metadata.DatFiles/Formats/Sha512File.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/Sha512File.cs
@@ -38,8 +38,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
switch (datItem)
{
case Rom rom:
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA512Key)))
- missingFields.Add(Data.Models.Metadata.Rom.SHA512Key);
+ if (string.IsNullOrEmpty(rom.SHA512))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.SHA512));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/Formats/SpamSumFile.cs b/SabreTools.Metadata.DatFiles/Formats/SpamSumFile.cs
index 8383c5a3..73407a22 100644
--- a/SabreTools.Metadata.DatFiles/Formats/SpamSumFile.cs
+++ b/SabreTools.Metadata.DatFiles/Formats/SpamSumFile.cs
@@ -44,8 +44,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
break;
case Rom rom:
- if (string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SpamSumKey)))
- missingFields.Add(Data.Models.Metadata.Rom.SpamSumKey);
+ if (string.IsNullOrEmpty(rom.SpamSum))
+ missingFields.Add(nameof(Data.Models.Metadata.Rom.SpamSum));
break;
default:
diff --git a/SabreTools.Metadata.DatFiles/ItemDictionary.cs b/SabreTools.Metadata.DatFiles/ItemDictionary.cs
index f55c46b0..07e52fa2 100644
--- a/SabreTools.Metadata.DatFiles/ItemDictionary.cs
+++ b/SabreTools.Metadata.DatFiles/ItemDictionary.cs
@@ -139,7 +139,7 @@ namespace SabreTools.Metadata.DatFiles
long? size = rom.Size;
// If we have the case where there is SHA-1 and nothing else, we don't fill in any other part of the data
- if (size is null && !string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)))
+ if (size is null && !string.IsNullOrEmpty(rom.SHA1))
{
// No-op, just catch it so it doesn't go further
//logger.Verbose($"{Header.GetStringFieldValue(DatHeader.FileNameKey)}: Entry with only SHA-1 found - '{rom.Name}'");
@@ -147,22 +147,22 @@ 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.ReadString(Data.Models.Metadata.Rom.CRCKey)) || rom.HasZeroHash()))
+ && (string.IsNullOrEmpty(rom.CRC) || rom.HasZeroHash()))
{
rom.Size = 0;
- rom.Write(Data.Models.Metadata.Rom.CRC16Key, null); // HashType.CRC16.ZeroString
- rom.Write(Data.Models.Metadata.Rom.CRCKey, HashType.CRC32.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.CRC64Key, null); // HashType.CRC64.ZeroString
- rom.Write(Data.Models.Metadata.Rom.MD2Key, null); // HashType.MD2.ZeroString
- rom.Write(Data.Models.Metadata.Rom.MD4Key, null); // HashType.MD4.ZeroString
- rom.Write(Data.Models.Metadata.Rom.MD5Key, HashType.MD5.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.RIPEMD128Key, null); // HashType.RIPEMD128.ZeroString
- rom.Write(Data.Models.Metadata.Rom.RIPEMD160Key, null); // HashType.RIPEMD160.ZeroString
- rom.Write(Data.Models.Metadata.Rom.SHA1Key, HashType.SHA1.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.SHA256Key, null); // HashType.SHA256.ZeroString;
- rom.Write(Data.Models.Metadata.Rom.SHA384Key, null); // HashType.SHA384.ZeroString;
- rom.Write(Data.Models.Metadata.Rom.SHA512Key, null); // HashType.SHA512.ZeroString;
- rom.Write(Data.Models.Metadata.Rom.SpamSumKey, null); // HashType.SpamSum.ZeroString;
+ rom.CRC16 = null; // HashType.CRC16.ZeroString
+ rom.CRC = HashType.CRC32.ZeroString;
+ rom.CRC64 = null; // HashType.CRC64.ZeroString
+ rom.MD2 = null; // HashType.MD2.ZeroString
+ rom.MD4 = null; // HashType.MD4.ZeroString
+ rom.MD5 = HashType.MD5.ZeroString;
+ rom.RIPEMD128 = null; // HashType.RIPEMD128.ZeroString
+ rom.RIPEMD160 = null; // HashType.RIPEMD160.ZeroString
+ rom.SHA1 = HashType.SHA1.ZeroString;
+ rom.SHA256 = null; // HashType.SHA256.ZeroString;
+ rom.SHA384 = null; // HashType.SHA384.ZeroString;
+ rom.SHA512 = null; // HashType.SHA512.ZeroString;
+ rom.SpamSum = null; // HashType.SpamSum.ZeroString;
}
// If the file has no size and it's not the above case, skip and log
diff --git a/SabreTools.Metadata.DatFiles/ItemDictionaryDB.cs b/SabreTools.Metadata.DatFiles/ItemDictionaryDB.cs
index d53bd1de..0050b835 100644
--- a/SabreTools.Metadata.DatFiles/ItemDictionaryDB.cs
+++ b/SabreTools.Metadata.DatFiles/ItemDictionaryDB.cs
@@ -228,7 +228,7 @@ namespace SabreTools.Metadata.DatFiles
long? size = rom.Size;
// If we have the case where there is SHA-1 and nothing else, we don't fill in any other part of the data
- if (size is null && !string.IsNullOrEmpty(rom.ReadString(Data.Models.Metadata.Rom.SHA1Key)))
+ if (size is null && !string.IsNullOrEmpty(rom.SHA1))
{
// No-op, just catch it so it doesn't go further
//logger.Verbose($"{Header.GetStringFieldValue(DatHeader.FileNameKey)}: Entry with only SHA-1 found - '{rom.Name}'");
@@ -236,22 +236,22 @@ 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.ReadString(Data.Models.Metadata.Rom.CRCKey)) || rom.HasZeroHash()))
+ && (string.IsNullOrEmpty(rom.CRC) || rom.HasZeroHash()))
{
rom.Size = 0;
- rom.Write(Data.Models.Metadata.Rom.CRC16Key, null); // HashType.CRC16.ZeroString
- rom.Write(Data.Models.Metadata.Rom.CRCKey, HashType.CRC32.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.CRC64Key, null); // HashType.CRC64.ZeroString
- rom.Write(Data.Models.Metadata.Rom.MD2Key, null); // HashType.MD2.ZeroString
- rom.Write(Data.Models.Metadata.Rom.MD4Key, null); // HashType.MD4.ZeroString
- rom.Write(Data.Models.Metadata.Rom.MD5Key, HashType.MD5.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.RIPEMD128Key, null); // HashType.RIPEMD128.ZeroString
- rom.Write(Data.Models.Metadata.Rom.RIPEMD160Key, null); // HashType.RIPEMD160.ZeroString
- rom.Write(Data.Models.Metadata.Rom.SHA1Key, HashType.SHA1.ZeroString);
- rom.Write(Data.Models.Metadata.Rom.SHA256Key, null); // HashType.SHA256.ZeroString;
- rom.Write(Data.Models.Metadata.Rom.SHA384Key, null); // HashType.SHA384.ZeroString;
- rom.Write(Data.Models.Metadata.Rom.SHA512Key, null); // HashType.SHA512.ZeroString;
- rom.Write(Data.Models.Metadata.Rom.SpamSumKey, null); // HashType.SpamSum.ZeroString;
+ rom.CRC16 = null; // HashType.CRC16.ZeroString
+ rom.CRC = HashType.CRC32.ZeroString;
+ rom.CRC64 = null; // HashType.CRC64.ZeroString
+ rom.MD2 = null; // HashType.MD2.ZeroString
+ rom.MD4 = null; // HashType.MD4.ZeroString
+ rom.MD5 = HashType.MD5.ZeroString;
+ rom.RIPEMD128 = null; // HashType.RIPEMD128.ZeroString
+ rom.RIPEMD160 = null; // HashType.RIPEMD160.ZeroString
+ rom.SHA1 = HashType.SHA1.ZeroString;
+ rom.SHA256 = null; // HashType.SHA256.ZeroString;
+ rom.SHA384 = null; // HashType.SHA384.ZeroString;
+ rom.SHA512 = null; // HashType.SHA512.ZeroString;
+ rom.SpamSum = null; // HashType.SpamSum.ZeroString;
}
// If the file has no size and it's not the above case, skip and log
diff --git a/SabreTools.Metadata.DatItems.Test/DatItemTests.cs b/SabreTools.Metadata.DatItems.Test/DatItemTests.cs
index 070ad8e9..3cc3846e 100644
--- a/SabreTools.Metadata.DatItems.Test/DatItemTests.cs
+++ b/SabreTools.Metadata.DatItems.Test/DatItemTests.cs
@@ -266,11 +266,17 @@ namespace SabreTools.Metadata.DatItems.Test
[InlineData("name", "name", 0)]
public void CompareTo_NamesOnly(string? selfName, string? otherName, int expected)
{
- DatItem self = new Rom { Name = selfName };
- self.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
+ DatItem self = new Rom
+ {
+ Name = selfName,
+ CRC = "DEADBEEF"
+ };
- DatItem? other = new Rom { Name = otherName };
- other.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
+ DatItem? other = new Rom
+ {
+ Name = otherName,
+ CRC = "DEADBEEF"
+ };
int actual = self.CompareTo(other);
Assert.Equal(expected, actual);
@@ -468,20 +474,22 @@ namespace SabreTools.Metadata.DatItems.Test
Machine machine = new Machine { Name = "Machine" };
- DatItem datItem = new Rom();
- datItem.Write(Data.Models.Metadata.Rom.CRC16Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.CRC64Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.MD2Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.MD4Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.MD5Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.RIPEMD128Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.RIPEMD160Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.SHA1Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.SHA256Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.SHA384Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.SHA512Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.SpamSumKey, "BASE64");
+ DatItem datItem = new Rom
+ {
+ CRC16 = "DEADBEEF",
+ CRC = "DEADBEEF",
+ CRC64 = "DEADBEEF",
+ MD2 = "DEADBEEF",
+ MD4 = "DEADBEEF",
+ MD5 = "DEADBEEF",
+ RIPEMD128 = "DEADBEEF",
+ RIPEMD160 = "DEADBEEF",
+ SHA1 = "DEADBEEF",
+ SHA256 = "DEADBEEF",
+ SHA384 = "DEADBEEF",
+ SHA512 = "DEADBEEF",
+ SpamSum = "BASE64"
+ };
string actual = datItem.GetKey(bucketedBy, machine, source, lower, norename);
Assert.Equal(expected, actual);
diff --git a/SabreTools.Metadata.DatItems.Test/Formats/DiskTests.cs b/SabreTools.Metadata.DatItems.Test/Formats/DiskTests.cs
index c12dd141..f02968e4 100644
--- a/SabreTools.Metadata.DatItems.Test/Formats/DiskTests.cs
+++ b/SabreTools.Metadata.DatItems.Test/Formats/DiskTests.cs
@@ -38,12 +38,12 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom actual = disk.ConvertToRom();
Assert.Equal("name.chd", actual.Name);
- Assert.Equal("merge", actual.ReadString(Data.Models.Metadata.Rom.MergeKey));
- Assert.Equal("region", actual.ReadString(Data.Models.Metadata.Rom.RegionKey));
+ Assert.Equal("merge", actual.Merge);
+ Assert.Equal("region", actual.Region);
Assert.Equal(Data.Models.Metadata.ItemStatus.Good, actual.Status);
Assert.Equal(true, actual.Optional);
- Assert.Equal(HashType.MD5.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.MD5Key));
- Assert.Equal(HashType.SHA1.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
+ Assert.Equal(HashType.MD5.ZeroString, actual.MD5);
+ Assert.Equal(HashType.SHA1.ZeroString, actual.SHA1);
Assert.Equal(DupeType.All | DupeType.External, actual.DupeType);
DataArea? actualDataArea = actual.DataArea;
diff --git a/SabreTools.Metadata.DatItems.Test/Formats/FileTests.cs b/SabreTools.Metadata.DatItems.Test/Formats/FileTests.cs
index 306cc776..1b4d6295 100644
--- a/SabreTools.Metadata.DatItems.Test/Formats/FileTests.cs
+++ b/SabreTools.Metadata.DatItems.Test/Formats/FileTests.cs
@@ -36,10 +36,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Assert.Equal("XXXXXX.XXXXXX", actual.Name);
Assert.Equal(12345, actual.Size);
- Assert.Equal("deadbeef", actual.ReadString(Data.Models.Metadata.Rom.CRCKey));
- Assert.Equal("000000000000000000000000deadbeef", actual.ReadString(Data.Models.Metadata.Rom.MD5Key));
- Assert.Equal("00000000000000000000000000000000deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
- Assert.Equal("00000000000000000000000000000000000000000000000000000000deadbeef", actual.ReadString(Data.Models.Metadata.Rom.SHA256Key));
+ Assert.Equal("deadbeef", actual.CRC);
+ Assert.Equal("000000000000000000000000deadbeef", actual.MD5);
+ Assert.Equal("00000000000000000000000000000000deadbeef", actual.SHA1);
+ Assert.Equal("00000000000000000000000000000000000000000000000000000000deadbeef", actual.SHA256);
Assert.Equal(DupeType.All | DupeType.External, actual.DupeType);
Machine? actualMachine = actual.Machine;
diff --git a/SabreTools.Metadata.DatItems.Test/Formats/MediaTests.cs b/SabreTools.Metadata.DatItems.Test/Formats/MediaTests.cs
index 6bc933e3..90dc6b20 100644
--- a/SabreTools.Metadata.DatItems.Test/Formats/MediaTests.cs
+++ b/SabreTools.Metadata.DatItems.Test/Formats/MediaTests.cs
@@ -30,10 +30,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Rom actual = media.ConvertToRom();
Assert.Equal("name.aaruf", actual.Name);
- Assert.Equal(HashType.MD5.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.MD5Key));
- Assert.Equal(HashType.SHA1.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.SHA1Key));
- Assert.Equal(HashType.SHA256.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.SHA256Key));
- Assert.Equal(HashType.SpamSum.ZeroString, actual.ReadString(Data.Models.Metadata.Rom.SpamSumKey));
+ Assert.Equal(HashType.MD5.ZeroString, actual.MD5);
+ Assert.Equal(HashType.SHA1.ZeroString, actual.SHA1);
+ Assert.Equal(HashType.SHA256.ZeroString, actual.SHA256);
+ Assert.Equal(HashType.SpamSum.ZeroString, actual.SpamSum);
Assert.Equal(DupeType.All | DupeType.External, actual.DupeType);
Machine? actualMachine = actual.Machine;
diff --git a/SabreTools.Metadata.DatItems.Test/Formats/RomTests.cs b/SabreTools.Metadata.DatItems.Test/Formats/RomTests.cs
index 60d17381..0c8347f9 100644
--- a/SabreTools.Metadata.DatItems.Test/Formats/RomTests.cs
+++ b/SabreTools.Metadata.DatItems.Test/Formats/RomTests.cs
@@ -15,19 +15,19 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
self.FillMissingInformation(other);
- Assert.Null(self.ReadString(Data.Models.Metadata.Rom.CRC16Key));
- Assert.Null(self.ReadString(Data.Models.Metadata.Rom.CRCKey));
- Assert.Null(self.ReadString(Data.Models.Metadata.Rom.CRC64Key));
- Assert.Null(self.ReadString(Data.Models.Metadata.Rom.MD2Key));
- Assert.Null(self.ReadString(Data.Models.Metadata.Rom.MD4Key));
- Assert.Null(self.ReadString(Data.Models.Metadata.Rom.MD5Key));
- Assert.Null(self.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key));
- Assert.Null(self.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key));
- Assert.Null(self.ReadString(Data.Models.Metadata.Rom.SHA1Key));
- Assert.Null(self.ReadString(Data.Models.Metadata.Rom.SHA256Key));
- Assert.Null(self.ReadString(Data.Models.Metadata.Rom.SHA384Key));
- Assert.Null(self.ReadString(Data.Models.Metadata.Rom.SHA512Key));
- Assert.Null(self.ReadString(Data.Models.Metadata.Rom.SpamSumKey));
+ Assert.Null(self.CRC16);
+ Assert.Null(self.CRC);
+ Assert.Null(self.CRC64);
+ Assert.Null(self.MD2);
+ Assert.Null(self.MD4);
+ Assert.Null(self.MD5);
+ Assert.Null(self.RIPEMD128);
+ Assert.Null(self.RIPEMD160);
+ Assert.Null(self.SHA1);
+ Assert.Null(self.SHA256);
+ Assert.Null(self.SHA384);
+ Assert.Null(self.SHA512);
+ Assert.Null(self.SpamSum);
}
[Fact]
@@ -35,36 +35,38 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
{
Rom self = new Rom();
- Rom other = new Rom();
- other.Write(Data.Models.Metadata.Rom.CRC16Key, "XXXXXX");
- other.Write(Data.Models.Metadata.Rom.CRCKey, "XXXXXX");
- other.Write(Data.Models.Metadata.Rom.CRC64Key, "XXXXXX");
- other.Write(Data.Models.Metadata.Rom.MD2Key, "XXXXXX");
- other.Write(Data.Models.Metadata.Rom.MD4Key, "XXXXXX");
- other.Write(Data.Models.Metadata.Rom.MD5Key, "XXXXXX");
- other.Write(Data.Models.Metadata.Rom.RIPEMD128Key, "XXXXXX");
- other.Write(Data.Models.Metadata.Rom.RIPEMD160Key, "XXXXXX");
- other.Write(Data.Models.Metadata.Rom.SHA1Key, "XXXXXX");
- other.Write(Data.Models.Metadata.Rom.SHA256Key, "XXXXXX");
- other.Write(Data.Models.Metadata.Rom.SHA384Key, "XXXXXX");
- other.Write(Data.Models.Metadata.Rom.SHA512Key, "XXXXXX");
- other.Write(Data.Models.Metadata.Rom.SpamSumKey, "XXXXXX");
+ Rom other = new Rom
+ {
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX"
+ };
self.FillMissingInformation(other);
- Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Rom.CRC16Key));
- Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Rom.CRCKey));
- Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Rom.CRC64Key));
- Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Rom.MD2Key));
- Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Rom.MD4Key));
- Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Rom.MD5Key));
- Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key));
- Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key));
- Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Rom.SHA1Key));
- Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Rom.SHA256Key));
- Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Rom.SHA384Key));
- Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Rom.SHA512Key));
- Assert.Equal("XXXXXX", self.ReadString(Data.Models.Metadata.Rom.SpamSumKey));
+ Assert.Equal("XXXXXX", self.CRC16);
+ Assert.Equal("XXXXXX", self.CRC);
+ Assert.Equal("XXXXXX", self.CRC64);
+ Assert.Equal("XXXXXX", self.MD2);
+ Assert.Equal("XXXXXX", self.MD4);
+ Assert.Equal("XXXXXX", self.MD5);
+ Assert.Equal("XXXXXX", self.RIPEMD128);
+ Assert.Equal("XXXXXX", self.RIPEMD160);
+ Assert.Equal("XXXXXX", self.SHA1);
+ Assert.Equal("XXXXXX", self.SHA256);
+ Assert.Equal("XXXXXX", self.SHA384);
+ Assert.Equal("XXXXXX", self.SHA512);
+ Assert.Equal("XXXXXX", self.SpamSum);
}
#endregion
@@ -82,20 +84,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasHashes_CRC16_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = "XXXXXX",
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasHashes();
Assert.True(actual);
@@ -104,20 +108,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasHashes_CRC_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = "XXXXXX",
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasHashes();
Assert.True(actual);
@@ -126,20 +132,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasHashes_CRC64_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = "XXXXXX",
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasHashes();
Assert.True(actual);
@@ -148,20 +156,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasHashes_MD2_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = "XXXXXX",
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasHashes();
Assert.True(actual);
@@ -170,20 +180,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasHashes_MD4_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = "XXXXXX",
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasHashes();
Assert.True(actual);
@@ -192,20 +204,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasHashes_MD5_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = "XXXXXX",
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasHashes();
Assert.True(actual);
@@ -214,20 +228,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasHashes_RIPEMD128_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasHashes();
Assert.True(actual);
@@ -236,20 +252,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasHashes_RIPEMD160_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = "XXXXXX",
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasHashes();
Assert.True(actual);
@@ -258,20 +276,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasHashes_SHA1_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = "XXXXXX",
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasHashes();
Assert.True(actual);
@@ -280,20 +300,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasHashes_SHA256_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = "XXXXXX",
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasHashes();
Assert.True(actual);
@@ -302,20 +324,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasHashes_SHA384_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = "XXXXXX",
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasHashes();
Assert.True(actual);
@@ -324,20 +348,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasHashes_SHA512_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = "XXXXXX",
+ SpamSum = string.Empty
+ };
bool actual = self.HasHashes();
Assert.True(actual);
@@ -346,20 +372,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasHashes_SpamSum_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, "XXXXXX");
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = "XXXXXX"
+ };
bool actual = self.HasHashes();
Assert.True(actual);
@@ -368,20 +396,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasHashes_All_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.CRCKey, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.CRC64Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.MD2Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.MD4Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.MD5Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.SHA1Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.SHA256Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.SHA384Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.SHA512Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, "XXXXXX");
+ Rom self = new Rom
+ {
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX"
+ };
bool actual = self.HasHashes();
Assert.True(actual);
@@ -402,20 +432,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasZeroHash_NonZeroHash_False()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.CRCKey, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.CRC64Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.MD2Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.MD4Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.MD5Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.SHA1Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.SHA256Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.SHA384Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.SHA512Key, "XXXXXX");
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, "XXXXXX");
+ Rom self = new Rom
+ {
+ CRC16 = "XXXXXX",
+ CRC = "XXXXXX",
+ CRC64 = "XXXXXX",
+ MD2 = "XXXXXX",
+ MD4 = "XXXXXX",
+ MD5 = "XXXXXX",
+ RIPEMD128 = "XXXXXX",
+ RIPEMD160 = "XXXXXX",
+ SHA1 = "XXXXXX",
+ SHA256 = "XXXXXX",
+ SHA384 = "XXXXXX",
+ SHA512 = "XXXXXX",
+ SpamSum = "XXXXXX"
+ };
bool actual = self.HasZeroHash();
Assert.False(actual);
@@ -424,20 +456,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasZeroHash_ZeroCRC16_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, HashType.CRC16.ZeroString);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = HashType.CRC16.ZeroString,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -446,20 +480,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasZeroHash_ZeroCRC_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, HashType.CRC32.ZeroString);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = HashType.CRC32.ZeroString,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -468,20 +504,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasZeroHash_ZeroCRC64_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, HashType.CRC64.ZeroString);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = HashType.CRC64.ZeroString,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -490,20 +528,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasZeroHash_ZeroMD2_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, HashType.MD2.ZeroString);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = HashType.MD2.ZeroString,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -512,20 +552,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasZeroHash_ZeroMD4_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, HashType.MD4.ZeroString);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = HashType.MD4.ZeroString,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -534,20 +576,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasZeroHash_ZeroMD5_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, HashType.MD5.ZeroString);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = HashType.MD5.ZeroString,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -556,20 +600,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasZeroHash_ZeroRIPEMD128_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, HashType.RIPEMD128.ZeroString);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = HashType.RIPEMD128.ZeroString,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -578,20 +624,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasZeroHash_ZeroRIPEMD160_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, HashType.RIPEMD160.ZeroString);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = HashType.RIPEMD160.ZeroString,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -600,20 +648,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasZeroHash_ZeroSHA1_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, HashType.SHA1.ZeroString);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = HashType.SHA1.ZeroString,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -622,20 +672,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasZeroHash_ZeroSHA256_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, HashType.SHA256.ZeroString);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = HashType.SHA256.ZeroString,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -644,20 +696,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasZeroHash_ZeroSHA384_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, HashType.SHA384.ZeroString);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = HashType.SHA384.ZeroString,
+ SHA512 = string.Empty,
+ SpamSum = string.Empty
+ };
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -666,20 +720,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasZeroHash_ZeroSHA512_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, HashType.SHA512.ZeroString);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, string.Empty);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = HashType.SHA512.ZeroString,
+ SpamSum = string.Empty
+ };
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -688,20 +744,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasZeroHash_ZeroSpamSum_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRCKey, string.Empty);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD2Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD4Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.MD5Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, string.Empty);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, HashType.SpamSum.ZeroString);
+ Rom self = new Rom
+ {
+ CRC16 = string.Empty,
+ CRC = string.Empty,
+ CRC64 = string.Empty,
+ MD2 = string.Empty,
+ MD4 = string.Empty,
+ MD5 = string.Empty,
+ RIPEMD128 = string.Empty,
+ RIPEMD160 = string.Empty,
+ SHA1 = string.Empty,
+ SHA256 = string.Empty,
+ SHA384 = string.Empty,
+ SHA512 = string.Empty,
+ SpamSum = HashType.SpamSum.ZeroString
+ };
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -710,20 +768,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
[Fact]
public void HasZeroHash_ZeroAll_True()
{
- Rom self = new Rom();
- self.Write(Data.Models.Metadata.Rom.CRC16Key, HashType.CRC16.ZeroString);
- self.Write(Data.Models.Metadata.Rom.CRCKey, HashType.CRC32.ZeroString);
- self.Write(Data.Models.Metadata.Rom.CRC64Key, HashType.CRC64.ZeroString);
- self.Write(Data.Models.Metadata.Rom.MD2Key, HashType.MD2.ZeroString);
- self.Write(Data.Models.Metadata.Rom.MD4Key, HashType.MD4.ZeroString);
- self.Write(Data.Models.Metadata.Rom.MD5Key, HashType.MD5.ZeroString);
- self.Write(Data.Models.Metadata.Rom.RIPEMD128Key, HashType.RIPEMD128.ZeroString);
- self.Write(Data.Models.Metadata.Rom.RIPEMD160Key, HashType.RIPEMD160.ZeroString);
- self.Write(Data.Models.Metadata.Rom.SHA1Key, HashType.SHA1.ZeroString);
- self.Write(Data.Models.Metadata.Rom.SHA256Key, HashType.SHA256.ZeroString);
- self.Write(Data.Models.Metadata.Rom.SHA384Key, HashType.SHA384.ZeroString);
- self.Write(Data.Models.Metadata.Rom.SHA512Key, HashType.SHA512.ZeroString);
- self.Write(Data.Models.Metadata.Rom.SpamSumKey, HashType.SpamSum.ZeroString);
+ Rom self = new Rom
+ {
+ CRC16 = HashType.CRC16.ZeroString,
+ CRC = HashType.CRC32.ZeroString,
+ CRC64 = HashType.CRC64.ZeroString,
+ MD2 = HashType.MD2.ZeroString,
+ MD4 = HashType.MD4.ZeroString,
+ MD5 = HashType.MD5.ZeroString,
+ RIPEMD128 = HashType.RIPEMD128.ZeroString,
+ RIPEMD160 = HashType.RIPEMD160.ZeroString,
+ SHA1 = HashType.SHA1.ZeroString,
+ SHA256 = HashType.SHA256.ZeroString,
+ SHA384 = HashType.SHA384.ZeroString,
+ SHA512 = HashType.SHA512.ZeroString,
+ SpamSum = HashType.SpamSum.ZeroString
+ };
bool actual = self.HasZeroHash();
Assert.True(actual);
@@ -801,20 +861,22 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
Machine machine = new Machine { Name = "Machine" };
- DatItem datItem = new Rom();
- datItem.Write(Data.Models.Metadata.Rom.CRC16Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.CRCKey, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.CRC64Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.MD2Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.MD4Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.MD5Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.RIPEMD128Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.RIPEMD160Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.SHA1Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.SHA256Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.SHA384Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.SHA512Key, "DEADBEEF");
- datItem.Write(Data.Models.Metadata.Rom.SpamSumKey, "DEADBEEF");
+ DatItem datItem = new Rom
+ {
+ CRC16 = "DEADBEEF",
+ CRC = "DEADBEEF",
+ CRC64 = "DEADBEEF",
+ MD2 = "DEADBEEF",
+ MD4 = "DEADBEEF",
+ MD5 = "DEADBEEF",
+ RIPEMD128 = "DEADBEEF",
+ RIPEMD160 = "DEADBEEF",
+ SHA1 = "DEADBEEF",
+ SHA256 = "DEADBEEF",
+ SHA384 = "DEADBEEF",
+ SHA512 = "DEADBEEF",
+ SpamSum = "DEADBEEF"
+ };
string actual = datItem.GetKey(bucketedBy, machine, source, lower, norename);
Assert.Equal(expected, actual);
diff --git a/SabreTools.Metadata.DatItems/Formats/File.cs b/SabreTools.Metadata.DatItems/Formats/File.cs
index af18a383..94b1f15a 100644
--- a/SabreTools.Metadata.DatItems/Formats/File.cs
+++ b/SabreTools.Metadata.DatItems/Formats/File.cs
@@ -149,10 +149,10 @@ namespace SabreTools.Metadata.DatItems.Formats
rom.Name = $"{Id}.{Extension}";
rom.Size = Size;
- rom.Write(Data.Models.Metadata.Rom.CRCKey, CRC);
- rom.Write(Data.Models.Metadata.Rom.MD5Key, MD5);
- rom.Write(Data.Models.Metadata.Rom.SHA1Key, SHA1);
- rom.Write(Data.Models.Metadata.Rom.SHA256Key, SHA256);
+ rom.CRC = CRC;
+ rom.MD5 = MD5;
+ rom.SHA1 = SHA1;
+ rom.SHA256 = SHA256;
rom.DupeType = DupeType;
rom.Machine = Machine?.Clone() as Machine;
diff --git a/SabreTools.Metadata.DatItems/Formats/Rom.cs b/SabreTools.Metadata.DatItems/Formats/Rom.cs
index 511b44b3..1c74c238 100644
--- a/SabreTools.Metadata.DatItems/Formats/Rom.cs
+++ b/SabreTools.Metadata.DatItems/Formats/Rom.cs
@@ -12,14 +12,110 @@ namespace SabreTools.Metadata.DatItems.Formats
[JsonObject("rom"), XmlRoot("rom")]
public sealed class Rom : DatItem
{
- #region Temporary Constants
-
- public const string OriginalKey = "ORIGINAL";
-
- #endregion
-
#region Properties
+ public string? Album
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Album;
+ set => (_internal as Data.Models.Metadata.Rom)?.Album = value;
+ }
+
+ public string? AltRomname
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.AltRomname;
+ set => (_internal as Data.Models.Metadata.Rom)?.AltRomname = value;
+ }
+
+ public string? AltTitle
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.AltTitle;
+ set => (_internal as Data.Models.Metadata.Rom)?.AltTitle = value;
+ }
+
+ public string? Artist
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Artist;
+ set => (_internal as Data.Models.Metadata.Rom)?.Artist = value;
+ }
+
+ public string? ASRDetectedLang
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.ASRDetectedLang;
+ set => (_internal as Data.Models.Metadata.Rom)?.ASRDetectedLang = value;
+ }
+
+ public string? ASRDetectedLangConf
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.ASRDetectedLangConf;
+ set => (_internal as Data.Models.Metadata.Rom)?.ASRDetectedLangConf = value;
+ }
+
+ public string? ASRTranscribedLang
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.ASRTranscribedLang;
+ set => (_internal as Data.Models.Metadata.Rom)?.ASRTranscribedLang = value;
+ }
+
+ public string? Bios
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Bios;
+ set => (_internal as Data.Models.Metadata.Rom)?.Bios = value;
+ }
+
+ public string? Bitrate
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Bitrate;
+ set => (_internal as Data.Models.Metadata.Rom)?.Bitrate = value;
+ }
+
+ public string? BitTorrentMagnetHash
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.BitTorrentMagnetHash;
+ set => (_internal as Data.Models.Metadata.Rom)?.BitTorrentMagnetHash = value;
+ }
+
+ public string? ClothCoverDetectionModuleVersion
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.ClothCoverDetectionModuleVersion;
+ set => (_internal as Data.Models.Metadata.Rom)?.ClothCoverDetectionModuleVersion = value;
+ }
+
+ public string? CollectionCatalogNumber
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.CollectionCatalogNumber;
+ set => (_internal as Data.Models.Metadata.Rom)?.CollectionCatalogNumber = value;
+ }
+
+ public string? Comment
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Comment;
+ set => (_internal as Data.Models.Metadata.Rom)?.Comment = value;
+ }
+
+ public string? CRC
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.CRC;
+ set => (_internal as Data.Models.Metadata.Rom)?.CRC = value;
+ }
+
+ public string? CRC16
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.CRC16;
+ set => (_internal as Data.Models.Metadata.Rom)?.CRC16 = value;
+ }
+
+ public string? CRC64
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.CRC64;
+ set => (_internal as Data.Models.Metadata.Rom)?.CRC64 = value;
+ }
+
+ public string? Creator
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Creator;
+ set => (_internal as Data.Models.Metadata.Rom)?.Creator = value;
+ }
+
public DataArea? DataArea { get; set; }
[JsonIgnore]
@@ -35,12 +131,24 @@ namespace SabreTools.Metadata.DatItems.Formats
}
}
+ public string? Date
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Date;
+ set => (_internal as Data.Models.Metadata.Rom)?.Date = value;
+ }
+
public bool? Dispose
{
get => (_internal as Data.Models.Metadata.Rom)?.Dispose;
set => (_internal as Data.Models.Metadata.Rom)?.Dispose = value;
}
+ public string? Extension
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Extension;
+ set => (_internal as Data.Models.Metadata.Rom)?.Extension = value;
+ }
+
public long? FileCount
{
get => (_internal as Data.Models.Metadata.Rom)?.FileCount;
@@ -53,21 +161,123 @@ namespace SabreTools.Metadata.DatItems.Formats
set => (_internal as Data.Models.Metadata.Rom)?.FileIsAvailable = value;
}
+ public string? Flags
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Flags;
+ set => (_internal as Data.Models.Metadata.Rom)?.Flags = value;
+ }
+
+ public string? Format
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Format;
+ set => (_internal as Data.Models.Metadata.Rom)?.Format = value;
+ }
+
+ public string? Header
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Header;
+ set => (_internal as Data.Models.Metadata.Rom)?.Header = value;
+ }
+
+ public string? Height
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Height;
+ set => (_internal as Data.Models.Metadata.Rom)?.Height = value;
+ }
+
+ public string? hOCRCharToWordhOCRVersion
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.hOCRCharToWordhOCRVersion;
+ set => (_internal as Data.Models.Metadata.Rom)?.hOCRCharToWordhOCRVersion = value;
+ }
+
+ public string? hOCRCharToWordModuleVersion
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.hOCRCharToWordModuleVersion;
+ set => (_internal as Data.Models.Metadata.Rom)?.hOCRCharToWordModuleVersion = value;
+ }
+
+ public string? hOCRFtsTexthOCRVersion
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.hOCRFtsTexthOCRVersion;
+ set => (_internal as Data.Models.Metadata.Rom)?.hOCRFtsTexthOCRVersion = value;
+ }
+
+ public string? hOCRFtsTextModuleVersion
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.hOCRFtsTextModuleVersion;
+ set => (_internal as Data.Models.Metadata.Rom)?.hOCRFtsTextModuleVersion = value;
+ }
+
+ public string? hOCRPageIndexhOCRVersion
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.hOCRPageIndexhOCRVersion;
+ set => (_internal as Data.Models.Metadata.Rom)?.hOCRPageIndexhOCRVersion = value;
+ }
+
+ public string? hOCRPageIndexModuleVersion
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.hOCRPageIndexModuleVersion;
+ set => (_internal as Data.Models.Metadata.Rom)?.hOCRPageIndexModuleVersion = value;
+ }
+
public bool? Inverted
{
get => (_internal as Data.Models.Metadata.Rom)?.Inverted;
set => (_internal as Data.Models.Metadata.Rom)?.Inverted = value;
}
+ public string? LastModifiedTime
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.LastModifiedTime;
+ set => (_internal as Data.Models.Metadata.Rom)?.LastModifiedTime = value;
+ }
+
/// />
public override ItemType ItemType => ItemType.Rom;
+ public string? Length
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Length;
+ set => (_internal as Data.Models.Metadata.Rom)?.Length = value;
+ }
+
public LoadFlag? LoadFlag
{
get => (_internal as Data.Models.Metadata.Rom)?.LoadFlag;
set => (_internal as Data.Models.Metadata.Rom)?.LoadFlag = value;
}
+ public string? MatrixNumber
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.MatrixNumber;
+ set => (_internal as Data.Models.Metadata.Rom)?.MatrixNumber = value;
+ }
+
+ public string? MD2
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.MD2;
+ set => (_internal as Data.Models.Metadata.Rom)?.MD2 = value;
+ }
+
+ public string? MD4
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.MD4;
+ set => (_internal as Data.Models.Metadata.Rom)?.MD4 = value;
+ }
+
+ public string? MD5
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.MD5;
+ set => (_internal as Data.Models.Metadata.Rom)?.MD5 = value;
+ }
+
+ public string? Merge
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Merge;
+ set => (_internal as Data.Models.Metadata.Rom)?.Merge = value;
+ }
+
public bool? MIA
{
get => (_internal as Data.Models.Metadata.Rom)?.MIA;
@@ -80,28 +290,41 @@ namespace SabreTools.Metadata.DatItems.Formats
set => (_internal as Data.Models.Metadata.Rom)?.Name = value;
}
+ public string? Offset
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Offset;
+ set => (_internal as Data.Models.Metadata.Rom)?.Offset = value;
+ }
+
+ public string? OpenMSXType
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.OpenMSXType;
+ set => (_internal as Data.Models.Metadata.Rom)?.OpenMSXType = value;
+ }
+
public OpenMSXSubType? OpenMSXMediaType
{
get => (_internal as Data.Models.Metadata.Rom)?.OpenMSXMediaType;
set => (_internal as Data.Models.Metadata.Rom)?.OpenMSXMediaType = value;
}
+ public Original? Original { get; set; }
+
+ public string? OriginalProperty
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Original;
+ set => (_internal as Data.Models.Metadata.Rom)?.Original = value;
+ }
+
+ [JsonIgnore]
+ public bool OriginalSpecified => Original is not null;
+
public bool? Optional
{
get => (_internal as Data.Models.Metadata.Rom)?.Optional;
set => (_internal as Data.Models.Metadata.Rom)?.Optional = value;
}
- [JsonIgnore]
- public bool OriginalSpecified
- {
- get
- {
- var original = Read(OriginalKey);
- return original is not null && original != default;
- }
- }
-
public Part? Part { get; set; }
[JsonIgnore]
@@ -115,6 +338,84 @@ namespace SabreTools.Metadata.DatItems.Formats
}
}
+ public string? PDFModuleVersion
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.PDFModuleVersion;
+ set => (_internal as Data.Models.Metadata.Rom)?.PDFModuleVersion = value;
+ }
+
+ public string? PreviewImage
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.PreviewImage;
+ set => (_internal as Data.Models.Metadata.Rom)?.PreviewImage = value;
+ }
+
+ public string? Publisher
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Publisher;
+ set => (_internal as Data.Models.Metadata.Rom)?.Publisher = value;
+ }
+
+ public string? Region
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Region;
+ set => (_internal as Data.Models.Metadata.Rom)?.Region = value;
+ }
+
+ public string? Remark
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Remark;
+ set => (_internal as Data.Models.Metadata.Rom)?.Remark = value;
+ }
+
+ public string? RIPEMD128
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.RIPEMD128;
+ set => (_internal as Data.Models.Metadata.Rom)?.RIPEMD128 = value;
+ }
+
+ public string? RIPEMD160
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.RIPEMD160;
+ set => (_internal as Data.Models.Metadata.Rom)?.RIPEMD160 = value;
+ }
+
+ public string? Rotation
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Rotation;
+ set => (_internal as Data.Models.Metadata.Rom)?.Rotation = value;
+ }
+
+ public string? Serial
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Serial;
+ set => (_internal as Data.Models.Metadata.Rom)?.Serial = value;
+ }
+
+ public string? SHA1
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.SHA1;
+ set => (_internal as Data.Models.Metadata.Rom)?.SHA1 = value;
+ }
+
+ public string? SHA256
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.SHA256;
+ set => (_internal as Data.Models.Metadata.Rom)?.SHA256 = value;
+ }
+
+ public string? SHA384
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.SHA384;
+ set => (_internal as Data.Models.Metadata.Rom)?.SHA384 = value;
+ }
+
+ public string? SHA512
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.SHA512;
+ set => (_internal as Data.Models.Metadata.Rom)?.SHA512 = value;
+ }
+
public long? Size
{
get => (_internal as Data.Models.Metadata.Rom)?.Size;
@@ -127,18 +428,204 @@ namespace SabreTools.Metadata.DatItems.Formats
set => (_internal as Data.Models.Metadata.Rom)?.SoundOnly = value;
}
+ public string? SourceProperty
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Source;
+ set => (_internal as Data.Models.Metadata.Rom)?.Source = value;
+ }
+
+ public string? SpamSum
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.SpamSum;
+ set => (_internal as Data.Models.Metadata.Rom)?.SpamSum = value;
+ }
+
+ public string? Start
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Start;
+ set => (_internal as Data.Models.Metadata.Rom)?.Start = value;
+ }
+
public ItemStatus? Status
{
get => (_internal as Data.Models.Metadata.Rom)?.Status;
set => (_internal as Data.Models.Metadata.Rom)?.Status = value;
}
+ public string? Summation
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Summation;
+ set => (_internal as Data.Models.Metadata.Rom)?.Summation = value;
+ }
+
+ public string? TesseractOCR
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.TesseractOCR;
+ set => (_internal as Data.Models.Metadata.Rom)?.TesseractOCR = value;
+ }
+
+ public string? TesseractOCRConverted
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.TesseractOCRConverted;
+ set => (_internal as Data.Models.Metadata.Rom)?.TesseractOCRConverted = value;
+ }
+
+ public string? TesseractOCRDetectedLang
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.TesseractOCRDetectedLang;
+ set => (_internal as Data.Models.Metadata.Rom)?.TesseractOCRDetectedLang = value;
+ }
+
+ public string? TesseractOCRDetectedLangConf
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.TesseractOCRDetectedLangConf;
+ set => (_internal as Data.Models.Metadata.Rom)?.TesseractOCRDetectedLangConf = value;
+ }
+
+ public string? TesseractOCRDetectedScript
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.TesseractOCRDetectedScript;
+ set => (_internal as Data.Models.Metadata.Rom)?.TesseractOCRDetectedScript = value;
+ }
+
+ public string? TesseractOCRDetectedScriptConf
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.TesseractOCRDetectedScriptConf;
+ set => (_internal as Data.Models.Metadata.Rom)?.TesseractOCRDetectedScriptConf = value;
+ }
+
+ public string? TesseractOCRModuleVersion
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.TesseractOCRModuleVersion;
+ set => (_internal as Data.Models.Metadata.Rom)?.TesseractOCRModuleVersion = value;
+ }
+
+ public string? TesseractOCRParameters
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.TesseractOCRParameters;
+ set => (_internal as Data.Models.Metadata.Rom)?.TesseractOCRParameters = value;
+ }
+
+ public string? Title
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Title;
+ set => (_internal as Data.Models.Metadata.Rom)?.Title = value;
+ }
+
+ public string? Track
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Track;
+ set => (_internal as Data.Models.Metadata.Rom)?.Track = value;
+ }
+
public string? Value
{
get => (_internal as Data.Models.Metadata.Rom)?.Value;
set => (_internal as Data.Models.Metadata.Rom)?.Value = value;
}
+ public string? WhisperASRModuleVersion
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.WhisperASRModuleVersion;
+ set => (_internal as Data.Models.Metadata.Rom)?.WhisperASRModuleVersion = value;
+ }
+
+ public string? WhisperModelHash
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.WhisperModelHash;
+ set => (_internal as Data.Models.Metadata.Rom)?.WhisperModelHash = value;
+ }
+
+ public string? WhisperModelName
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.WhisperModelName;
+ set => (_internal as Data.Models.Metadata.Rom)?.WhisperModelName = value;
+ }
+
+ public string? WhisperVersion
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.WhisperVersion;
+ set => (_internal as Data.Models.Metadata.Rom)?.WhisperVersion = value;
+ }
+
+ public string? Width
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.Width;
+ set => (_internal as Data.Models.Metadata.Rom)?.Width = value;
+ }
+
+ public string? WordConfidenceInterval0To10
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval0To10;
+ set => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval0To10 = value;
+ }
+
+ public string? WordConfidenceInterval11To20
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval11To20;
+ set => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval11To20 = value;
+ }
+
+ public string? WordConfidenceInterval21To30
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval21To30;
+ set => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval21To30 = value;
+ }
+
+ public string? WordConfidenceInterval31To40
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval31To40;
+ set => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval31To40 = value;
+ }
+
+ public string? WordConfidenceInterval41To50
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval41To50;
+ set => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval41To50 = value;
+ }
+
+ public string? WordConfidenceInterval51To60
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval51To60;
+ set => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval51To60 = value;
+ }
+
+ public string? WordConfidenceInterval61To70
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval61To70;
+ set => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval61To70 = value;
+ }
+
+ public string? WordConfidenceInterval71To80
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval71To80;
+ set => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval71To80 = value;
+ }
+
+ public string? WordConfidenceInterval81To90
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval81To90;
+ set => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval81To90 = value;
+ }
+
+ public string? WordConfidenceInterval91To100
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval91To100;
+ set => (_internal as Data.Models.Metadata.Rom)?.WordConfidenceInterval91To100 = value;
+ }
+
+ public string? xxHash364
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.xxHash364;
+ set => (_internal as Data.Models.Metadata.Rom)?.xxHash364 = value;
+ }
+
+ public string? xxHash3128
+ {
+ get => (_internal as Data.Models.Metadata.Rom)?.xxHash3128;
+ set => (_internal as Data.Models.Metadata.Rom)?.xxHash3128 = value;
+ }
+
#endregion
#region Constructors
@@ -175,79 +662,79 @@ namespace SabreTools.Metadata.DatItems.Formats
if (rom is null)
return;
- string name = $"{machine.Name}_{index++}{(!string.IsNullOrEmpty(rom!.ReadString(Data.Models.Metadata.Rom.RemarkKey)) ? $" {rom.ReadString(Data.Models.Metadata.Rom.RemarkKey)}" : string.Empty)}";
+ string name = $"{machine.Name}_{index++}{(!string.IsNullOrEmpty(rom!.Remark) ? $" {rom.Remark}" : string.Empty)}";
Name = name;
- Write(Data.Models.Metadata.Rom.OffsetKey, rom.ReadString(Data.Models.Metadata.Rom.StartKey));
+ Offset = rom.Start;
OpenMSXMediaType = subType;
- Write(Data.Models.Metadata.Rom.OpenMSXType, rom.ReadString(Data.Models.Metadata.Rom.OpenMSXType) ?? rom.ItemType.ToString());
- Write(Data.Models.Metadata.Rom.RemarkKey, rom.ReadString(Data.Models.Metadata.Rom.RemarkKey));
- Write(Data.Models.Metadata.Rom.SHA1Key, rom.ReadString(Data.Models.Metadata.Rom.SHA1Key));
- Write(Data.Models.Metadata.Rom.StartKey, rom.ReadString(Data.Models.Metadata.Rom.StartKey));
+ OpenMSXType = rom.ItemType.ToString();
+ Remark = rom.Remark;
+ SHA1 = rom.SHA1;
+ Start = rom.Start;
Source = source;
var original = item.Original;
if (original is not null)
{
- Write(OriginalKey, new Original
+ Original = new Original
{
Value = original.Value,
Content = original.Content,
- });
+ };
}
CopyMachineInformation(machine);
// Process hash values
// TODO: This should be normalized to CRC-16
- string? crc16 = ReadString(Data.Models.Metadata.Rom.CRC16Key);
+ string? crc16 = CRC16;
if (crc16 is not null)
- Write(Data.Models.Metadata.Rom.CRC16Key, NormalizeHashData(crc16, 4));
+ CRC16 = NormalizeHashData(crc16, 4);
- string? crc = ReadString(Data.Models.Metadata.Rom.CRCKey);
+ string? crc = CRC;
if (crc is not null)
- Write(Data.Models.Metadata.Rom.CRCKey, TextHelper.NormalizeCRC32(crc));
+ CRC = TextHelper.NormalizeCRC32(crc);
// TODO: This should be normalized to CRC-64
- string? crc64 = ReadString(Data.Models.Metadata.Rom.CRC64Key);
+ string? crc64 = CRC64;
if (crc64 is not null)
- Write(Data.Models.Metadata.Rom.CRC64Key, NormalizeHashData(crc64, 16));
+ CRC64 = NormalizeHashData(crc64, 16);
- string? md2 = ReadString(Data.Models.Metadata.Rom.MD2Key);
+ string? md2 = MD2;
if (md2 is not null)
- Write(Data.Models.Metadata.Rom.MD2Key, TextHelper.NormalizeMD2(md2));
+ MD2 = TextHelper.NormalizeMD2(md2);
- string? md4 = ReadString(Data.Models.Metadata.Rom.MD4Key);
+ string? md4 = MD4;
if (md4 is not null)
- Write(Data.Models.Metadata.Rom.MD4Key, TextHelper.NormalizeMD5(md4));
+ MD4 = TextHelper.NormalizeMD5(md4);
- string? md5 = ReadString(Data.Models.Metadata.Rom.MD5Key);
+ string? md5 = MD5;
if (md5 is not null)
- Write(Data.Models.Metadata.Rom.MD5Key, TextHelper.NormalizeMD5(md5));
+ MD5 = TextHelper.NormalizeMD5(md5);
- string? ripemd128 = ReadString(Data.Models.Metadata.Rom.RIPEMD128Key);
+ string? ripemd128 = RIPEMD128;
if (ripemd128 is not null)
- Write(Data.Models.Metadata.Rom.RIPEMD128Key, TextHelper.NormalizeRIPEMD128(ripemd128));
+ RIPEMD128 = TextHelper.NormalizeRIPEMD128(ripemd128);
- string? ripemd160 = ReadString(Data.Models.Metadata.Rom.RIPEMD160Key);
+ string? ripemd160 = RIPEMD160;
if (ripemd160 is not null)
- Write(Data.Models.Metadata.Rom.RIPEMD160Key, TextHelper.NormalizeRIPEMD160(ripemd160));
+ RIPEMD160 = TextHelper.NormalizeRIPEMD160(ripemd160);
- string? sha1 = ReadString(Data.Models.Metadata.Rom.SHA1Key);
+ string? sha1 = SHA1;
if (sha1 is not null)
- Write(Data.Models.Metadata.Rom.SHA1Key, TextHelper.NormalizeSHA1(sha1));
+ SHA1 = TextHelper.NormalizeSHA1(sha1);
- string? sha256 = ReadString(Data.Models.Metadata.Rom.SHA256Key);
+ string? sha256 = SHA256;
if (sha256 is not null)
- Write(Data.Models.Metadata.Rom.SHA256Key, TextHelper.NormalizeSHA256(sha256));
+ SHA256 = TextHelper.NormalizeSHA256(sha256);
- string? sha384 = ReadString(Data.Models.Metadata.Rom.SHA384Key);
+ string? sha384 = SHA384;
if (sha384 is not null)
- Write(Data.Models.Metadata.Rom.SHA384Key, TextHelper.NormalizeSHA384(sha384));
+ SHA384 = TextHelper.NormalizeSHA384(sha384);
- string? sha512 = ReadString(Data.Models.Metadata.Rom.SHA512Key);
+ string? sha512 = SHA512;
if (sha512 is not null)
- Write(Data.Models.Metadata.Rom.SHA512Key, TextHelper.NormalizeSHA512(sha512));
+ SHA512 = TextHelper.NormalizeSHA512(sha512);
}
public Rom(Data.Models.Metadata.Rom item) : base(item)
@@ -256,54 +743,54 @@ namespace SabreTools.Metadata.DatItems.Formats
// Process hash values
// TODO: This should be normalized to CRC-16
- string? crc16 = ReadString(Data.Models.Metadata.Rom.CRC16Key);
+ string? crc16 = CRC16;
if (crc16 is not null)
- Write(Data.Models.Metadata.Rom.CRC16Key, NormalizeHashData(crc16, 4));
+ CRC16 = NormalizeHashData(crc16, 4);
- string? crc = ReadString(Data.Models.Metadata.Rom.CRCKey);
+ string? crc = CRC;
if (crc is not null)
- Write(Data.Models.Metadata.Rom.CRCKey, TextHelper.NormalizeCRC32(crc));
+ CRC = TextHelper.NormalizeCRC32(crc);
// TODO: This should be normalized to CRC-64
- string? crc64 = ReadString(Data.Models.Metadata.Rom.CRC64Key);
+ string? crc64 = CRC64;
if (crc64 is not null)
- Write(Data.Models.Metadata.Rom.CRC64Key, NormalizeHashData(crc64, 16));
+ CRC64 = NormalizeHashData(crc64, 16);
- string? md2 = ReadString(Data.Models.Metadata.Rom.MD2Key);
+ string? md2 = MD2;
if (md2 is not null)
- Write(Data.Models.Metadata.Rom.MD2Key, TextHelper.NormalizeMD2(md2));
+ MD2 = TextHelper.NormalizeMD2(md2);
- string? md4 = ReadString(Data.Models.Metadata.Rom.MD4Key);
+ string? md4 = MD4;
if (md4 is not null)
- Write(Data.Models.Metadata.Rom.MD4Key, TextHelper.NormalizeMD5(md4));
+ MD4 = TextHelper.NormalizeMD5(md4);
- string? md5 = ReadString(Data.Models.Metadata.Rom.MD5Key);
+ string? md5 = MD5;
if (md5 is not null)
- Write(Data.Models.Metadata.Rom.MD5Key, TextHelper.NormalizeMD5(md5));
+ MD5 = TextHelper.NormalizeMD5(md5);
- string? ripemd128 = ReadString(Data.Models.Metadata.Rom.RIPEMD128Key);
+ string? ripemd128 = RIPEMD128;
if (ripemd128 is not null)
- Write(Data.Models.Metadata.Rom.RIPEMD128Key, TextHelper.NormalizeRIPEMD128(ripemd128));
+ RIPEMD128 = TextHelper.NormalizeRIPEMD128(ripemd128);
- string? ripemd160 = ReadString(Data.Models.Metadata.Rom.RIPEMD160Key);
+ string? ripemd160 = RIPEMD160;
if (ripemd160 is not null)
- Write(Data.Models.Metadata.Rom.RIPEMD160Key, TextHelper.NormalizeRIPEMD160(ripemd160));
+ RIPEMD160 = TextHelper.NormalizeRIPEMD160(ripemd160);
- string? sha1 = ReadString(Data.Models.Metadata.Rom.SHA1Key);
+ string? sha1 = SHA1;
if (sha1 is not null)
- Write(Data.Models.Metadata.Rom.SHA1Key, TextHelper.NormalizeSHA1(sha1));
+ SHA1 = TextHelper.NormalizeSHA1(sha1);
- string? sha256 = ReadString(Data.Models.Metadata.Rom.SHA256Key);
+ string? sha256 = SHA256;
if (sha256 is not null)
- Write(Data.Models.Metadata.Rom.SHA256Key, TextHelper.NormalizeSHA256(sha256));
+ SHA256 = TextHelper.NormalizeSHA256(sha256);
- string? sha384 = ReadString(Data.Models.Metadata.Rom.SHA384Key);
+ string? sha384 = SHA384;
if (sha384 is not null)
- Write(Data.Models.Metadata.Rom.SHA384Key, TextHelper.NormalizeSHA384(sha384));
+ SHA384 = TextHelper.NormalizeSHA384(sha384);
- string? sha512 = ReadString(Data.Models.Metadata.Rom.SHA512Key);
+ string? sha512 = SHA512;
if (sha512 is not null)
- Write(Data.Models.Metadata.Rom.SHA512Key, TextHelper.NormalizeSHA512(sha512));
+ SHA512 = TextHelper.NormalizeSHA512(sha512);
}
public Rom(Data.Models.Metadata.Rom item, Machine machine, Source source) : this(item)
@@ -512,55 +999,55 @@ namespace SabreTools.Metadata.DatItems.Formats
switch (bucketedBy)
{
case ItemKey.CRC16:
- key = ReadString(Data.Models.Metadata.Rom.CRC16Key);
+ key = CRC16;
break;
case ItemKey.CRC:
- key = ReadString(Data.Models.Metadata.Rom.CRCKey);
+ key = CRC;
break;
case ItemKey.CRC64:
- key = ReadString(Data.Models.Metadata.Rom.CRC64Key);
+ key = CRC64;
break;
case ItemKey.MD2:
- key = ReadString(Data.Models.Metadata.Rom.MD2Key);
+ key = MD2;
break;
case ItemKey.MD4:
- key = ReadString(Data.Models.Metadata.Rom.MD4Key);
+ key = MD4;
break;
case ItemKey.MD5:
- key = ReadString(Data.Models.Metadata.Rom.MD5Key);
+ key = MD5;
break;
case ItemKey.RIPEMD128:
- key = ReadString(Data.Models.Metadata.Rom.RIPEMD128Key);
+ key = RIPEMD128;
break;
case ItemKey.RIPEMD160:
- key = ReadString(Data.Models.Metadata.Rom.RIPEMD160Key);
+ key = RIPEMD160;
break;
case ItemKey.SHA1:
- key = ReadString(Data.Models.Metadata.Rom.SHA1Key);
+ key = SHA1;
break;
case ItemKey.SHA256:
- key = ReadString(Data.Models.Metadata.Rom.SHA256Key);
+ key = SHA256;
break;
case ItemKey.SHA384:
- key = ReadString(Data.Models.Metadata.Rom.SHA384Key);
+ key = SHA384;
break;
case ItemKey.SHA512:
- key = ReadString(Data.Models.Metadata.Rom.SHA512Key);
+ key = SHA512;
break;
case ItemKey.SpamSum:
- key = ReadString(Data.Models.Metadata.Rom.SpamSumKey);
+ key = SpamSum;
break;
// Let the base handle generic stuff
diff --git a/SabreTools.Metadata.Filter.Test/FilterRunnerTests.cs b/SabreTools.Metadata.Filter.Test/FilterRunnerTests.cs
index 29e258fe..303c1305 100644
--- a/SabreTools.Metadata.Filter.Test/FilterRunnerTests.cs
+++ b/SabreTools.Metadata.Filter.Test/FilterRunnerTests.cs
@@ -168,7 +168,7 @@ namespace SabreTools.Metadata.Filter.Test
DatItem datItem = new Rom
{
Name = "name",
- [Rom.CRCKey] = null,
+ CRC = null,
};
bool actual = _filterRunner.Run(datItem);
@@ -181,7 +181,7 @@ namespace SabreTools.Metadata.Filter.Test
DatItem datItem = new Rom
{
Name = "name",
- [Rom.CRCKey] = "",
+ CRC = "",
};
bool actual = _filterRunner.Run(datItem);
@@ -194,7 +194,7 @@ namespace SabreTools.Metadata.Filter.Test
DatItem datItem = new Rom
{
Name = "name",
- [Rom.CRCKey] = "NO_MATCH",
+ CRC = "NO_MATCH",
};
bool actual = _filterRunner.Run(datItem);
@@ -207,7 +207,7 @@ namespace SabreTools.Metadata.Filter.Test
DatItem datItem = new Rom
{
Name = "name",
- [Rom.CRCKey] = "crc",
+ CRC = "crc",
};
bool actual = _filterRunner.Run(datItem);
diff --git a/SabreTools.Metadata.Filter/FilterObject.cs b/SabreTools.Metadata.Filter/FilterObject.cs
index e040019f..08861adb 100644
--- a/SabreTools.Metadata.Filter/FilterObject.cs
+++ b/SabreTools.Metadata.Filter/FilterObject.cs
@@ -1215,45 +1215,294 @@ namespace SabreTools.Metadata.Filter
checkValue = item.Tool;
return true;
+ case Rom item when fieldName == "album":
+ checkValue = item.Album;
+ return true;
+ case Rom item when fieldName == "altromname":
+ checkValue = item.AltRomname;
+ return true;
+ case Rom item when fieldName == "alttitle":
+ checkValue = item.AltTitle;
+ return true;
+ case Rom item when fieldName == "artist":
+ checkValue = item.Artist;
+ return true;
+ case Rom item when fieldName == "asrdetectedlang":
+ checkValue = item.ASRDetectedLang;
+ return true;
+ case Rom item when fieldName == "asrdetectedlangconf":
+ checkValue = item.ASRDetectedLangConf;
+ return true;
+ case Rom item when fieldName == "asrtranscribedlang":
+ checkValue = item.ASRTranscribedLang;
+ return true;
+ case Rom item when fieldName == "bios":
+ checkValue = item.Bios;
+ return true;
+ case Rom item when fieldName == "bitrate":
+ checkValue = item.Bitrate;
+ return true;
+ case Rom item when fieldName == "bittorrentmagnethash":
+ checkValue = item.BitTorrentMagnetHash;
+ return true;
+ case Rom item when fieldName == "clothcoverdetectionmoduleversion":
+ checkValue = item.ClothCoverDetectionModuleVersion;
+ return true;
+ case Rom item when fieldName == "collectioncatalognumber":
+ checkValue = item.CollectionCatalogNumber;
+ return true;
+ case Rom item when fieldName == "comment":
+ checkValue = item.Comment;
+ return true;
+ case Rom item when fieldName == "crc":
+ checkValue = item.CRC;
+ return true;
+ case Rom item when fieldName == "crc16":
+ checkValue = item.CRC16;
+ return true;
+ case Rom item when fieldName == "crc64":
+ checkValue = item.CRC64;
+ return true;
+ case Rom item when fieldName == "creator":
+ checkValue = item.Creator;
+ return true;
+ case Rom item when fieldName == "date":
+ checkValue = item.Date;
+ return true;
case Rom item when fieldName == "dispose":
checkValue = item.Dispose.FromYesNo();
return true;
+ case Rom item when fieldName == "extension":
+ checkValue = item.Extension;
+ return true;
case Rom item when fieldName == "filecount":
checkValue = item.FileCount?.ToString();
return true;
case Rom item when fieldName == "fileisavailable":
checkValue = item.FileIsAvailable.FromYesNo();
return true;
+ case Rom item when fieldName == "flags":
+ checkValue = item.Flags;
+ return true;
+ case Rom item when fieldName == "format":
+ checkValue = item.Format;
+ return true;
+ case Rom item when fieldName == "header":
+ checkValue = item.Header;
+ return true;
+ case Rom item when fieldName == "height":
+ checkValue = item.Height;
+ return true;
+ case Rom item when fieldName == "hocrchartowordhocrversion":
+ checkValue = item.hOCRCharToWordhOCRVersion;
+ return true;
+ case Rom item when fieldName == "hocrchartowordmoduleversion":
+ checkValue = item.hOCRCharToWordModuleVersion;
+ return true;
+ case Rom item when fieldName == "hocrftstexthocrversion":
+ checkValue = item.hOCRFtsTexthOCRVersion;
+ return true;
+ case Rom item when fieldName == "hocrftstextmoduleversion":
+ checkValue = item.hOCRFtsTextModuleVersion;
+ return true;
+ case Rom item when fieldName == "hocrpageindexhocrversion":
+ checkValue = item.hOCRPageIndexhOCRVersion;
+ return true;
+ case Rom item when fieldName == "hocrpageindexmoduleversion":
+ checkValue = item.hOCRPageIndexModuleVersion;
+ return true;
case Rom item when fieldName == "inverted":
checkValue = item.Inverted.FromYesNo();
return true;
+ case Rom item when fieldName == "lastmodifiedtime":
+ checkValue = item.LastModifiedTime;
+ return true;
+ case Rom item when fieldName == "length":
+ checkValue = item.Length;
+ return true;
case Rom item when fieldName == "loadflag":
checkValue = item.LoadFlag?.AsStringValue();
return true;
+ case Rom item when fieldName == "matrixnumber":
+ checkValue = item.MatrixNumber;
+ return true;
+ case Rom item when fieldName == "md2":
+ checkValue = item.MD2;
+ return true;
+ case Rom item when fieldName == "md4":
+ checkValue = item.MD4;
+ return true;
+ case Rom item when fieldName == "md5":
+ checkValue = item.MD5;
+ return true;
case Rom item when fieldName == "mediatype":
checkValue = item.OpenMSXMediaType?.AsStringValue();
return true;
+ case Rom item when fieldName == "merge":
+ checkValue = item.Merge;
+ return true;
case Rom item when fieldName == "mia":
checkValue = item.MIA.FromYesNo();
return true;
case Rom item when fieldName == "name":
checkValue = item.Name;
return true;
+ case Rom item when fieldName == "offset":
+ checkValue = item.Offset;
+ return true;
case Rom item when fieldName == "optional":
checkValue = item.Optional.FromYesNo();
return true;
+ case Rom item when fieldName == "original":
+ checkValue = item.Original;
+ return true;
+ case Rom item when fieldName == "pdfmoduleversion":
+ checkValue = item.PDFModuleVersion;
+ return true;
+ case Rom item when fieldName == "previewimage":
+ checkValue = item.PreviewImage;
+ return true;
+ case Rom item when fieldName == "publisher":
+ checkValue = item.Publisher;
+ return true;
+ case Rom item when fieldName == "region":
+ checkValue = item.Region;
+ return true;
+ case Rom item when fieldName == "remark":
+ checkValue = item.Remark;
+ return true;
+ case Rom item when fieldName == "ripemd128":
+ checkValue = item.RIPEMD128;
+ return true;
+ case Rom item when fieldName == "ripemd160":
+ checkValue = item.RIPEMD160;
+ return true;
+ case Rom item when fieldName == "rotation":
+ checkValue = item.Rotation;
+ return true;
+ case Rom item when fieldName == "serial":
+ checkValue = item.Serial;
+ return true;
+ case Rom item when fieldName == "sha1":
+ checkValue = item.SHA1;
+ return true;
+ case Rom item when fieldName == "sha256":
+ checkValue = item.SHA256;
+ return true;
+ case Rom item when fieldName == "sha384":
+ checkValue = item.SHA384;
+ return true;
+ case Rom item when fieldName == "sha512":
+ checkValue = item.SHA512;
+ return true;
case Rom item when fieldName == "size":
checkValue = item.Size?.ToString();
return true;
case Rom item when fieldName == "soundonly":
checkValue = item.SoundOnly.FromYesNo();
return true;
+ case Rom item when fieldName == "source":
+ checkValue = item.Source;
+ return true;
+ case Rom item when fieldName == "spamsum":
+ checkValue = item.SpamSum;
+ return true;
+ case Rom item when fieldName == "start":
+ checkValue = item.Start;
+ return true;
case Rom item when fieldName == "status":
checkValue = item.Status?.AsStringValue();
return true;
+ case Rom item when fieldName == "summation":
+ checkValue = item.Summation;
+ return true;
+ case Rom item when fieldName == "tesseractocr":
+ checkValue = item.TesseractOCR;
+ return true;
+ case Rom item when fieldName == "tesseractocrconverted":
+ checkValue = item.TesseractOCRConverted;
+ return true;
+ case Rom item when fieldName == "tesseractocrdetectedlang":
+ checkValue = item.TesseractOCRDetectedLang;
+ return true;
+ case Rom item when fieldName == "tesseractocrdetectedlangconf":
+ checkValue = item.TesseractOCRDetectedLangConf;
+ return true;
+ case Rom item when fieldName == "tesseractocrdetectedscript":
+ checkValue = item.TesseractOCRDetectedScript;
+ return true;
+ case Rom item when fieldName == "tesseractocrdetectedscriptconf":
+ checkValue = item.TesseractOCRDetectedScriptConf;
+ return true;
+ case Rom item when fieldName == "tesseractocrmoduleversion":
+ checkValue = item.TesseractOCRModuleVersion;
+ return true;
+ case Rom item when fieldName == "tesseractocrparameters":
+ checkValue = item.TesseractOCRParameters;
+ return true;
+ case Rom item when fieldName == "title":
+ checkValue = item.Title;
+ return true;
+ case Rom item when fieldName == "track":
+ checkValue = item.Track;
+ return true;
+ case Rom item when fieldName == "openmsxtype":
+ checkValue = item.OpenMSXType;
+ return true;
case Rom item when fieldName == "value":
checkValue = item.Value;
return true;
+ case Rom item when fieldName == "whisperasrmoduleversion":
+ checkValue = item.WhisperASRModuleVersion;
+ return true;
+ case Rom item when fieldName == "whispermodelhash":
+ checkValue = item.WhisperModelHash;
+ return true;
+ case Rom item when fieldName == "whispermodelname":
+ checkValue = item.WhisperModelName;
+ return true;
+ case Rom item when fieldName == "whisperversion":
+ checkValue = item.WhisperVersion;
+ return true;
+ case Rom item when fieldName == "width":
+ checkValue = item.Width;
+ return true;
+ case Rom item when fieldName == "wordconfidenceinterval0to10":
+ checkValue = item.WordConfidenceInterval0To10;
+ return true;
+ case Rom item when fieldName == "wordconfidenceinterval11to20":
+ checkValue = item.WordConfidenceInterval11To20;
+ return true;
+ case Rom item when fieldName == "wordconfidenceinterval21to30":
+ checkValue = item.WordConfidenceInterval21To30;
+ return true;
+ case Rom item when fieldName == "wordconfidenceinterval31to40":
+ checkValue = item.WordConfidenceInterval31To40;
+ return true;
+ case Rom item when fieldName == "wordconfidenceinterval41to50":
+ checkValue = item.WordConfidenceInterval41To50;
+ return true;
+ case Rom item when fieldName == "wordconfidenceinterval51to60":
+ checkValue = item.WordConfidenceInterval51To60;
+ return true;
+ case Rom item when fieldName == "wordconfidenceinterval61to70":
+ checkValue = item.WordConfidenceInterval61To70;
+ return true;
+ case Rom item when fieldName == "wordconfidenceinterval71to80":
+ checkValue = item.WordConfidenceInterval71To80;
+ return true;
+ case Rom item when fieldName == "wordconfidenceinterval81to90":
+ checkValue = item.WordConfidenceInterval81To90;
+ return true;
+ case Rom item when fieldName == "wordconfidenceinterval91to100":
+ checkValue = item.WordConfidenceInterval91To100;
+ return true;
+ case Rom item when fieldName == "xxhash364":
+ checkValue = item.xxHash364;
+ return true;
+ case Rom item when fieldName == "xxhash3128":
+ checkValue = item.xxHash3128;
+ return true;
case Sample item when fieldName == "name":
checkValue = item.Name;
diff --git a/SabreTools.Metadata.Test/ModelBackedItemTests.cs b/SabreTools.Metadata.Test/ModelBackedItemTests.cs
index db2b764f..7ae485ee 100644
--- a/SabreTools.Metadata.Test/ModelBackedItemTests.cs
+++ b/SabreTools.Metadata.Test/ModelBackedItemTests.cs
@@ -222,7 +222,7 @@ namespace SabreTools.Metadata.Test
public void WriteWithValidation_MissingKey_False()
{
TestModelBackedItem? modelBackedItem = new TestModelBackedItem();
- string? fieldName = Rom.SHA1Key;
+ string? fieldName = "sha1";
object value = "value";
bool actual = modelBackedItem.WriteWithValidation(fieldName, value);
Assert.False(actual);
diff --git a/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Deserializer.cs b/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Deserializer.cs
index 8db234f7..eee8a59f 100644
--- a/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Deserializer.cs
@@ -45,68 +45,68 @@ namespace SabreTools.Serialization.CrossModel
var file = new File
{
Name = item.Name,
- Source = item.ReadString(Data.Models.Metadata.Rom.SourceKey),
- BitTorrentMagnetHash = item.ReadString(Data.Models.Metadata.Rom.BitTorrentMagnetHashKey),
- LastModifiedTime = item.ReadString(Data.Models.Metadata.Rom.LastModifiedTimeKey),
+ Source = item.Source,
+ BitTorrentMagnetHash = item.BitTorrentMagnetHash,
+ LastModifiedTime = item.LastModifiedTime,
Size = item.Size?.ToString(),
- MD5 = item.ReadString(Data.Models.Metadata.Rom.MD5Key),
- CRC32 = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
- SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
+ MD5 = item.MD5,
+ CRC32 = item.CRC,
+ SHA1 = item.SHA1,
FileCount = item.FileCount,
- Format = item.ReadString(Data.Models.Metadata.Rom.FormatKey),
- Original = item.ReadString(Data.Models.Metadata.Rom.OriginalKey),
- Summation = item.ReadString(Data.Models.Metadata.Rom.SummationKey),
- MatrixNumber = item.ReadString(Data.Models.Metadata.Rom.MatrixNumberKey),
- CollectionCatalogNumber = item.ReadString(Data.Models.Metadata.Rom.CollectionCatalogNumberKey),
- Publisher = item.ReadString(Data.Models.Metadata.Rom.PublisherKey),
- Comment = item.ReadString(Data.Models.Metadata.Rom.CommentKey),
+ Format = item.Format,
+ Original = item.Original,
+ Summation = item.Summation,
+ MatrixNumber = item.MatrixNumber,
+ CollectionCatalogNumber = item.CollectionCatalogNumber,
+ Publisher = item.Publisher,
+ Comment = item.Comment,
- ASRDetectedLang = item.ReadString(Data.Models.Metadata.Rom.ASRDetectedLangKey),
- ASRDetectedLangConf = item.ReadString(Data.Models.Metadata.Rom.ASRDetectedLangConfKey),
- ASRTranscribedLang = item.ReadString(Data.Models.Metadata.Rom.ASRTranscribedLangKey),
- WhisperASRModuleVersion = item.ReadString(Data.Models.Metadata.Rom.WhisperASRModuleVersionKey),
- WhisperModelHash = item.ReadString(Data.Models.Metadata.Rom.WhisperModelHashKey),
- WhisperModelName = item.ReadString(Data.Models.Metadata.Rom.WhisperModelNameKey),
- WhisperVersion = item.ReadString(Data.Models.Metadata.Rom.WhisperVersionKey),
+ ASRDetectedLang = item.ASRDetectedLang,
+ ASRDetectedLangConf = item.ASRDetectedLangConf,
+ ASRTranscribedLang = item.ASRTranscribedLang,
+ WhisperASRModuleVersion = item.WhisperASRModuleVersion,
+ WhisperModelHash = item.WhisperModelHash,
+ WhisperModelName = item.WhisperModelName,
+ WhisperVersion = item.WhisperVersion,
- ClothCoverDetectionModuleVersion = item.ReadString(Data.Models.Metadata.Rom.ClothCoverDetectionModuleVersionKey),
- hOCRCharToWordhOCRVersion = item.ReadString(Data.Models.Metadata.Rom.hOCRCharToWordhOCRVersionKey),
- hOCRCharToWordModuleVersion = item.ReadString(Data.Models.Metadata.Rom.hOCRCharToWordModuleVersionKey),
- hOCRFtsTexthOCRVersion = item.ReadString(Data.Models.Metadata.Rom.hOCRFtsTexthOCRVersionKey),
- hOCRFtsTextModuleVersion = item.ReadString(Data.Models.Metadata.Rom.hOCRFtsTextModuleVersionKey),
- hOCRPageIndexhOCRVersion = item.ReadString(Data.Models.Metadata.Rom.hOCRPageIndexhOCRVersionKey),
- hOCRPageIndexModuleVersion = item.ReadString(Data.Models.Metadata.Rom.hOCRPageIndexModuleVersionKey),
- TesseractOCR = item.ReadString(Data.Models.Metadata.Rom.TesseractOCRKey),
- TesseractOCRConverted = item.ReadString(Data.Models.Metadata.Rom.TesseractOCRConvertedKey),
- TesseractOCRDetectedLang = item.ReadString(Data.Models.Metadata.Rom.TesseractOCRDetectedLangKey),
- TesseractOCRDetectedLangConf = item.ReadString(Data.Models.Metadata.Rom.TesseractOCRDetectedLangConfKey),
- TesseractOCRDetectedScript = item.ReadString(Data.Models.Metadata.Rom.TesseractOCRDetectedScriptKey),
- TesseractOCRDetectedScriptConf = item.ReadString(Data.Models.Metadata.Rom.TesseractOCRDetectedScriptConfKey),
- TesseractOCRModuleVersion = item.ReadString(Data.Models.Metadata.Rom.TesseractOCRModuleVersionKey),
- TesseractOCRParameters = item.ReadString(Data.Models.Metadata.Rom.TesseractOCRParametersKey),
- PDFModuleVersion = item.ReadString(Data.Models.Metadata.Rom.PDFModuleVersionKey),
- WordConfidenceInterval0To10 = item.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval0To10Key),
- WordConfidenceInterval11To20 = item.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval11To20Key),
- WordConfidenceInterval21To30 = item.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval21To30Key),
- WordConfidenceInterval31To40 = item.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval31To40Key),
- WordConfidenceInterval41To50 = item.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval41To50Key),
- WordConfidenceInterval51To60 = item.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval51To60Key),
- WordConfidenceInterval61To70 = item.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval61To70Key),
- WordConfidenceInterval71To80 = item.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval71To80Key),
- WordConfidenceInterval81To90 = item.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval81To90Key),
- WordConfidenceInterval91To100 = item.ReadString(Data.Models.Metadata.Rom.WordConfidenceInterval91To100Key),
+ ClothCoverDetectionModuleVersion = item.ClothCoverDetectionModuleVersion,
+ hOCRCharToWordhOCRVersion = item.hOCRCharToWordhOCRVersion,
+ hOCRCharToWordModuleVersion = item.hOCRCharToWordModuleVersion,
+ hOCRFtsTexthOCRVersion = item.hOCRFtsTexthOCRVersion,
+ hOCRFtsTextModuleVersion = item.hOCRFtsTextModuleVersion,
+ hOCRPageIndexhOCRVersion = item.hOCRPageIndexhOCRVersion,
+ hOCRPageIndexModuleVersion = item.hOCRPageIndexModuleVersion,
+ TesseractOCR = item.TesseractOCR,
+ TesseractOCRConverted = item.TesseractOCRConverted,
+ TesseractOCRDetectedLang = item.TesseractOCRDetectedLang,
+ TesseractOCRDetectedLangConf = item.TesseractOCRDetectedLangConf,
+ TesseractOCRDetectedScript = item.TesseractOCRDetectedScript,
+ TesseractOCRDetectedScriptConf = item.TesseractOCRDetectedScriptConf,
+ TesseractOCRModuleVersion = item.TesseractOCRModuleVersion,
+ TesseractOCRParameters = item.TesseractOCRParameters,
+ PDFModuleVersion = item.PDFModuleVersion,
+ WordConfidenceInterval0To10 = item.WordConfidenceInterval0To10,
+ WordConfidenceInterval11To20 = item.WordConfidenceInterval11To20,
+ WordConfidenceInterval21To30 = item.WordConfidenceInterval21To30,
+ WordConfidenceInterval31To40 = item.WordConfidenceInterval31To40,
+ WordConfidenceInterval41To50 = item.WordConfidenceInterval41To50,
+ WordConfidenceInterval51To60 = item.WordConfidenceInterval51To60,
+ WordConfidenceInterval61To70 = item.WordConfidenceInterval61To70,
+ WordConfidenceInterval71To80 = item.WordConfidenceInterval71To80,
+ WordConfidenceInterval81To90 = item.WordConfidenceInterval81To90,
+ WordConfidenceInterval91To100 = item.WordConfidenceInterval91To100,
- Album = item.ReadString(Data.Models.Metadata.Rom.AlbumKey),
- Artist = item.ReadString(Data.Models.Metadata.Rom.ArtistKey),
- Bitrate = item.ReadString(Data.Models.Metadata.Rom.BitrateKey),
- Creator = item.ReadString(Data.Models.Metadata.Rom.CreatorKey),
- Height = item.ReadString(Data.Models.Metadata.Rom.HeightKey),
- Length = item.ReadString(Data.Models.Metadata.Rom.LengthKey),
- PreviewImage = item.ReadString(Data.Models.Metadata.Rom.PreviewImageKey),
- Rotation = item.ReadString(Data.Models.Metadata.Rom.RotationKey),
- Title = item.ReadString(Data.Models.Metadata.Rom.TitleKey),
- Track = item.ReadString(Data.Models.Metadata.Rom.TrackKey),
- Width = item.ReadString(Data.Models.Metadata.Rom.WidthKey),
+ Album = item.Album,
+ Artist = item.Artist,
+ Bitrate = item.Bitrate,
+ Creator = item.Creator,
+ Height = item.Height,
+ Length = item.Length,
+ PreviewImage = item.PreviewImage,
+ Rotation = item.Rotation,
+ Title = item.Title,
+ Track = item.Track,
+ Width = item.Width,
};
return file;
}
diff --git a/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Serializer.cs b/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Serializer.cs
index d8cca52d..ee636f3e 100644
--- a/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/ArchiveDotOrg.Serializer.cs
@@ -60,68 +60,68 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Data.Models.Metadata.Rom
{
Name = item.Name,
- [Data.Models.Metadata.Rom.SourceKey] = item.Source,
- [Data.Models.Metadata.Rom.BitTorrentMagnetHashKey] = item.BitTorrentMagnetHash,
- [Data.Models.Metadata.Rom.LastModifiedTimeKey] = item.LastModifiedTime,
+ Source = item.Source,
+ BitTorrentMagnetHash = item.BitTorrentMagnetHash,
+ LastModifiedTime = item.LastModifiedTime,
Size = NumberHelper.ConvertToInt64(item.Size),
- [Data.Models.Metadata.Rom.MD5Key] = item.MD5,
- [Data.Models.Metadata.Rom.CRCKey] = item.CRC32,
- [Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,
+ MD5 = item.MD5,
+ CRC = item.CRC32,
+ SHA1 = item.SHA1,
FileCount = item.FileCount,
- [Data.Models.Metadata.Rom.FormatKey] = item.Format,
- [Data.Models.Metadata.Rom.OriginalKey] = item.Original,
- [Data.Models.Metadata.Rom.SummationKey] = item.Summation,
- [Data.Models.Metadata.Rom.MatrixNumberKey] = item.MatrixNumber,
- [Data.Models.Metadata.Rom.CollectionCatalogNumberKey] = item.CollectionCatalogNumber,
- [Data.Models.Metadata.Rom.PublisherKey] = item.Publisher,
- [Data.Models.Metadata.Rom.CommentKey] = item.Comment,
+ Format = item.Format,
+ Original = item.Original,
+ Summation = item.Summation,
+ MatrixNumber = item.MatrixNumber,
+ CollectionCatalogNumber = item.CollectionCatalogNumber,
+ Publisher = item.Publisher,
+ Comment = item.Comment,
- [Data.Models.Metadata.Rom.ASRDetectedLangKey] = item.ASRDetectedLang,
- [Data.Models.Metadata.Rom.ASRDetectedLangConfKey] = item.ASRDetectedLangConf,
- [Data.Models.Metadata.Rom.ASRTranscribedLangKey] = item.ASRTranscribedLang,
- [Data.Models.Metadata.Rom.WhisperASRModuleVersionKey] = item.WhisperASRModuleVersion,
- [Data.Models.Metadata.Rom.WhisperModelHashKey] = item.WhisperModelHash,
- [Data.Models.Metadata.Rom.WhisperModelNameKey] = item.WhisperModelName,
- [Data.Models.Metadata.Rom.WhisperVersionKey] = item.WhisperVersion,
+ ASRDetectedLang = item.ASRDetectedLang,
+ ASRDetectedLangConf = item.ASRDetectedLangConf,
+ ASRTranscribedLang = item.ASRTranscribedLang,
+ WhisperASRModuleVersion = item.WhisperASRModuleVersion,
+ WhisperModelHash = item.WhisperModelHash,
+ WhisperModelName = item.WhisperModelName,
+ WhisperVersion = item.WhisperVersion,
- [Data.Models.Metadata.Rom.ClothCoverDetectionModuleVersionKey] = item.ClothCoverDetectionModuleVersion,
- [Data.Models.Metadata.Rom.hOCRCharToWordhOCRVersionKey] = item.hOCRCharToWordhOCRVersion,
- [Data.Models.Metadata.Rom.hOCRCharToWordModuleVersionKey] = item.hOCRCharToWordModuleVersion,
- [Data.Models.Metadata.Rom.hOCRFtsTexthOCRVersionKey] = item.hOCRFtsTexthOCRVersion,
- [Data.Models.Metadata.Rom.hOCRFtsTextModuleVersionKey] = item.hOCRFtsTextModuleVersion,
- [Data.Models.Metadata.Rom.hOCRPageIndexhOCRVersionKey] = item.hOCRPageIndexhOCRVersion,
- [Data.Models.Metadata.Rom.hOCRPageIndexModuleVersionKey] = item.hOCRPageIndexModuleVersion,
- [Data.Models.Metadata.Rom.TesseractOCRKey] = item.TesseractOCR,
- [Data.Models.Metadata.Rom.TesseractOCRConvertedKey] = item.TesseractOCRConverted,
- [Data.Models.Metadata.Rom.TesseractOCRDetectedLangKey] = item.TesseractOCRDetectedLang,
- [Data.Models.Metadata.Rom.TesseractOCRDetectedLangConfKey] = item.TesseractOCRDetectedLangConf,
- [Data.Models.Metadata.Rom.TesseractOCRDetectedScriptKey] = item.TesseractOCRDetectedScript,
- [Data.Models.Metadata.Rom.TesseractOCRDetectedScriptConfKey] = item.TesseractOCRDetectedScriptConf,
- [Data.Models.Metadata.Rom.TesseractOCRModuleVersionKey] = item.TesseractOCRModuleVersion,
- [Data.Models.Metadata.Rom.TesseractOCRParametersKey] = item.TesseractOCRParameters,
- [Data.Models.Metadata.Rom.PDFModuleVersionKey] = item.PDFModuleVersion,
- [Data.Models.Metadata.Rom.WordConfidenceInterval0To10Key] = item.WordConfidenceInterval0To10,
- [Data.Models.Metadata.Rom.WordConfidenceInterval11To20Key] = item.WordConfidenceInterval11To20,
- [Data.Models.Metadata.Rom.WordConfidenceInterval21To30Key] = item.WordConfidenceInterval21To30,
- [Data.Models.Metadata.Rom.WordConfidenceInterval31To40Key] = item.WordConfidenceInterval31To40,
- [Data.Models.Metadata.Rom.WordConfidenceInterval41To50Key] = item.WordConfidenceInterval41To50,
- [Data.Models.Metadata.Rom.WordConfidenceInterval51To60Key] = item.WordConfidenceInterval51To60,
- [Data.Models.Metadata.Rom.WordConfidenceInterval61To70Key] = item.WordConfidenceInterval61To70,
- [Data.Models.Metadata.Rom.WordConfidenceInterval71To80Key] = item.WordConfidenceInterval71To80,
- [Data.Models.Metadata.Rom.WordConfidenceInterval81To90Key] = item.WordConfidenceInterval81To90,
- [Data.Models.Metadata.Rom.WordConfidenceInterval91To100Key] = item.WordConfidenceInterval91To100,
+ ClothCoverDetectionModuleVersion = item.ClothCoverDetectionModuleVersion,
+ hOCRCharToWordhOCRVersion = item.hOCRCharToWordhOCRVersion,
+ hOCRCharToWordModuleVersion = item.hOCRCharToWordModuleVersion,
+ hOCRFtsTexthOCRVersion = item.hOCRFtsTexthOCRVersion,
+ hOCRFtsTextModuleVersion = item.hOCRFtsTextModuleVersion,
+ hOCRPageIndexhOCRVersion = item.hOCRPageIndexhOCRVersion,
+ hOCRPageIndexModuleVersion = item.hOCRPageIndexModuleVersion,
+ TesseractOCR = item.TesseractOCR,
+ TesseractOCRConverted = item.TesseractOCRConverted,
+ TesseractOCRDetectedLang = item.TesseractOCRDetectedLang,
+ TesseractOCRDetectedLangConf = item.TesseractOCRDetectedLangConf,
+ TesseractOCRDetectedScript = item.TesseractOCRDetectedScript,
+ TesseractOCRDetectedScriptConf = item.TesseractOCRDetectedScriptConf,
+ TesseractOCRModuleVersion = item.TesseractOCRModuleVersion,
+ TesseractOCRParameters = item.TesseractOCRParameters,
+ PDFModuleVersion = item.PDFModuleVersion,
+ WordConfidenceInterval0To10 = item.WordConfidenceInterval0To10,
+ WordConfidenceInterval11To20 = item.WordConfidenceInterval11To20,
+ WordConfidenceInterval21To30 = item.WordConfidenceInterval21To30,
+ WordConfidenceInterval31To40 = item.WordConfidenceInterval31To40,
+ WordConfidenceInterval41To50 = item.WordConfidenceInterval41To50,
+ WordConfidenceInterval51To60 = item.WordConfidenceInterval51To60,
+ WordConfidenceInterval61To70 = item.WordConfidenceInterval61To70,
+ WordConfidenceInterval71To80 = item.WordConfidenceInterval71To80,
+ WordConfidenceInterval81To90 = item.WordConfidenceInterval81To90,
+ WordConfidenceInterval91To100 = item.WordConfidenceInterval91To100,
- [Data.Models.Metadata.Rom.AlbumKey] = item.Album,
- [Data.Models.Metadata.Rom.ArtistKey] = item.Artist,
- [Data.Models.Metadata.Rom.BitrateKey] = item.Bitrate,
- [Data.Models.Metadata.Rom.CreatorKey] = item.Creator,
- [Data.Models.Metadata.Rom.HeightKey] = item.Height,
- [Data.Models.Metadata.Rom.LengthKey] = item.Length,
- [Data.Models.Metadata.Rom.PreviewImageKey] = item.PreviewImage,
- [Data.Models.Metadata.Rom.RotationKey] = item.Rotation,
- [Data.Models.Metadata.Rom.TitleKey] = item.Title,
- [Data.Models.Metadata.Rom.TrackKey] = item.Track,
- [Data.Models.Metadata.Rom.WidthKey] = item.Width,
+ Album = item.Album,
+ Artist = item.Artist,
+ Bitrate = item.Bitrate,
+ Creator = item.Creator,
+ Height = item.Height,
+ Length = item.Length,
+ PreviewImage = item.PreviewImage,
+ Rotation = item.Rotation,
+ Title = item.Title,
+ Track = item.Track,
+ Width = item.Width,
};
return rom;
}
diff --git a/SabreTools.Serialization.CrossModel/AttractMode.Deserializer.cs b/SabreTools.Serialization.CrossModel/AttractMode.Deserializer.cs
index dfd38d2f..fe22f5dd 100644
--- a/SabreTools.Serialization.CrossModel/AttractMode.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/AttractMode.Deserializer.cs
@@ -70,8 +70,8 @@ namespace SabreTools.Serialization.CrossModel
Status = parent.Status,
DisplayCount = parent.DisplayCount,
DisplayType = parent.DisplayType,
- AltRomname = item.ReadString(Data.Models.Metadata.Rom.AltRomnameKey),
- AltTitle = item.ReadString(Data.Models.Metadata.Rom.AltTitleKey),
+ AltRomname = item.AltRomname,
+ AltTitle = item.AltTitle,
Extra = parent.Extra,
Buttons = parent.Buttons,
Favorite = parent.Favorite,
diff --git a/SabreTools.Serialization.CrossModel/AttractMode.Serializer.cs b/SabreTools.Serialization.CrossModel/AttractMode.Serializer.cs
index 0e42ad1d..a2c6cd55 100644
--- a/SabreTools.Serialization.CrossModel/AttractMode.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/AttractMode.Serializer.cs
@@ -72,8 +72,8 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Data.Models.Metadata.Rom
{
Name = item.Title,
- [Data.Models.Metadata.Rom.AltRomnameKey] = item.AltRomname,
- [Data.Models.Metadata.Rom.AltTitleKey] = item.AltTitle,
+ AltRomname = item.AltRomname,
+ AltTitle = item.AltTitle,
FileIsAvailable = item.FileIsAvailable,
};
return rom;
diff --git a/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs b/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs
index 0b4d0200..667e177c 100644
--- a/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/ClrMamePro.Deserializer.cs
@@ -277,29 +277,29 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
Size = item.Size,
- CRC16 = item.ReadString(Data.Models.Metadata.Rom.CRC16Key),
- CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
- CRC64 = item.ReadString(Data.Models.Metadata.Rom.CRC64Key),
- MD2 = item.ReadString(Data.Models.Metadata.Rom.MD2Key),
- MD4 = item.ReadString(Data.Models.Metadata.Rom.MD4Key),
- MD5 = item.ReadString(Data.Models.Metadata.Rom.MD5Key),
- RIPEMD128 = item.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key),
- RIPEMD160 = item.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key),
- SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
- SHA256 = item.ReadString(Data.Models.Metadata.Rom.SHA256Key),
- SHA384 = item.ReadString(Data.Models.Metadata.Rom.SHA384Key),
- SHA512 = item.ReadString(Data.Models.Metadata.Rom.SHA512Key),
- SpamSum = item.ReadString(Data.Models.Metadata.Rom.SpamSumKey),
- xxHash364 = item.ReadString(Data.Models.Metadata.Rom.xxHash364Key),
- xxHash3128 = item.ReadString(Data.Models.Metadata.Rom.xxHash3128Key),
- Merge = item.ReadString(Data.Models.Metadata.Rom.MergeKey),
+ CRC16 = item.CRC16,
+ CRC = item.CRC,
+ CRC64 = item.CRC64,
+ MD2 = item.MD2,
+ MD4 = item.MD4,
+ MD5 = item.MD5,
+ RIPEMD128 = item.RIPEMD128,
+ RIPEMD160 = item.RIPEMD160,
+ SHA1 = item.SHA1,
+ SHA256 = item.SHA256,
+ SHA384 = item.SHA384,
+ SHA512 = item.SHA512,
+ SpamSum = item.SpamSum,
+ xxHash364 = item.xxHash364,
+ xxHash3128 = item.xxHash3128,
+ Merge = item.Merge,
Status = item.Status,
- Region = item.ReadString(Data.Models.Metadata.Rom.RegionKey),
- Flags = item.ReadString(Data.Models.Metadata.Rom.FlagsKey),
- Offs = item.ReadString(Data.Models.Metadata.Rom.OffsetKey),
- Serial = item.ReadString(Data.Models.Metadata.Rom.SerialKey),
- Header = item.ReadString(Data.Models.Metadata.Rom.HeaderKey),
- Date = item.ReadString(Data.Models.Metadata.Rom.DateKey),
+ Region = item.Region,
+ Flags = item.Flags,
+ Offs = item.Offset,
+ Serial = item.Serial,
+ Header = item.Header,
+ Date = item.Date,
Inverted = item.Inverted,
MIA = item.MIA,
};
diff --git a/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs b/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs
index 3aefbebf..1bb8856c 100644
--- a/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/ClrMamePro.Serializer.cs
@@ -257,29 +257,29 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
Size = item.Size,
- [Data.Models.Metadata.Rom.CRC16Key] = item.CRC16,
- [Data.Models.Metadata.Rom.CRCKey] = item.CRC,
- [Data.Models.Metadata.Rom.CRC64Key] = item.CRC64,
- [Data.Models.Metadata.Rom.MD2Key] = item.MD2,
- [Data.Models.Metadata.Rom.MD4Key] = item.MD4,
- [Data.Models.Metadata.Rom.MD5Key] = item.MD5,
- [Data.Models.Metadata.Rom.RIPEMD128Key] = item.RIPEMD128,
- [Data.Models.Metadata.Rom.RIPEMD160Key] = item.RIPEMD160,
- [Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,
- [Data.Models.Metadata.Rom.SHA256Key] = item.SHA256,
- [Data.Models.Metadata.Rom.SHA384Key] = item.SHA384,
- [Data.Models.Metadata.Rom.SHA512Key] = item.SHA512,
- [Data.Models.Metadata.Rom.SpamSumKey] = item.SpamSum,
- [Data.Models.Metadata.Rom.xxHash364Key] = item.xxHash364,
- [Data.Models.Metadata.Rom.xxHash3128Key] = item.xxHash3128,
- [Data.Models.Metadata.Rom.MergeKey] = item.Merge,
+ CRC16 = item.CRC16,
+ CRC = item.CRC,
+ CRC64 = item.CRC64,
+ MD2 = item.MD2,
+ MD4 = item.MD4,
+ MD5 = item.MD5,
+ RIPEMD128 = item.RIPEMD128,
+ RIPEMD160 = item.RIPEMD160,
+ SHA1 = item.SHA1,
+ SHA256 = item.SHA256,
+ SHA384 = item.SHA384,
+ SHA512 = item.SHA512,
+ SpamSum = item.SpamSum,
+ xxHash364 = item.xxHash364,
+ xxHash3128 = item.xxHash3128,
+ Merge = item.Merge,
Status = item.Status,
- [Data.Models.Metadata.Rom.RegionKey] = item.Region,
- [Data.Models.Metadata.Rom.FlagsKey] = item.Flags,
- [Data.Models.Metadata.Rom.OffsetKey] = item.Offs,
- [Data.Models.Metadata.Rom.SerialKey] = item.Serial,
- [Data.Models.Metadata.Rom.HeaderKey] = item.Header,
- [Data.Models.Metadata.Rom.DateKey] = item.Date,
+ Region = item.Region,
+ Flags = item.Flags,
+ Offset = item.Offs,
+ Serial = item.Serial,
+ Header = item.Header,
+ Date = item.Date,
Inverted = item.Inverted,
MIA = item.MIA,
};
diff --git a/SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs b/SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs
index e3ea96f1..383ff648 100644
--- a/SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/DosCenter.Deserializer.cs
@@ -68,9 +68,9 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
Size = item.Size,
- CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
- SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
- Date = item.ReadString(Data.Models.Metadata.Rom.DateKey),
+ CRC = item.CRC,
+ SHA1 = item.SHA1,
+ Date = item.Date,
};
return file;
}
diff --git a/SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs b/SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs
index de188ae3..92ef0e0e 100644
--- a/SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/DosCenter.Serializer.cs
@@ -65,9 +65,9 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
Size = item.Size,
- [Data.Models.Metadata.Rom.CRCKey] = item.CRC,
- [Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,
- [Data.Models.Metadata.Rom.DateKey] = item.Date,
+ CRC = item.CRC,
+ SHA1 = item.SHA1,
+ Date = item.Date,
};
return rom;
}
diff --git a/SabreTools.Serialization.CrossModel/EverdriveSMDB.Deserializer.cs b/SabreTools.Serialization.CrossModel/EverdriveSMDB.Deserializer.cs
index cf3e9c11..82a1d20a 100644
--- a/SabreTools.Serialization.CrossModel/EverdriveSMDB.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/EverdriveSMDB.Deserializer.cs
@@ -45,11 +45,11 @@ namespace SabreTools.Serialization.CrossModel
{
var row = new Row
{
- SHA256 = item.ReadString(Data.Models.Metadata.Rom.SHA256Key),
+ SHA256 = item.SHA256,
Name = item.Name,
- SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
- MD5 = item.ReadString(Data.Models.Metadata.Rom.MD5Key),
- CRC32 = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
+ SHA1 = item.SHA1,
+ MD5 = item.MD5,
+ CRC32 = item.CRC,
Size = item.Size,
};
return row;
diff --git a/SabreTools.Serialization.CrossModel/EverdriveSMDB.Serializer.cs b/SabreTools.Serialization.CrossModel/EverdriveSMDB.Serializer.cs
index 39e0029e..17d1b864 100644
--- a/SabreTools.Serialization.CrossModel/EverdriveSMDB.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/EverdriveSMDB.Serializer.cs
@@ -53,11 +53,11 @@ namespace SabreTools.Serialization.CrossModel
{
var rom = new Data.Models.Metadata.Rom
{
- [Data.Models.Metadata.Rom.SHA256Key] = item.SHA256,
+ SHA256 = item.SHA256,
Name = item.Name,
- [Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,
- [Data.Models.Metadata.Rom.MD5Key] = item.MD5,
- [Data.Models.Metadata.Rom.CRCKey] = item.CRC32,
+ SHA1 = item.SHA1,
+ MD5 = item.MD5,
+ CRC = item.CRC32,
Size = item.Size,
};
return rom;
diff --git a/SabreTools.Serialization.CrossModel/Hashfile.Deserializer.cs b/SabreTools.Serialization.CrossModel/Hashfile.Deserializer.cs
index 73687d69..0d46bd9b 100644
--- a/SabreTools.Serialization.CrossModel/Hashfile.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/Hashfile.Deserializer.cs
@@ -145,7 +145,7 @@ namespace SabreTools.Serialization.CrossModel
{
var md2 = new MD2
{
- Hash = item.ReadString(Data.Models.Metadata.Rom.MD2Key),
+ Hash = item.MD2,
File = item.Name,
};
return md2;
@@ -158,7 +158,7 @@ namespace SabreTools.Serialization.CrossModel
{
var md4 = new MD4
{
- Hash = item.ReadString(Data.Models.Metadata.Rom.MD4Key),
+ Hash = item.MD4,
File = item.Name,
};
return md4;
@@ -171,7 +171,7 @@ namespace SabreTools.Serialization.CrossModel
{
var md5 = new MD5
{
- Hash = item.ReadString(Data.Models.Metadata.Rom.MD5Key),
+ Hash = item.MD5,
File = item.Name,
};
return md5;
@@ -184,7 +184,7 @@ namespace SabreTools.Serialization.CrossModel
{
var ripemd128 = new RIPEMD128
{
- Hash = item.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key),
+ Hash = item.RIPEMD128,
File = item.Name,
};
return ripemd128;
@@ -197,7 +197,7 @@ namespace SabreTools.Serialization.CrossModel
{
var ripemd160 = new RIPEMD160
{
- Hash = item.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key),
+ Hash = item.RIPEMD160,
File = item.Name,
};
return ripemd160;
@@ -211,7 +211,7 @@ namespace SabreTools.Serialization.CrossModel
var sfv = new SFV
{
File = item.Name,
- Hash = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
+ Hash = item.CRC,
};
return sfv;
}
@@ -223,7 +223,7 @@ namespace SabreTools.Serialization.CrossModel
{
var sha1 = new SHA1
{
- Hash = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
+ Hash = item.SHA1,
File = item.Name,
};
return sha1;
@@ -236,7 +236,7 @@ namespace SabreTools.Serialization.CrossModel
{
var sha256 = new SHA256
{
- Hash = item.ReadString(Data.Models.Metadata.Rom.SHA256Key),
+ Hash = item.SHA256,
File = item.Name,
};
return sha256;
@@ -249,7 +249,7 @@ namespace SabreTools.Serialization.CrossModel
{
var sha384 = new SHA384
{
- Hash = item.ReadString(Data.Models.Metadata.Rom.SHA384Key),
+ Hash = item.SHA384,
File = item.Name,
};
return sha384;
@@ -262,7 +262,7 @@ namespace SabreTools.Serialization.CrossModel
{
var sha512 = new SHA512
{
- Hash = item.ReadString(Data.Models.Metadata.Rom.SHA512Key),
+ Hash = item.SHA512,
File = item.Name,
};
return sha512;
@@ -275,7 +275,7 @@ namespace SabreTools.Serialization.CrossModel
{
var spamsum = new SpamSum
{
- Hash = item.ReadString(Data.Models.Metadata.Rom.SpamSumKey),
+ Hash = item.SpamSum,
File = item.Name,
};
return spamsum;
diff --git a/SabreTools.Serialization.CrossModel/Hashfile.Serializer.cs b/SabreTools.Serialization.CrossModel/Hashfile.Serializer.cs
index 5eba2478..dac2f823 100644
--- a/SabreTools.Serialization.CrossModel/Hashfile.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/Hashfile.Serializer.cs
@@ -74,7 +74,7 @@ namespace SabreTools.Serialization.CrossModel
{
var rom = new Data.Models.Metadata.Rom
{
- [Data.Models.Metadata.Rom.MD2Key] = item.Hash,
+ MD2 = item.Hash,
Name = item.File,
};
return rom;
@@ -87,7 +87,7 @@ namespace SabreTools.Serialization.CrossModel
{
var rom = new Data.Models.Metadata.Rom
{
- [Data.Models.Metadata.Rom.MD4Key] = item.Hash,
+ MD4 = item.Hash,
Name = item.File,
};
return rom;
@@ -100,7 +100,7 @@ namespace SabreTools.Serialization.CrossModel
{
var rom = new Data.Models.Metadata.Rom
{
- [Data.Models.Metadata.Rom.MD5Key] = item.Hash,
+ MD5 = item.Hash,
Name = item.File,
};
return rom;
@@ -113,7 +113,7 @@ namespace SabreTools.Serialization.CrossModel
{
var rom = new Data.Models.Metadata.Rom
{
- [Data.Models.Metadata.Rom.RIPEMD128Key] = item.Hash,
+ RIPEMD128 = item.Hash,
Name = item.File,
};
return rom;
@@ -126,7 +126,7 @@ namespace SabreTools.Serialization.CrossModel
{
var rom = new Data.Models.Metadata.Rom
{
- [Data.Models.Metadata.Rom.RIPEMD160Key] = item.Hash,
+ RIPEMD160 = item.Hash,
Name = item.File,
};
return rom;
@@ -140,7 +140,7 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Data.Models.Metadata.Rom
{
Name = item.File,
- [Data.Models.Metadata.Rom.CRCKey] = item.Hash,
+ CRC = item.Hash,
};
return rom;
}
@@ -152,7 +152,7 @@ namespace SabreTools.Serialization.CrossModel
{
var rom = new Data.Models.Metadata.Rom
{
- [Data.Models.Metadata.Rom.SHA1Key] = item.Hash,
+ SHA1 = item.Hash,
Name = item.File,
};
return rom;
@@ -165,7 +165,7 @@ namespace SabreTools.Serialization.CrossModel
{
var rom = new Data.Models.Metadata.Rom
{
- [Data.Models.Metadata.Rom.SHA256Key] = item.Hash,
+ SHA256 = item.Hash,
Name = item.File,
};
return rom;
@@ -178,7 +178,7 @@ namespace SabreTools.Serialization.CrossModel
{
var rom = new Data.Models.Metadata.Rom
{
- [Data.Models.Metadata.Rom.SHA384Key] = item.Hash,
+ SHA384 = item.Hash,
Name = item.File,
};
return rom;
@@ -191,7 +191,7 @@ namespace SabreTools.Serialization.CrossModel
{
var rom = new Data.Models.Metadata.Rom
{
- [Data.Models.Metadata.Rom.SHA512Key] = item.Hash,
+ SHA512 = item.Hash,
Name = item.File,
};
return rom;
@@ -204,7 +204,7 @@ namespace SabreTools.Serialization.CrossModel
{
var rom = new Data.Models.Metadata.Rom
{
- [Data.Models.Metadata.Rom.SpamSumKey] = item.Hash,
+ SpamSum = item.Hash,
Name = item.File,
};
return rom;
diff --git a/SabreTools.Serialization.CrossModel/Listrom.Deserializer.cs b/SabreTools.Serialization.CrossModel/Listrom.Deserializer.cs
index fe623002..10149bc6 100644
--- a/SabreTools.Serialization.CrossModel/Listrom.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/Listrom.Deserializer.cs
@@ -77,8 +77,8 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
Size = item.Size,
- CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
- SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
+ CRC = item.CRC,
+ SHA1 = item.SHA1,
};
if (item.Status == Data.Models.Metadata.ItemStatus.Nodump)
diff --git a/SabreTools.Serialization.CrossModel/Listrom.Serializer.cs b/SabreTools.Serialization.CrossModel/Listrom.Serializer.cs
index 11425615..0f22c669 100644
--- a/SabreTools.Serialization.CrossModel/Listrom.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/Listrom.Serializer.cs
@@ -98,8 +98,8 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
Size = item.Size,
- [Data.Models.Metadata.Rom.CRCKey] = item.CRC,
- [Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,
+ CRC = item.CRC,
+ SHA1 = item.SHA1,
};
if (item.NoGoodDumpKnown)
diff --git a/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs b/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs
index 55e169d9..bfacbdcc 100644
--- a/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/Listxml.Deserializer.cs
@@ -563,13 +563,13 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Rom
{
Name = item.Name,
- Bios = item.ReadString(Data.Models.Metadata.Rom.BiosKey),
+ Bios = item.Bios,
Size = item.Size,
- CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
- SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
- Merge = item.ReadString(Data.Models.Metadata.Rom.MergeKey),
- Region = item.ReadString(Data.Models.Metadata.Rom.RegionKey),
- Offset = item.ReadString(Data.Models.Metadata.Rom.OffsetKey),
+ CRC = item.CRC,
+ SHA1 = item.SHA1,
+ Merge = item.Merge,
+ Region = item.Region,
+ Offset = item.Offset,
Status = item.Status,
Optional = item.Optional,
Dispose = item.Dispose,
diff --git a/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs b/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs
index a61e74f3..e9a8419c 100644
--- a/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/Listxml.Serializer.cs
@@ -530,13 +530,13 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Data.Models.Metadata.Rom
{
Name = item.Name,
- [Data.Models.Metadata.Rom.BiosKey] = item.Bios,
+ Bios = item.Bios,
Size = item.Size,
- [Data.Models.Metadata.Rom.CRCKey] = item.CRC,
- [Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,
- [Data.Models.Metadata.Rom.MergeKey] = item.Merge,
- [Data.Models.Metadata.Rom.RegionKey] = item.Region,
- [Data.Models.Metadata.Rom.OffsetKey] = item.Offset,
+ CRC = item.CRC,
+ SHA1 = item.SHA1,
+ Merge = item.Merge,
+ Region = item.Region,
+ Offset = item.Offset,
Status = item.Status,
Optional = item.Optional,
Dispose = item.Dispose,
diff --git a/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs b/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs
index 712597a6..537f8047 100644
--- a/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/Logiqx.Deserializer.cs
@@ -327,26 +327,26 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
Size = item.Size,
- CRC16 = item.ReadString(Data.Models.Metadata.Rom.CRC16Key),
- CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
- CRC64 = item.ReadString(Data.Models.Metadata.Rom.CRC64Key),
- MD2 = item.ReadString(Data.Models.Metadata.Rom.MD2Key),
- MD4 = item.ReadString(Data.Models.Metadata.Rom.MD4Key),
- MD5 = item.ReadString(Data.Models.Metadata.Rom.MD5Key),
- RIPEMD128 = item.ReadString(Data.Models.Metadata.Rom.RIPEMD128Key),
- RIPEMD160 = item.ReadString(Data.Models.Metadata.Rom.RIPEMD160Key),
- SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
- SHA256 = item.ReadString(Data.Models.Metadata.Rom.SHA256Key),
- SHA384 = item.ReadString(Data.Models.Metadata.Rom.SHA384Key),
- SHA512 = item.ReadString(Data.Models.Metadata.Rom.SHA512Key),
- SpamSum = item.ReadString(Data.Models.Metadata.Rom.SpamSumKey),
- xxHash364 = item.ReadString(Data.Models.Metadata.Rom.xxHash364Key),
- xxHash3128 = item.ReadString(Data.Models.Metadata.Rom.xxHash3128Key),
- Merge = item.ReadString(Data.Models.Metadata.Rom.MergeKey),
+ CRC16 = item.CRC16,
+ CRC = item.CRC,
+ CRC64 = item.CRC64,
+ MD2 = item.MD2,
+ MD4 = item.MD4,
+ MD5 = item.MD5,
+ RIPEMD128 = item.RIPEMD128,
+ RIPEMD160 = item.RIPEMD160,
+ SHA1 = item.SHA1,
+ SHA256 = item.SHA256,
+ SHA384 = item.SHA384,
+ SHA512 = item.SHA512,
+ SpamSum = item.SpamSum,
+ xxHash364 = item.xxHash364,
+ xxHash3128 = item.xxHash3128,
+ Merge = item.Merge,
Status = item.Status,
- Serial = item.ReadString(Data.Models.Metadata.Rom.SerialKey),
- Header = item.ReadString(Data.Models.Metadata.Rom.HeaderKey),
- Date = item.ReadString(Data.Models.Metadata.Rom.DateKey),
+ Serial = item.Serial,
+ Header = item.Header,
+ Date = item.Date,
Inverted = item.Inverted,
MIA = item.MIA,
};
diff --git a/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs b/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs
index df8c911f..133074b3 100644
--- a/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/Logiqx.Serializer.cs
@@ -306,26 +306,26 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
Size = item.Size,
- [Data.Models.Metadata.Rom.CRC16Key] = item.CRC16,
- [Data.Models.Metadata.Rom.CRCKey] = item.CRC,
- [Data.Models.Metadata.Rom.CRC64Key] = item.CRC64,
- [Data.Models.Metadata.Rom.MD2Key] = item.MD2,
- [Data.Models.Metadata.Rom.MD4Key] = item.MD4,
- [Data.Models.Metadata.Rom.MD5Key] = item.MD5,
- [Data.Models.Metadata.Rom.RIPEMD128Key] = item.RIPEMD128,
- [Data.Models.Metadata.Rom.RIPEMD160Key] = item.RIPEMD160,
- [Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,
- [Data.Models.Metadata.Rom.SHA256Key] = item.SHA256,
- [Data.Models.Metadata.Rom.SHA384Key] = item.SHA384,
- [Data.Models.Metadata.Rom.SHA512Key] = item.SHA512,
- [Data.Models.Metadata.Rom.SpamSumKey] = item.SpamSum,
- [Data.Models.Metadata.Rom.xxHash364Key] = item.xxHash364,
- [Data.Models.Metadata.Rom.xxHash3128Key] = item.xxHash3128,
- [Data.Models.Metadata.Rom.MergeKey] = item.Merge,
+ CRC16 = item.CRC16,
+ CRC = item.CRC,
+ CRC64 = item.CRC64,
+ MD2 = item.MD2,
+ MD4 = item.MD4,
+ MD5 = item.MD5,
+ RIPEMD128 = item.RIPEMD128,
+ RIPEMD160 = item.RIPEMD160,
+ SHA1 = item.SHA1,
+ SHA256 = item.SHA256,
+ SHA384 = item.SHA384,
+ SHA512 = item.SHA512,
+ SpamSum = item.SpamSum,
+ xxHash364 = item.xxHash364,
+ xxHash3128 = item.xxHash3128,
+ Merge = item.Merge,
Status = item.Status,
- [Data.Models.Metadata.Rom.SerialKey] = item.Serial,
- [Data.Models.Metadata.Rom.HeaderKey] = item.Header,
- [Data.Models.Metadata.Rom.DateKey] = item.Date,
+ Serial = item.Serial,
+ Header = item.Header,
+ Date = item.Date,
Inverted = item.Inverted,
MIA = item.MIA,
};
diff --git a/SabreTools.Serialization.CrossModel/OfflineList.Deserializer.cs b/SabreTools.Serialization.CrossModel/OfflineList.Deserializer.cs
index 35e03656..746b79aa 100644
--- a/SabreTools.Serialization.CrossModel/OfflineList.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/OfflineList.Deserializer.cs
@@ -111,8 +111,8 @@ namespace SabreTools.Serialization.CrossModel
{
var fileRomCRC = new FileRomCRC
{
- Extension = item.ReadString(Data.Models.Metadata.Rom.ExtensionKey),
- Content = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
+ Extension = item.Extension,
+ Content = item.CRC,
};
return fileRomCRC;
}
diff --git a/SabreTools.Serialization.CrossModel/OfflineList.Serializer.cs b/SabreTools.Serialization.CrossModel/OfflineList.Serializer.cs
index 3da54c2d..e7bbbc42 100644
--- a/SabreTools.Serialization.CrossModel/OfflineList.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/OfflineList.Serializer.cs
@@ -95,8 +95,8 @@ namespace SabreTools.Serialization.CrossModel
{
var rom = new Data.Models.Metadata.Rom
{
- [Data.Models.Metadata.Rom.ExtensionKey] = item.Extension,
- [Data.Models.Metadata.Rom.CRCKey] = item.Content,
+ Extension = item.Extension,
+ CRC = item.Content,
};
return rom;
}
diff --git a/SabreTools.Serialization.CrossModel/OpenMSX.Deserializer.cs b/SabreTools.Serialization.CrossModel/OpenMSX.Deserializer.cs
index 0a021bb6..2ac846be 100644
--- a/SabreTools.Serialization.CrossModel/OpenMSX.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/OpenMSX.Deserializer.cs
@@ -88,10 +88,10 @@ namespace SabreTools.Serialization.CrossModel
{
var megaRom = new MegaRom
{
- Start = item.ReadString(Data.Models.Metadata.Rom.StartKey),
- Type = item.ReadString(Data.Models.Metadata.Rom.OpenMSXType),
- Hash = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
- Remark = item.ReadString(Data.Models.Metadata.Rom.RemarkKey),
+ Start = item.Start,
+ Type = item.OpenMSXType,
+ Hash = item.SHA1,
+ Remark = item.Remark,
};
return megaRom;
}
@@ -116,10 +116,10 @@ namespace SabreTools.Serialization.CrossModel
{
var rom = new Rom
{
- Start = item.ReadString(Data.Models.Metadata.Rom.StartKey),
- Type = item.ReadString(Data.Models.Metadata.Rom.OpenMSXType),
- Hash = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
- Remark = item.ReadString(Data.Models.Metadata.Rom.RemarkKey),
+ Start = item.Start,
+ Type = item.OpenMSXType,
+ Hash = item.SHA1,
+ Remark = item.Remark,
};
return rom;
}
@@ -131,10 +131,10 @@ namespace SabreTools.Serialization.CrossModel
{
var sccPlusCart = new SCCPlusCart
{
- Start = item.ReadString(Data.Models.Metadata.Rom.StartKey),
- Type = item.ReadString(Data.Models.Metadata.Rom.OpenMSXType),
- Hash = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
- Remark = item.ReadString(Data.Models.Metadata.Rom.RemarkKey),
+ Start = item.Start,
+ Type = item.OpenMSXType,
+ Hash = item.SHA1,
+ Remark = item.Remark,
};
return sccPlusCart;
}
diff --git a/SabreTools.Serialization.CrossModel/OpenMSX.Serializer.cs b/SabreTools.Serialization.CrossModel/OpenMSX.Serializer.cs
index e3bb4a66..d3c5b8ef 100644
--- a/SabreTools.Serialization.CrossModel/OpenMSX.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/OpenMSX.Serializer.cs
@@ -110,10 +110,10 @@ namespace SabreTools.Serialization.CrossModel
{
var rom = new Data.Models.Metadata.Rom
{
- [Data.Models.Metadata.Rom.StartKey] = item.Start,
- [Data.Models.Metadata.Rom.OpenMSXType] = item.Type,
- [Data.Models.Metadata.Rom.SHA1Key] = item.Hash,
- [Data.Models.Metadata.Rom.RemarkKey] = item.Remark,
+ Start = item.Start,
+ OpenMSXType = item.Type,
+ SHA1 = item.Hash,
+ Remark = item.Remark,
};
return rom;
}
diff --git a/SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs b/SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs
index 732c960e..80d5e5cf 100644
--- a/SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/RomCenter.Deserializer.cs
@@ -103,10 +103,10 @@ namespace SabreTools.Serialization.CrossModel
GameName = parent.Name,
GameDescription = parent.Description,
RomName = item.Name,
- RomCRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
+ RomCRC = item.CRC,
RomSize = item.Size,
RomOf = parent.RomOf,
- MergeName = item.ReadString(Data.Models.Metadata.Rom.MergeKey),
+ MergeName = item.Merge,
};
return row;
}
diff --git a/SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs b/SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs
index 27c60028..a9e0289e 100644
--- a/SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/RomCenter.Serializer.cs
@@ -86,9 +86,9 @@ namespace SabreTools.Serialization.CrossModel
var rom = new Data.Models.Metadata.Rom
{
Name = item.RomName,
- [Data.Models.Metadata.Rom.CRCKey] = item.RomCRC,
+ CRC = item.RomCRC,
Size = item.RomSize,
- [Data.Models.Metadata.Rom.MergeKey] = item.MergeName,
+ Merge = item.MergeName,
};
return rom;
}
diff --git a/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs b/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs
index c5861300..f055090f 100644
--- a/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/SeparatedValue.Deserializer.cs
@@ -140,13 +140,13 @@ namespace SabreTools.Serialization.CrossModel
RomName = item.Name,
DiskName = null,
Size = item.Size,
- CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
- MD5 = item.ReadString(Data.Models.Metadata.Rom.MD5Key),
- SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
- SHA256 = item.ReadString(Data.Models.Metadata.Rom.SHA256Key),
- SHA384 = item.ReadString(Data.Models.Metadata.Rom.SHA384Key),
- SHA512 = item.ReadString(Data.Models.Metadata.Rom.SHA512Key),
- SpamSum = item.ReadString(Data.Models.Metadata.Rom.SpamSumKey),
+ CRC = item.CRC,
+ MD5 = item.MD5,
+ SHA1 = item.SHA1,
+ SHA256 = item.SHA256,
+ SHA384 = item.SHA384,
+ SHA512 = item.SHA512,
+ SpamSum = item.SpamSum,
Status = item.Status,
};
return row;
diff --git a/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs b/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs
index 947eb8b9..5b6b722d 100644
--- a/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/SeparatedValue.Serializer.cs
@@ -103,13 +103,13 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.RomName,
Size = item.Size,
- [Data.Models.Metadata.Rom.CRCKey] = item.CRC,
- [Data.Models.Metadata.Rom.MD5Key] = item.MD5,
- [Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,
- [Data.Models.Metadata.Rom.SHA256Key] = item.SHA256,
- [Data.Models.Metadata.Rom.SHA384Key] = item.SHA384,
- [Data.Models.Metadata.Rom.SHA512Key] = item.SHA512,
- [Data.Models.Metadata.Rom.SpamSumKey] = item.SpamSum,
+ CRC = item.CRC,
+ MD5 = item.MD5,
+ SHA1 = item.SHA1,
+ SHA256 = item.SHA256,
+ SHA384 = item.SHA384,
+ SHA512 = item.SHA512,
+ SpamSum = item.SpamSum,
Status = item.Status,
},
_ => null,
diff --git a/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs b/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs
index 5da779d7..aeada097 100644
--- a/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs
+++ b/SabreTools.Serialization.CrossModel/SoftwareList.Deserializer.cs
@@ -217,10 +217,10 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
Size = item.Size,
- Length = item.ReadString(Data.Models.Metadata.Rom.LengthKey),
- CRC = item.ReadString(Data.Models.Metadata.Rom.CRCKey),
- SHA1 = item.ReadString(Data.Models.Metadata.Rom.SHA1Key),
- Offset = item.ReadString(Data.Models.Metadata.Rom.OffsetKey),
+ Length = item.Length,
+ CRC = item.CRC,
+ SHA1 = item.SHA1,
+ Offset = item.Offset,
Value = item.Value,
Status = item.Status,
LoadFlag = item.LoadFlag,
diff --git a/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs b/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs
index c5625a60..28b8ef1b 100644
--- a/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs
+++ b/SabreTools.Serialization.CrossModel/SoftwareList.Serializer.cs
@@ -208,10 +208,10 @@ namespace SabreTools.Serialization.CrossModel
{
Name = item.Name,
Size = item.Size,
- [Data.Models.Metadata.Rom.LengthKey] = item.Length,
- [Data.Models.Metadata.Rom.CRCKey] = item.CRC,
- [Data.Models.Metadata.Rom.SHA1Key] = item.SHA1,
- [Data.Models.Metadata.Rom.OffsetKey] = item.Offset,
+ Length = item.Length,
+ CRC = item.CRC,
+ SHA1 = item.SHA1,
+ Offset = item.Offset,
Value = item.Value,
Status = item.Status,
LoadFlag = item.LoadFlag,