mirror of
https://github.com/SabreTools/SabreTools.Serialization.git
synced 2026-11-17 09:50:35 +00:00
Compare commits
24 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3798dbcb47 | ||
|
|
2a70a9a20e | ||
|
|
6f92f85f5d | ||
|
|
b7851601a4 | ||
|
|
cb2a96c413 | ||
|
|
69c0843a0d | ||
|
|
0171ea9da7 | ||
|
|
e493af25e0 | ||
|
|
62427576e9 | ||
|
|
e80ea00872 | ||
|
|
ce1cd15978 | ||
|
|
2a604bd73a | ||
|
|
bcc0a5bd1e | ||
|
|
32d9e8a09d | ||
|
|
d0f5ac322d | ||
|
|
05c86e4c24 | ||
|
|
1d76967a08 | ||
|
|
b9ffd61252 | ||
|
|
b4e1f6b729 | ||
|
|
451fc0b394 | ||
|
|
79ca9f617e | ||
|
|
a602686551 | ||
|
|
4083aed12f | ||
|
|
717de3608c |
@@ -10,7 +10,7 @@
|
|||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<Version>3.0.0</Version>
|
<Version>3.2.0</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- Support All Frameworks -->
|
<!-- Support All Frameworks -->
|
||||||
@@ -48,9 +48,9 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="SabreTools.CommandLine" Version="[1.4.0]" />
|
<PackageReference Include="SabreTools.CommandLine" Version="1.5.0" />
|
||||||
<PackageReference Include="SabreTools.IO" Version="[2.1.0]" />
|
<PackageReference Include="SabreTools.IO" Version="2.3.0" />
|
||||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.8" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
|
<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.11" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<Version>3.0.0</Version>
|
<Version>3.2.0</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- Support All Frameworks -->
|
<!-- Support All Frameworks -->
|
||||||
@@ -32,9 +32,9 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="SabreTools.CommandLine" Version="[1.4.0]" />
|
<PackageReference Include="SabreTools.CommandLine" Version="1.5.0" />
|
||||||
<PackageReference Include="SabreTools.Hashing" Version="[2.0.0]" />
|
<PackageReference Include="SabreTools.Hashing" Version="2.1.0" />
|
||||||
<PackageReference Include="SabreTools.IO" Version="[2.1.0]" />
|
<PackageReference Include="SabreTools.IO" Version="2.3.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -361,6 +361,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -380,6 +381,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -406,6 +408,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -424,6 +427,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -449,6 +453,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -467,6 +472,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -493,6 +499,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -510,6 +517,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -536,6 +544,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -554,6 +563,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -580,6 +590,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -598,6 +609,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -624,6 +636,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -642,6 +655,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -668,6 +682,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -686,6 +701,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -712,6 +728,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -730,6 +747,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -756,6 +774,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -774,6 +793,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -800,6 +820,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -818,6 +839,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -844,6 +866,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -862,6 +885,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -888,6 +912,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -906,6 +931,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -932,6 +958,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -950,6 +977,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -976,6 +1004,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -994,6 +1023,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -1020,6 +1050,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1038,6 +1069,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -1064,6 +1096,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1082,6 +1115,53 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
|
};
|
||||||
|
|
||||||
|
bool actual = self.PartialEquals(other);
|
||||||
|
Assert.True(actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void PartialEquals_Rom_PartialBLAKE3_True()
|
||||||
|
{
|
||||||
|
var self = new Rom
|
||||||
|
{
|
||||||
|
Name = "name1",
|
||||||
|
Size = 12345,
|
||||||
|
CRC16 = string.Empty,
|
||||||
|
CRC32 = 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,
|
||||||
|
BLAKE3 = "blake3",
|
||||||
|
};
|
||||||
|
var other = new Rom
|
||||||
|
{
|
||||||
|
Name = "name2",
|
||||||
|
Size = 12345,
|
||||||
|
CRC16 = "crc16",
|
||||||
|
CRC32 = "crc32",
|
||||||
|
CRC64 = "crc64",
|
||||||
|
MD2 = "md2",
|
||||||
|
MD4 = "md4",
|
||||||
|
MD5 = "md5",
|
||||||
|
RIPEMD128 = "ripemd128",
|
||||||
|
RIPEMD160 = "ripemd160",
|
||||||
|
SHA1 = "sha1",
|
||||||
|
SHA256 = "sha256",
|
||||||
|
SHA384 = "sha384",
|
||||||
|
SHA512 = "sha512",
|
||||||
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -1108,6 +1188,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
var other = new Rom
|
var other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1126,6 +1207,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.PartialEquals(other);
|
bool actual = self.PartialEquals(other);
|
||||||
@@ -1392,6 +1474,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
Rom other = new Rom
|
Rom other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1408,6 +1491,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HashMatch(other);
|
bool actual = self.HashMatch(other);
|
||||||
@@ -1432,6 +1516,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
Rom other = new Rom
|
Rom other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1448,6 +1533,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HashMatch(other);
|
bool actual = self.HashMatch(other);
|
||||||
@@ -1472,6 +1558,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
Rom other = new Rom
|
Rom other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1488,6 +1575,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HashMatch(other);
|
bool actual = self.HashMatch(other);
|
||||||
@@ -1512,6 +1600,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
Rom other = new Rom
|
Rom other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1528,6 +1617,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HashMatch(other);
|
bool actual = self.HashMatch(other);
|
||||||
@@ -1552,6 +1642,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
Rom other = new Rom
|
Rom other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1568,6 +1659,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HashMatch(other);
|
bool actual = self.HashMatch(other);
|
||||||
@@ -1592,6 +1684,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
Rom other = new Rom
|
Rom other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1608,6 +1701,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HashMatch(other);
|
bool actual = self.HashMatch(other);
|
||||||
@@ -1632,6 +1726,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
Rom other = new Rom
|
Rom other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1648,6 +1743,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HashMatch(other);
|
bool actual = self.HashMatch(other);
|
||||||
@@ -1672,6 +1768,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
Rom other = new Rom
|
Rom other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1688,6 +1785,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HashMatch(other);
|
bool actual = self.HashMatch(other);
|
||||||
@@ -1712,6 +1810,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
Rom other = new Rom
|
Rom other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1728,6 +1827,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HashMatch(other);
|
bool actual = self.HashMatch(other);
|
||||||
@@ -1752,6 +1852,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
Rom other = new Rom
|
Rom other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1768,6 +1869,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HashMatch(other);
|
bool actual = self.HashMatch(other);
|
||||||
@@ -1792,6 +1894,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
Rom other = new Rom
|
Rom other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1808,6 +1911,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HashMatch(other);
|
bool actual = self.HashMatch(other);
|
||||||
@@ -1832,6 +1936,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
Rom other = new Rom
|
Rom other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1848,6 +1953,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HashMatch(other);
|
bool actual = self.HashMatch(other);
|
||||||
@@ -1872,6 +1978,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
Rom other = new Rom
|
Rom other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1888,6 +1995,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HashMatch(other);
|
bool actual = self.HashMatch(other);
|
||||||
@@ -1912,6 +2020,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
Rom other = new Rom
|
Rom other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1928,6 +2037,49 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
|
};
|
||||||
|
|
||||||
|
bool actual = self.HashMatch(other);
|
||||||
|
Assert.True(actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void HashMatch_Rom_PartialBLAKE3_True()
|
||||||
|
{
|
||||||
|
Rom self = new Rom
|
||||||
|
{
|
||||||
|
CRC16 = string.Empty,
|
||||||
|
CRC32 = 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,
|
||||||
|
BLAKE3 = "blake3",
|
||||||
|
};
|
||||||
|
Rom other = new Rom
|
||||||
|
{
|
||||||
|
CRC16 = "crc16",
|
||||||
|
CRC32 = "crc32",
|
||||||
|
CRC64 = "crc64",
|
||||||
|
MD2 = "md2",
|
||||||
|
MD4 = "md4",
|
||||||
|
MD5 = "md5",
|
||||||
|
RIPEMD128 = "ripemd128",
|
||||||
|
RIPEMD160 = "ripemd160",
|
||||||
|
SHA1 = "sha1",
|
||||||
|
SHA256 = "sha256",
|
||||||
|
SHA384 = "sha384",
|
||||||
|
SHA512 = "sha512",
|
||||||
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HashMatch(other);
|
bool actual = self.HashMatch(other);
|
||||||
@@ -1952,6 +2104,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
Rom other = new Rom
|
Rom other = new Rom
|
||||||
{
|
{
|
||||||
@@ -1968,6 +2121,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HashMatch(other);
|
bool actual = self.HashMatch(other);
|
||||||
@@ -2162,6 +2316,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -2186,6 +2341,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -2210,6 +2366,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -2234,6 +2391,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -2258,6 +2416,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -2282,6 +2441,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -2306,6 +2466,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -2330,6 +2491,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -2354,6 +2516,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -2378,6 +2541,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -2402,6 +2566,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -2426,6 +2591,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = HashType.SHA384.ZeroString,
|
SHA384 = HashType.SHA384.ZeroString,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -2450,6 +2616,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = HashType.SHA512.ZeroString,
|
SHA512 = HashType.SHA512.ZeroString,
|
||||||
SpamSum = string.Empty,
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -2474,6 +2641,32 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = HashType.SpamSum.ZeroString,
|
SpamSum = HashType.SpamSum.ZeroString,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
|
};
|
||||||
|
|
||||||
|
bool actual = self.HasZeroHash();
|
||||||
|
Assert.True(actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void HasZeroHash_Rom_ZeroBLAKE3_True()
|
||||||
|
{
|
||||||
|
var self = new Rom
|
||||||
|
{
|
||||||
|
CRC16 = string.Empty,
|
||||||
|
CRC32 = 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,
|
||||||
|
BLAKE3 = HashType.BLAKE3.ZeroString,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -2498,6 +2691,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = HashType.SHA384.ZeroString,
|
SHA384 = HashType.SHA384.ZeroString,
|
||||||
SHA512 = HashType.SHA512.ZeroString,
|
SHA512 = HashType.SHA512.ZeroString,
|
||||||
SpamSum = HashType.SpamSum.ZeroString,
|
SpamSum = HashType.SpamSum.ZeroString,
|
||||||
|
BLAKE3 = HashType.BLAKE3.ZeroString,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -2583,6 +2777,7 @@ namespace SabreTools.Data.Extensions.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
self.FillMissingHashes(other);
|
self.FillMissingHashes(other);
|
||||||
|
|||||||
@@ -8,10 +8,10 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="coverlet.collector" Version="10.0.0" />
|
<PackageReference Include="coverlet.collector" Version="10.0.1" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
|
||||||
<PackageReference Include="xunit" Version="2.9.3" />
|
<PackageReference Include="xunit" Version="2.9.3" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -296,6 +296,10 @@ namespace SabreTools.Data.Extensions
|
|||||||
string? otherSpamSum = other.SpamSum;
|
string? otherSpamSum = other.SpamSum;
|
||||||
bool conditionalSpamSum = ConditionalHashEquals(selfSpamSum, otherSpamSum);
|
bool conditionalSpamSum = ConditionalHashEquals(selfSpamSum, otherSpamSum);
|
||||||
|
|
||||||
|
string? selfBlake3 = self.BLAKE3;
|
||||||
|
string? otherBlake3 = other.BLAKE3;
|
||||||
|
bool conditionalBlake3 = ConditionalHashEquals(selfBlake3, otherBlake3);
|
||||||
|
|
||||||
return conditionalCrc16
|
return conditionalCrc16
|
||||||
&& conditionalCrc
|
&& conditionalCrc
|
||||||
&& conditionalCrc64
|
&& conditionalCrc64
|
||||||
@@ -308,7 +312,8 @@ namespace SabreTools.Data.Extensions
|
|||||||
&& conditionalSha256
|
&& conditionalSha256
|
||||||
&& conditionalSha384
|
&& conditionalSha384
|
||||||
&& conditionalSha512
|
&& conditionalSha512
|
||||||
&& conditionalSpamSum;
|
&& conditionalSpamSum
|
||||||
|
&& conditionalBlake3;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -357,6 +362,7 @@ namespace SabreTools.Data.Extensions
|
|||||||
bool sha384Null = string.IsNullOrEmpty(rom.SHA384);
|
bool sha384Null = string.IsNullOrEmpty(rom.SHA384);
|
||||||
bool sha512Null = string.IsNullOrEmpty(rom.SHA512);
|
bool sha512Null = string.IsNullOrEmpty(rom.SHA512);
|
||||||
bool spamsumNull = string.IsNullOrEmpty(rom.SpamSum);
|
bool spamsumNull = string.IsNullOrEmpty(rom.SpamSum);
|
||||||
|
bool blake3Null = string.IsNullOrEmpty(rom.BLAKE3);
|
||||||
|
|
||||||
return !crc16Null
|
return !crc16Null
|
||||||
|| !crc32Null
|
|| !crc32Null
|
||||||
@@ -370,7 +376,8 @@ namespace SabreTools.Data.Extensions
|
|||||||
|| !sha256Null
|
|| !sha256Null
|
||||||
|| !sha384Null
|
|| !sha384Null
|
||||||
|| !sha512Null
|
|| !sha512Null
|
||||||
|| !spamsumNull;
|
|| !spamsumNull
|
||||||
|
|| !blake3Null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -455,6 +462,9 @@ namespace SabreTools.Data.Extensions
|
|||||||
string? spamsum = rom.SpamSum;
|
string? spamsum = rom.SpamSum;
|
||||||
bool spamsumNull = string.IsNullOrEmpty(spamsum) || string.Equals(spamsum, HashType.SpamSum.ZeroString, StringComparison.OrdinalIgnoreCase);
|
bool spamsumNull = string.IsNullOrEmpty(spamsum) || string.Equals(spamsum, HashType.SpamSum.ZeroString, StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
string? blake3 = rom.BLAKE3;
|
||||||
|
bool blake3Null = string.IsNullOrEmpty(blake3) || string.Equals(blake3, HashType.BLAKE3.ZeroString, StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
return crc16Null
|
return crc16Null
|
||||||
&& crc32Null
|
&& crc32Null
|
||||||
&& crc64Null
|
&& crc64Null
|
||||||
@@ -467,7 +477,8 @@ namespace SabreTools.Data.Extensions
|
|||||||
&& sha256Null
|
&& sha256Null
|
||||||
&& sha384Null
|
&& sha384Null
|
||||||
&& sha512Null
|
&& sha512Null
|
||||||
&& spamsumNull;
|
&& spamsumNull
|
||||||
|
&& blake3Null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -552,6 +563,9 @@ namespace SabreTools.Data.Extensions
|
|||||||
bool spamsumNull = string.IsNullOrEmpty(self.SpamSum);
|
bool spamsumNull = string.IsNullOrEmpty(self.SpamSum);
|
||||||
spamsumNull ^= string.IsNullOrEmpty(other.SpamSum);
|
spamsumNull ^= string.IsNullOrEmpty(other.SpamSum);
|
||||||
|
|
||||||
|
bool blake3Null = string.IsNullOrEmpty(self.BLAKE3);
|
||||||
|
blake3Null ^= string.IsNullOrEmpty(other.BLAKE3);
|
||||||
|
|
||||||
return !crc16Null
|
return !crc16Null
|
||||||
|| !crc32Null
|
|| !crc32Null
|
||||||
|| !crc64Null
|
|| !crc64Null
|
||||||
@@ -564,7 +578,8 @@ namespace SabreTools.Data.Extensions
|
|||||||
|| !sha256Null
|
|| !sha256Null
|
||||||
|| !sha384Null
|
|| !sha384Null
|
||||||
|| !sha512Null
|
|| !sha512Null
|
||||||
|| !spamsumNull;
|
|| !spamsumNull
|
||||||
|
|| !blake3Null;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
@@ -696,6 +711,11 @@ namespace SabreTools.Data.Extensions
|
|||||||
string? otherSpamSum = other.SpamSum;
|
string? otherSpamSum = other.SpamSum;
|
||||||
if (string.IsNullOrEmpty(selfSpamSum) && !string.IsNullOrEmpty(otherSpamSum))
|
if (string.IsNullOrEmpty(selfSpamSum) && !string.IsNullOrEmpty(otherSpamSum))
|
||||||
self.SpamSum = otherSpamSum;
|
self.SpamSum = otherSpamSum;
|
||||||
|
|
||||||
|
string? selfBlake3 = self.BLAKE3;
|
||||||
|
string? otherBlake3 = other.BLAKE3;
|
||||||
|
if (string.IsNullOrEmpty(selfBlake3) && !string.IsNullOrEmpty(otherBlake3))
|
||||||
|
self.BLAKE3 = otherBlake3;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Assembly Properties -->
|
<!-- Assembly Properties -->
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
||||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<Version>3.0.0</Version>
|
<Version>3.2.0</Version>
|
||||||
|
|
||||||
<!-- Package Properties -->
|
<!-- Package Properties -->
|
||||||
<Authors>Matt Nadareski</Authors>
|
<Authors>Matt Nadareski</Authors>
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="NetLegacySupport.Numerics" Version="1.0.1" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))" />
|
<PackageReference Include="NetLegacySupport.Numerics" Version="1.0.1" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))" />
|
||||||
<PackageReference Include="SabreTools.IO" Version="[2.1.0]" />
|
<PackageReference Include="SabreTools.IO" Version="2.3.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -68,6 +68,9 @@ namespace SabreTools.Data.Models.ClrMamePro
|
|||||||
/// <remarks>spamsum; Appears after SHA512</remarks>
|
/// <remarks>spamsum; Appears after SHA512</remarks>
|
||||||
public string? SpamSum { get; set; }
|
public string? SpamSum { get; set; }
|
||||||
|
|
||||||
|
/// <remarks>blake3; Appears after SHA512</remarks>
|
||||||
|
public string? BLAKE3 { get; set; }
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region DiscImgeCreator Extensions
|
#region DiscImgeCreator Extensions
|
||||||
|
|||||||
15
SabreTools.Data.Models/Hashfile/BLAKE3.cs
Normal file
15
SabreTools.Data.Models/Hashfile/BLAKE3.cs
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
|
||||||
|
namespace SabreTools.Data.Models.Hashfile
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// BLAKE3 File
|
||||||
|
/// </summary>
|
||||||
|
public class BLAKE3
|
||||||
|
{
|
||||||
|
[Required]
|
||||||
|
public string? Hash { get; set; }
|
||||||
|
|
||||||
|
[Required]
|
||||||
|
public string? File { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -24,5 +24,7 @@ namespace SabreTools.Data.Models.Hashfile
|
|||||||
public SHA512[]? SHA512 { get; set; }
|
public SHA512[]? SHA512 { get; set; }
|
||||||
|
|
||||||
public SpamSum[]? SpamSum { get; set; }
|
public SpamSum[]? SpamSum { get; set; }
|
||||||
|
|
||||||
|
public BLAKE3[]? BLAKE3 { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,6 +55,11 @@ namespace SabreTools.Data.Models.Logiqx
|
|||||||
[XmlAttribute("runnable")]
|
[XmlAttribute("runnable")]
|
||||||
public Runnable? Runnable { get; set; }
|
public Runnable? Runnable { get; set; }
|
||||||
|
|
||||||
|
/// <remarks>(dir|zip|7z), RomVault extension</remarks>
|
||||||
|
/// TODO: Turn this into an enum like the other flags
|
||||||
|
[XmlAttribute("type")]
|
||||||
|
public string? SetType { get; set; }
|
||||||
|
|
||||||
[XmlElement("comment")]
|
[XmlElement("comment")]
|
||||||
public string[]? Comment { get; set; }
|
public string[]? Comment { get; set; }
|
||||||
|
|
||||||
@@ -71,6 +76,12 @@ namespace SabreTools.Data.Models.Logiqx
|
|||||||
[XmlElement("publisher")]
|
[XmlElement("publisher")]
|
||||||
public string? Publisher { get; set; }
|
public string? Publisher { get; set; }
|
||||||
|
|
||||||
|
[XmlElement("serial")]
|
||||||
|
public string? Serial { get; set; }
|
||||||
|
|
||||||
|
[XmlElement("version")]
|
||||||
|
public string? Version { get; set; }
|
||||||
|
|
||||||
/// <remarks>No-Intro extension includes more than 1 instance</remarks>
|
/// <remarks>No-Intro extension includes more than 1 instance</remarks>
|
||||||
[XmlElement("category")]
|
[XmlElement("category")]
|
||||||
public string[]? Category { get; set; }
|
public string[]? Category { get; set; }
|
||||||
|
|||||||
@@ -48,6 +48,10 @@ namespace SabreTools.Data.Models.Logiqx
|
|||||||
[XmlElement("comment")]
|
[XmlElement("comment")]
|
||||||
public string? Comment { get; set; }
|
public string? Comment { get; set; }
|
||||||
|
|
||||||
|
/// <remarks>RomVault extension</remarks>
|
||||||
|
[XmlElement("subset")]
|
||||||
|
public string? Subset { get; set; }
|
||||||
|
|
||||||
/// <remarks>Trurip extension</remarks>
|
/// <remarks>Trurip extension</remarks>
|
||||||
[XmlElement("type")]
|
[XmlElement("type")]
|
||||||
public string? Type { get; set; }
|
public string? Type { get; set; }
|
||||||
|
|||||||
@@ -65,6 +65,10 @@ namespace SabreTools.Data.Models.Logiqx
|
|||||||
[XmlAttribute("spamsum")]
|
[XmlAttribute("spamsum")]
|
||||||
public string? SpamSum { get; set; }
|
public string? SpamSum { get; set; }
|
||||||
|
|
||||||
|
/// <remarks>Hash extension</remarks>
|
||||||
|
[XmlAttribute("blake3")]
|
||||||
|
public string? BLAKE3 { get; set; }
|
||||||
|
|
||||||
/// <remarks>DiscImgeCreator extension</remarks>
|
/// <remarks>DiscImgeCreator extension</remarks>
|
||||||
[XmlAttribute("xxh3_64")]
|
[XmlAttribute("xxh3_64")]
|
||||||
public string? xxHash364 { get; set; }
|
public string? xxHash364 { get; set; }
|
||||||
|
|||||||
@@ -21,5 +21,10 @@ namespace SabreTools.Data.Models.Logiqx
|
|||||||
/// <remarks>(zip|unzip) "zip"</remarks>
|
/// <remarks>(zip|unzip) "zip"</remarks>
|
||||||
[XmlAttribute("forcepacking")]
|
[XmlAttribute("forcepacking")]
|
||||||
public PackingFlag ForcePacking { get; set; }
|
public PackingFlag ForcePacking { get; set; }
|
||||||
|
|
||||||
|
/// <remarks>(noautodir|nogame)</remarks>
|
||||||
|
/// TODO: Turn this into an enum like the other flags
|
||||||
|
[XmlAttribute("dir")]
|
||||||
|
public string? Dir { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,6 +33,8 @@ namespace SabreTools.Data.Models.Metadata
|
|||||||
|
|
||||||
public string? Description { get; set; }
|
public string? Description { get; set; }
|
||||||
|
|
||||||
|
public string? DirHandling { get; set; }
|
||||||
|
|
||||||
public string? Email { get; set; }
|
public string? Email { get; set; }
|
||||||
|
|
||||||
public string? EmulatorVersion { get; set; }
|
public string? EmulatorVersion { get; set; }
|
||||||
@@ -108,6 +110,8 @@ namespace SabreTools.Data.Models.Metadata
|
|||||||
/// TODO: This needs an internal model OR mapping to fields
|
/// TODO: This needs an internal model OR mapping to fields
|
||||||
public OfflineList.Search? Search { get; set; }
|
public OfflineList.Search? Search { get; set; }
|
||||||
|
|
||||||
|
public string? Subset { get; set; }
|
||||||
|
|
||||||
public string? System { get; set; }
|
public string? System { get; set; }
|
||||||
|
|
||||||
public string? Timestamp { get; set; }
|
public string? Timestamp { get; set; }
|
||||||
@@ -135,6 +139,7 @@ namespace SabreTools.Data.Models.Metadata
|
|||||||
obj.DatVersion = DatVersion;
|
obj.DatVersion = DatVersion;
|
||||||
obj.Debug = Debug;
|
obj.Debug = Debug;
|
||||||
obj.Description = Description;
|
obj.Description = Description;
|
||||||
|
obj.DirHandling = DirHandling;
|
||||||
obj.Email = Email;
|
obj.Email = Email;
|
||||||
obj.EmulatorVersion = EmulatorVersion;
|
obj.EmulatorVersion = EmulatorVersion;
|
||||||
obj.FileName = FileName;
|
obj.FileName = FileName;
|
||||||
@@ -166,6 +171,7 @@ namespace SabreTools.Data.Models.Metadata
|
|||||||
obj.ScreenshotsHeight = ScreenshotsHeight;
|
obj.ScreenshotsHeight = ScreenshotsHeight;
|
||||||
obj.ScreenshotsWidth = ScreenshotsWidth;
|
obj.ScreenshotsWidth = ScreenshotsWidth;
|
||||||
obj.Search = Search;
|
obj.Search = Search;
|
||||||
|
obj.Subset = Subset;
|
||||||
obj.System = System;
|
obj.System = System;
|
||||||
obj.Timestamp = Timestamp;
|
obj.Timestamp = Timestamp;
|
||||||
obj.Type = Type;
|
obj.Type = Type;
|
||||||
@@ -224,6 +230,11 @@ namespace SabreTools.Data.Models.Metadata
|
|||||||
else if (Description is not null && !Description.Equals(other.Description, StringComparison.OrdinalIgnoreCase))
|
else if (Description is not null && !Description.Equals(other.Description, StringComparison.OrdinalIgnoreCase))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
if ((DirHandling is null) ^ (other.DirHandling is null))
|
||||||
|
return false;
|
||||||
|
else if (DirHandling is not null && !DirHandling.Equals(other.DirHandling, StringComparison.OrdinalIgnoreCase))
|
||||||
|
return false;
|
||||||
|
|
||||||
if ((Email is null) ^ (other.Email is null))
|
if ((Email is null) ^ (other.Email is null))
|
||||||
return false;
|
return false;
|
||||||
else if (Email is not null && !Email.Equals(other.Email, StringComparison.OrdinalIgnoreCase))
|
else if (Email is not null && !Email.Equals(other.Email, StringComparison.OrdinalIgnoreCase))
|
||||||
@@ -336,6 +347,11 @@ namespace SabreTools.Data.Models.Metadata
|
|||||||
else if (ScreenshotsWidth is not null && !ScreenshotsWidth.Equals(other.ScreenshotsWidth, StringComparison.OrdinalIgnoreCase))
|
else if (ScreenshotsWidth is not null && !ScreenshotsWidth.Equals(other.ScreenshotsWidth, StringComparison.OrdinalIgnoreCase))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
if ((Subset is null) ^ (other.Subset is null))
|
||||||
|
return false;
|
||||||
|
else if (Subset is not null && !Subset.Equals(other.Subset, StringComparison.OrdinalIgnoreCase))
|
||||||
|
return false;
|
||||||
|
|
||||||
if ((System is null) ^ (other.System is null))
|
if ((System is null) ^ (other.System is null))
|
||||||
return false;
|
return false;
|
||||||
else if (System is not null && !System.Equals(other.System, StringComparison.OrdinalIgnoreCase))
|
else if (System is not null && !System.Equals(other.System, StringComparison.OrdinalIgnoreCase))
|
||||||
|
|||||||
@@ -157,6 +157,11 @@ namespace SabreTools.Data.Models.Metadata
|
|||||||
|
|
||||||
public string? Score { get; set; }
|
public string? Score { get; set; }
|
||||||
|
|
||||||
|
public string? Serial { get; set; }
|
||||||
|
|
||||||
|
/// <remarks>(dir|zip|7z), RomVault extension</remarks>
|
||||||
|
public string? SetType { get; set; }
|
||||||
|
|
||||||
public SharedFeat[]? SharedFeat { get; set; }
|
public SharedFeat[]? SharedFeat { get; set; }
|
||||||
|
|
||||||
public Slot[]? Slot { get; set; }
|
public Slot[]? Slot { get; set; }
|
||||||
@@ -186,6 +191,8 @@ namespace SabreTools.Data.Models.Metadata
|
|||||||
|
|
||||||
public string? Url { get; set; }
|
public string? Url { get; set; }
|
||||||
|
|
||||||
|
public string? Version { get; set; }
|
||||||
|
|
||||||
public Video[]? Video { get; set; }
|
public Video[]? Video { get; set; }
|
||||||
|
|
||||||
public string? Year { get; set; }
|
public string? Year { get; set; }
|
||||||
@@ -293,6 +300,8 @@ namespace SabreTools.Data.Models.Metadata
|
|||||||
obj.SampleOf = SampleOf;
|
obj.SampleOf = SampleOf;
|
||||||
obj.SaveType = SaveType;
|
obj.SaveType = SaveType;
|
||||||
obj.Score = Score;
|
obj.Score = Score;
|
||||||
|
obj.Serial = Serial;
|
||||||
|
obj.SetType = SetType;
|
||||||
if (SharedFeat is not null)
|
if (SharedFeat is not null)
|
||||||
obj.SharedFeat = Array.ConvertAll(SharedFeat, i => (SharedFeat)i.Clone());
|
obj.SharedFeat = Array.ConvertAll(SharedFeat, i => (SharedFeat)i.Clone());
|
||||||
if (Slot is not null)
|
if (Slot is not null)
|
||||||
@@ -311,6 +320,7 @@ namespace SabreTools.Data.Models.Metadata
|
|||||||
obj.Tags = Tags;
|
obj.Tags = Tags;
|
||||||
obj.TitleID = TitleID;
|
obj.TitleID = TitleID;
|
||||||
obj.Url = Url;
|
obj.Url = Url;
|
||||||
|
obj.Version = Version;
|
||||||
if (Video is not null)
|
if (Video is not null)
|
||||||
obj.Video = Array.ConvertAll(Video, i => (Video)i.Clone());
|
obj.Video = Array.ConvertAll(Video, i => (Video)i.Clone());
|
||||||
obj.Year = Year;
|
obj.Year = Year;
|
||||||
@@ -558,6 +568,16 @@ namespace SabreTools.Data.Models.Metadata
|
|||||||
else if (Score is not null && !Score.Equals(other.Score, StringComparison.OrdinalIgnoreCase))
|
else if (Score is not null && !Score.Equals(other.Score, StringComparison.OrdinalIgnoreCase))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
if ((Serial is null) ^ (other.Serial is null))
|
||||||
|
return false;
|
||||||
|
else if (Serial is not null && !Serial.Equals(other.Serial, StringComparison.OrdinalIgnoreCase))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if ((SetType is null) ^ (other.SetType is null))
|
||||||
|
return false;
|
||||||
|
else if (SetType is not null && !SetType.Equals(other.SetType, StringComparison.OrdinalIgnoreCase))
|
||||||
|
return false;
|
||||||
|
|
||||||
if ((Source is null) ^ (other.Source is null))
|
if ((Source is null) ^ (other.Source is null))
|
||||||
return false;
|
return false;
|
||||||
else if (Source is not null && !Source.Equals(other.Source, StringComparison.OrdinalIgnoreCase))
|
else if (Source is not null && !Source.Equals(other.Source, StringComparison.OrdinalIgnoreCase))
|
||||||
@@ -606,6 +626,11 @@ namespace SabreTools.Data.Models.Metadata
|
|||||||
else if (Url is not null && !Url.Equals(other.Url, StringComparison.OrdinalIgnoreCase))
|
else if (Url is not null && !Url.Equals(other.Url, StringComparison.OrdinalIgnoreCase))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
if ((Version is null) ^ (other.Version is null))
|
||||||
|
return false;
|
||||||
|
else if (Version is not null && !Version.Equals(other.Version, StringComparison.OrdinalIgnoreCase))
|
||||||
|
return false;
|
||||||
|
|
||||||
if ((Year is null) ^ (other.Year is null))
|
if ((Year is null) ^ (other.Year is null))
|
||||||
return false;
|
return false;
|
||||||
else if (Year is not null && !Year.Equals(other.Year, StringComparison.OrdinalIgnoreCase))
|
else if (Year is not null && !Year.Equals(other.Year, StringComparison.OrdinalIgnoreCase))
|
||||||
|
|||||||
@@ -39,6 +39,8 @@ namespace SabreTools.Data.Models.Metadata
|
|||||||
/// <remarks>ArchiveDotOrg.File</remarks>
|
/// <remarks>ArchiveDotOrg.File</remarks>
|
||||||
public string? BitTorrentMagnetHash { get; set; }
|
public string? BitTorrentMagnetHash { get; set; }
|
||||||
|
|
||||||
|
public string? BLAKE3 { get; set; }
|
||||||
|
|
||||||
/// <remarks>ArchiveDotOrg.File</remarks>
|
/// <remarks>ArchiveDotOrg.File</remarks>
|
||||||
public string? ClothCoverDetectionModuleVersion { get; set; }
|
public string? ClothCoverDetectionModuleVersion { get; set; }
|
||||||
|
|
||||||
@@ -293,6 +295,7 @@ namespace SabreTools.Data.Models.Metadata
|
|||||||
obj.Bios = Bios;
|
obj.Bios = Bios;
|
||||||
obj.Bitrate = Bitrate;
|
obj.Bitrate = Bitrate;
|
||||||
obj.BitTorrentMagnetHash = BitTorrentMagnetHash;
|
obj.BitTorrentMagnetHash = BitTorrentMagnetHash;
|
||||||
|
obj.BLAKE3 = BLAKE3;
|
||||||
obj.ClothCoverDetectionModuleVersion = ClothCoverDetectionModuleVersion;
|
obj.ClothCoverDetectionModuleVersion = ClothCoverDetectionModuleVersion;
|
||||||
obj.CollectionCatalogNumber = CollectionCatalogNumber;
|
obj.CollectionCatalogNumber = CollectionCatalogNumber;
|
||||||
obj.Comment = Comment;
|
obj.Comment = Comment;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Assembly Properties -->
|
<!-- Assembly Properties -->
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
||||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<Version>3.0.0</Version>
|
<Version>3.2.0</Version>
|
||||||
|
|
||||||
<!-- Package Properties -->
|
<!-- Package Properties -->
|
||||||
<Authors>Matt Nadareski</Authors>
|
<Authors>Matt Nadareski</Authors>
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||||
<PackageReference Include="SabreTools.IO" Version="[2.1.0]" />
|
<PackageReference Include="SabreTools.IO" Version="2.3.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
10
SabreTools.Data.Models/Steam2Installer/Constants.cs
Normal file
10
SabreTools.Data.Models/Steam2Installer/Constants.cs
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
namespace SabreTools.Data.Models.Steam2Installer
|
||||||
|
{
|
||||||
|
public static class Constants
|
||||||
|
{
|
||||||
|
public static readonly byte[] SimSignatureBytes = [0x1F, 0x4C, 0xD0, 0x3F];
|
||||||
|
|
||||||
|
/// <remarks>All other values in the structure are little endian, assuming this is too</remarks>
|
||||||
|
public const uint SimSignatureUInt32 = 0x3FD04C1F;
|
||||||
|
}
|
||||||
|
}
|
||||||
71
SabreTools.Data.Models/Steam2Installer/FileEntry.cs
Normal file
71
SabreTools.Data.Models/Steam2Installer/FileEntry.cs
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
namespace SabreTools.Data.Models.Steam2Installer
|
||||||
|
{
|
||||||
|
|
||||||
|
public sealed class FileEntry
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Offset of the filename in the string bytes array
|
||||||
|
/// </summary>
|
||||||
|
public uint NameOffset { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Offset of the path name in the string bytes array
|
||||||
|
/// </summary>
|
||||||
|
public uint PathOffset { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Steam depot id of the depot the file is a part of
|
||||||
|
/// </summary>
|
||||||
|
public uint DepotId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Offset of the file within its sid volume
|
||||||
|
/// </summary>
|
||||||
|
public ulong Offset { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Size of the file, in bytes
|
||||||
|
/// </summary>
|
||||||
|
public ulong Size { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Which # installer disc the file is on
|
||||||
|
/// </summary>
|
||||||
|
public byte DiscNumber { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Which # sid volume the file is in
|
||||||
|
/// </summary>
|
||||||
|
public byte VolumeNumber { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Whether the file is encrypted or not
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// This flag isn't entirely reliable, as sometimes the file is encrypted in the sid without this
|
||||||
|
/// flag being set in the sid. The reverse is not currently known to be true, though, so there at
|
||||||
|
/// least shouldn't be any false positives when using this flag.
|
||||||
|
/// </remarks>
|
||||||
|
public bool Encrypted { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Unknown 1-byte value, likely just padding
|
||||||
|
/// </summary>
|
||||||
|
public byte Unknown { get; set; }
|
||||||
|
|
||||||
|
// The filename and path aren't stored in the fileentry structure in the .sim, but the offsets are,
|
||||||
|
// so it just makes sense to also parse and store the strings for the file here too.
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The filename
|
||||||
|
/// </summary>
|
||||||
|
public string Name { get; set; } = string.Empty;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The file path
|
||||||
|
/// </summary>
|
||||||
|
public string Path { get; set; } = string.Empty;
|
||||||
|
}
|
||||||
|
}
|
||||||
30
SabreTools.Data.Models/Steam2Installer/Header.cs
Normal file
30
SabreTools.Data.Models/Steam2Installer/Header.cs
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
namespace SabreTools.Data.Models.Steam2Installer
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Header from the .sim file.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class Header
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// .sim file magic value
|
||||||
|
/// </summary>
|
||||||
|
public uint Magic { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Version (0x00000001)
|
||||||
|
/// </summary>
|
||||||
|
public uint Version { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Number of discs
|
||||||
|
/// </summary>
|
||||||
|
public uint Discs { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Size of the section containing file and path strings.
|
||||||
|
/// </summary>
|
||||||
|
public uint StringsSize { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
31
SabreTools.Data.Models/Steam2Installer/SimFile.cs
Normal file
31
SabreTools.Data.Models/Steam2Installer/SimFile.cs
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
namespace SabreTools.Data.Models.Steam2Installer
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// .sim file for a .sim/.sid archive
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// While it is not known for sure what .sim stands for, it's assumed to mean Steam Installer Manifest.
|
||||||
|
/// This contains information about the .sid data volumes. It's used for retail installer discs for
|
||||||
|
/// Steam2 (Steam pre-Steam3/SteamPipe). Preceded by GCF (GCF and NCF are still used for actual game
|
||||||
|
/// installs on Steam2, sim/sid just replaced GCF for retail discs. NCF was never directly stored on
|
||||||
|
/// retail discs since sim/sid had already come out). Succeeded by csm/csd for Steam3/SteamPipe.
|
||||||
|
/// Code is based on NickNine's python-based sim/sid extractor at https://pastebin.com/sj6F64XP
|
||||||
|
/// While this was not referenced for any of the code in SabreTools, https://codeberg.org/CYBERDEV/SIDEx
|
||||||
|
/// provides additional documentation if it is needed.
|
||||||
|
/// </remarks>
|
||||||
|
public sealed class SimFile
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// .sim file header
|
||||||
|
/// </summary>
|
||||||
|
public Header Header { get; set; } = new();
|
||||||
|
|
||||||
|
// The string bytes array would go here, but it gets parsed out into FileEntries during deserialization,
|
||||||
|
// so there's no point storing it in the model. Same with the file entries size and count.
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Array of file entries
|
||||||
|
/// </summary>
|
||||||
|
public FileEntry[] FileEntries { get; set; } = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
15
SabreTools.Data.Models/Steam2Installer/Steam2InstallerSet.cs
Normal file
15
SabreTools.Data.Models/Steam2Installer/Steam2InstallerSet.cs
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
namespace SabreTools.Data.Models.Steam2Installer
|
||||||
|
{
|
||||||
|
public class Steam2InstallerSet
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The sim file
|
||||||
|
/// </summary>
|
||||||
|
public SimFile Sim { get; set; } = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The set of sid file volumes
|
||||||
|
/// </summary>
|
||||||
|
// public SidFile[] Sid { get; set; } = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -212,6 +212,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
DatVersion = "datversion",
|
DatVersion = "datversion",
|
||||||
Debug = true,
|
Debug = true,
|
||||||
Description = "description",
|
Description = "description",
|
||||||
|
DirHandling = "noautodir",
|
||||||
Email = "email",
|
Email = "email",
|
||||||
EmulatorVersion = "emulatorversion",
|
EmulatorVersion = "emulatorversion",
|
||||||
FileName = "filename",
|
FileName = "filename",
|
||||||
@@ -243,6 +244,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
ScreenshotsHeight = "screenshotsheight",
|
ScreenshotsHeight = "screenshotsheight",
|
||||||
ScreenshotsWidth = "screenshotsWidth",
|
ScreenshotsWidth = "screenshotsWidth",
|
||||||
Search = search,
|
Search = search,
|
||||||
|
Subset = "subset",
|
||||||
System = "system",
|
System = "system",
|
||||||
Timestamp = "timestamp",
|
Timestamp = "timestamp",
|
||||||
Type = "type",
|
Type = "type",
|
||||||
@@ -326,6 +328,8 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
SampleOf = "sampleof",
|
SampleOf = "sampleof",
|
||||||
SaveType = "savetype",
|
SaveType = "savetype",
|
||||||
Score = "score",
|
Score = "score",
|
||||||
|
Serial = "serial",
|
||||||
|
SetType = "dir",
|
||||||
SharedFeat = [CreateMetadataSharedFeat()],
|
SharedFeat = [CreateMetadataSharedFeat()],
|
||||||
Slot = [CreateMetadataSlot()],
|
Slot = [CreateMetadataSlot()],
|
||||||
SoftwareList = [CreateMetadataSoftwareList()],
|
SoftwareList = [CreateMetadataSoftwareList()],
|
||||||
@@ -340,6 +344,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Tags = "tags",
|
Tags = "tags",
|
||||||
TitleID = "titleid",
|
TitleID = "titleid",
|
||||||
Url = "url",
|
Url = "url",
|
||||||
|
Version = "version",
|
||||||
Video = [CreateMetadataVideo()],
|
Video = [CreateMetadataVideo()],
|
||||||
Year = "year",
|
Year = "year",
|
||||||
};
|
};
|
||||||
@@ -776,6 +781,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Bios = "bios",
|
Bios = "bios",
|
||||||
Bitrate = "bitrate",
|
Bitrate = "bitrate",
|
||||||
BitTorrentMagnetHash = "btih",
|
BitTorrentMagnetHash = "btih",
|
||||||
|
BLAKE3 = HashType.BLAKE3.ZeroString,
|
||||||
ClothCoverDetectionModuleVersion = "cloth_cover_detection_module_version",
|
ClothCoverDetectionModuleVersion = "cloth_cover_detection_module_version",
|
||||||
CollectionCatalogNumber = "collection-catalog-number",
|
CollectionCatalogNumber = "collection-catalog-number",
|
||||||
Comment = "comment",
|
Comment = "comment",
|
||||||
@@ -1002,6 +1008,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal("datversion", datHeader.DatVersion);
|
Assert.Equal("datversion", datHeader.DatVersion);
|
||||||
Assert.True(datHeader.Debug);
|
Assert.True(datHeader.Debug);
|
||||||
Assert.Equal("description", datHeader.Description);
|
Assert.Equal("description", datHeader.Description);
|
||||||
|
Assert.Equal("noautodir", datHeader.DirHandling);
|
||||||
Assert.Equal("email", datHeader.Email);
|
Assert.Equal("email", datHeader.Email);
|
||||||
Assert.Equal("emulatorversion", datHeader.EmulatorVersion);
|
Assert.Equal("emulatorversion", datHeader.EmulatorVersion);
|
||||||
Assert.Equal(Data.Models.Metadata.MergingFlag.Merged, datHeader.ForceMerging);
|
Assert.Equal(Data.Models.Metadata.MergingFlag.Merged, datHeader.ForceMerging);
|
||||||
@@ -1031,6 +1038,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal("screenshotsheight", datHeader.ScreenshotsHeight);
|
Assert.Equal("screenshotsheight", datHeader.ScreenshotsHeight);
|
||||||
Assert.Equal("screenshotsWidth", datHeader.ScreenshotsWidth);
|
Assert.Equal("screenshotsWidth", datHeader.ScreenshotsWidth);
|
||||||
Assert.NotNull(datHeader.Search);
|
Assert.NotNull(datHeader.Search);
|
||||||
|
Assert.Equal("subset", datHeader.Subset);
|
||||||
Assert.Equal("system", datHeader.System);
|
Assert.Equal("system", datHeader.System);
|
||||||
Assert.Equal("timestamp", datHeader.Timestamp);
|
Assert.Equal("timestamp", datHeader.Timestamp);
|
||||||
Assert.Equal("type", datHeader.Type);
|
Assert.Equal("type", datHeader.Type);
|
||||||
@@ -1088,6 +1096,8 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal("sampleof", machine.SampleOf);
|
Assert.Equal("sampleof", machine.SampleOf);
|
||||||
Assert.Equal("savetype", machine.SaveType);
|
Assert.Equal("savetype", machine.SaveType);
|
||||||
Assert.Equal("score", machine.Score);
|
Assert.Equal("score", machine.Score);
|
||||||
|
Assert.Equal("serial", machine.Serial);
|
||||||
|
Assert.Equal("dir", machine.SetType);
|
||||||
Assert.Equal("source", machine.Source);
|
Assert.Equal("source", machine.Source);
|
||||||
Assert.Equal("sourcefile", machine.SourceFile);
|
Assert.Equal("sourcefile", machine.SourceFile);
|
||||||
Assert.Equal("sourcerom", machine.SourceRom);
|
Assert.Equal("sourcerom", machine.SourceRom);
|
||||||
@@ -1448,6 +1458,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal("bios", rom.Bios);
|
Assert.Equal("bios", rom.Bios);
|
||||||
Assert.Equal("bitrate", rom.Bitrate);
|
Assert.Equal("bitrate", rom.Bitrate);
|
||||||
Assert.Equal("btih", rom.BitTorrentMagnetHash);
|
Assert.Equal("btih", rom.BitTorrentMagnetHash);
|
||||||
|
Assert.Equal(HashType.BLAKE3.ZeroString, rom.BLAKE3);
|
||||||
Assert.Equal("cloth_cover_detection_module_version", rom.ClothCoverDetectionModuleVersion);
|
Assert.Equal("cloth_cover_detection_module_version", rom.ClothCoverDetectionModuleVersion);
|
||||||
Assert.Equal("collection-catalog-number", rom.CollectionCatalogNumber);
|
Assert.Equal("collection-catalog-number", rom.CollectionCatalogNumber);
|
||||||
Assert.Equal("comment", rom.Comment);
|
Assert.Equal("comment", rom.Comment);
|
||||||
|
|||||||
@@ -344,6 +344,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal("datversion", header.DatVersion);
|
Assert.Equal("datversion", header.DatVersion);
|
||||||
Assert.True(header.Debug);
|
Assert.True(header.Debug);
|
||||||
Assert.Equal("description", header.Description);
|
Assert.Equal("description", header.Description);
|
||||||
|
Assert.Equal("noautodir", header.DirHandling);
|
||||||
Assert.Equal("email", header.Email);
|
Assert.Equal("email", header.Email);
|
||||||
Assert.Equal("emulatorversion", header.EmulatorVersion);
|
Assert.Equal("emulatorversion", header.EmulatorVersion);
|
||||||
Assert.Equal("filename", header.FileName);
|
Assert.Equal("filename", header.FileName);
|
||||||
@@ -374,6 +375,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal("screenshotsheight", header.ScreenshotsHeight);
|
Assert.Equal("screenshotsheight", header.ScreenshotsHeight);
|
||||||
Assert.Equal("screenshotsWidth", header.ScreenshotsWidth);
|
Assert.Equal("screenshotsWidth", header.ScreenshotsWidth);
|
||||||
Assert.NotNull(header.Search);
|
Assert.NotNull(header.Search);
|
||||||
|
Assert.Equal("subset", header.Subset);
|
||||||
Assert.Equal("system", header.System);
|
Assert.Equal("system", header.System);
|
||||||
Assert.Equal("timestamp", header.Timestamp);
|
Assert.Equal("timestamp", header.Timestamp);
|
||||||
Assert.Equal("type", header.Type);
|
Assert.Equal("type", header.Type);
|
||||||
@@ -435,6 +437,8 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal("sampleof", machine.SampleOf);
|
Assert.Equal("sampleof", machine.SampleOf);
|
||||||
Assert.Equal("savetype", machine.SaveType);
|
Assert.Equal("savetype", machine.SaveType);
|
||||||
Assert.Equal("score", machine.Score);
|
Assert.Equal("score", machine.Score);
|
||||||
|
Assert.Equal("serial", machine.Serial);
|
||||||
|
Assert.Equal("dir", machine.SetType);
|
||||||
Assert.Equal("source", machine.Source);
|
Assert.Equal("source", machine.Source);
|
||||||
Assert.Equal("sourcefile", machine.SourceFile);
|
Assert.Equal("sourcefile", machine.SourceFile);
|
||||||
Assert.Equal("sourcerom", machine.SourceRom);
|
Assert.Equal("sourcerom", machine.SourceRom);
|
||||||
@@ -444,6 +448,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal("system", machine.System);
|
Assert.Equal("system", machine.System);
|
||||||
Assert.Equal("tags", machine.Tags);
|
Assert.Equal("tags", machine.Tags);
|
||||||
Assert.Equal("titleid", machine.TitleID);
|
Assert.Equal("titleid", machine.TitleID);
|
||||||
|
Assert.Equal("version", machine.Version);
|
||||||
Assert.Equal("year", machine.Year);
|
Assert.Equal("year", machine.Year);
|
||||||
|
|
||||||
Data.Models.Metadata.Adjuster[]? adjusters = machine.Adjuster;
|
Data.Models.Metadata.Adjuster[]? adjusters = machine.Adjuster;
|
||||||
@@ -1003,6 +1008,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal("bios", rom.Bios);
|
Assert.Equal("bios", rom.Bios);
|
||||||
Assert.Equal("bitrate", rom.Bitrate);
|
Assert.Equal("bitrate", rom.Bitrate);
|
||||||
Assert.Equal("btih", rom.BitTorrentMagnetHash);
|
Assert.Equal("btih", rom.BitTorrentMagnetHash);
|
||||||
|
Assert.Equal(HashType.BLAKE3.ZeroString, rom.BLAKE3);
|
||||||
Assert.Equal("cloth_cover_detection_module_version", rom.ClothCoverDetectionModuleVersion);
|
Assert.Equal("cloth_cover_detection_module_version", rom.ClothCoverDetectionModuleVersion);
|
||||||
Assert.Equal("collection-catalog-number", rom.CollectionCatalogNumber);
|
Assert.Equal("collection-catalog-number", rom.CollectionCatalogNumber);
|
||||||
Assert.Equal("comment", rom.Comment);
|
Assert.Equal("comment", rom.Comment);
|
||||||
|
|||||||
@@ -1396,7 +1396,8 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
SHA256 = "sha256",
|
SHA256 = "sha256",
|
||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum"
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
string actual = DatFile.FormatPrefixPostfix(item, machine, fix);
|
string actual = DatFile.FormatPrefixPostfix(item, machine, fix);
|
||||||
@@ -1514,7 +1515,8 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
SHA256 = "sha256",
|
SHA256 = "sha256",
|
||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum"
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
string actual = DatFile.FormatPrefixPostfix(item, machine, fix);
|
string actual = DatFile.FormatPrefixPostfix(item, machine, fix);
|
||||||
@@ -1550,6 +1552,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Null(rom.SHA384);
|
Assert.Null(rom.SHA384);
|
||||||
Assert.Null(rom.SHA512);
|
Assert.Null(rom.SHA512);
|
||||||
Assert.Null(rom.SpamSum);
|
Assert.Null(rom.SpamSum);
|
||||||
|
Assert.Null(rom.BLAKE3);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
@@ -1575,6 +1578,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Null(rom.SHA384);
|
Assert.Null(rom.SHA384);
|
||||||
Assert.Null(rom.SHA512);
|
Assert.Null(rom.SHA512);
|
||||||
Assert.Null(rom.SpamSum);
|
Assert.Null(rom.SpamSum);
|
||||||
|
Assert.Null(rom.BLAKE3);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
@@ -1594,7 +1598,8 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
SHA256 = "null",
|
SHA256 = "null",
|
||||||
SHA384 = "null",
|
SHA384 = "null",
|
||||||
SHA512 = "null",
|
SHA512 = "null",
|
||||||
SpamSum = "null"
|
SpamSum = "null",
|
||||||
|
BLAKE3 = "null",
|
||||||
};
|
};
|
||||||
|
|
||||||
DatItem actual = DatFile.ProcessNullifiedItem(item);
|
DatItem actual = DatFile.ProcessNullifiedItem(item);
|
||||||
@@ -1614,6 +1619,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal(HashType.SHA384.ZeroString, rom.SHA384);
|
Assert.Equal(HashType.SHA384.ZeroString, rom.SHA384);
|
||||||
Assert.Equal(HashType.SHA512.ZeroString, rom.SHA512);
|
Assert.Equal(HashType.SHA512.ZeroString, rom.SHA512);
|
||||||
Assert.Equal(HashType.SpamSum.ZeroString, rom.SpamSum);
|
Assert.Equal(HashType.SpamSum.ZeroString, rom.SpamSum);
|
||||||
|
Assert.Equal(HashType.BLAKE3.ZeroString, rom.BLAKE3);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
@@ -1955,6 +1961,19 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal($"_{hash}", actual);
|
Assert.Equal($"_{hash}", actual);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void GetDuplicateSuffix_Rom_BLAKE3()
|
||||||
|
{
|
||||||
|
string hash = "hash";
|
||||||
|
DatItem datItem = new Rom
|
||||||
|
{
|
||||||
|
BLAKE3 = hash
|
||||||
|
};
|
||||||
|
|
||||||
|
string actual = DatFile.GetDuplicateSuffix(datItem);
|
||||||
|
Assert.Equal($"_{hash}", actual);
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void GetDuplicateSuffix_Other_Generic()
|
public void GetDuplicateSuffix_Other_Generic()
|
||||||
{
|
{
|
||||||
@@ -2434,7 +2453,8 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
SHA256 = "crc",
|
SHA256 = "crc",
|
||||||
SHA384 = "crc",
|
SHA384 = "crc",
|
||||||
SHA512 = "crc",
|
SHA512 = "crc",
|
||||||
SpamSum = "crc"
|
SpamSum = "crc",
|
||||||
|
BLAKE3 = "crc",
|
||||||
};
|
};
|
||||||
DatFile datFile = new Logiqx(null, useGame: false);
|
DatFile datFile = new Logiqx(null, useGame: false);
|
||||||
|
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal(0, stats.GetHashCount(HashType.SHA384));
|
Assert.Equal(0, stats.GetHashCount(HashType.SHA384));
|
||||||
Assert.Equal(0, stats.GetHashCount(HashType.SHA512));
|
Assert.Equal(0, stats.GetHashCount(HashType.SHA512));
|
||||||
Assert.Equal(0, stats.GetHashCount(HashType.SpamSum));
|
Assert.Equal(0, stats.GetHashCount(HashType.SpamSum));
|
||||||
|
Assert.Equal(0, stats.GetHashCount(HashType.BLAKE3));
|
||||||
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Disk));
|
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Disk));
|
||||||
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.File));
|
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.File));
|
||||||
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Media));
|
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Media));
|
||||||
@@ -88,6 +89,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal(1, stats.GetHashCount(HashType.SHA384));
|
Assert.Equal(1, stats.GetHashCount(HashType.SHA384));
|
||||||
Assert.Equal(1, stats.GetHashCount(HashType.SHA512));
|
Assert.Equal(1, stats.GetHashCount(HashType.SHA512));
|
||||||
Assert.Equal(2, stats.GetHashCount(HashType.SpamSum));
|
Assert.Equal(2, stats.GetHashCount(HashType.SpamSum));
|
||||||
|
Assert.Equal(1, stats.GetHashCount(HashType.BLAKE3));
|
||||||
Assert.Equal(1, stats.GetItemCount(Data.Models.Metadata.ItemType.Disk));
|
Assert.Equal(1, stats.GetItemCount(Data.Models.Metadata.ItemType.Disk));
|
||||||
Assert.Equal(1, stats.GetItemCount(Data.Models.Metadata.ItemType.File));
|
Assert.Equal(1, stats.GetItemCount(Data.Models.Metadata.ItemType.File));
|
||||||
Assert.Equal(1, stats.GetItemCount(Data.Models.Metadata.ItemType.Media));
|
Assert.Equal(1, stats.GetItemCount(Data.Models.Metadata.ItemType.Media));
|
||||||
@@ -116,6 +118,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal(0, stats.GetHashCount(HashType.SHA384));
|
Assert.Equal(0, stats.GetHashCount(HashType.SHA384));
|
||||||
Assert.Equal(0, stats.GetHashCount(HashType.SHA512));
|
Assert.Equal(0, stats.GetHashCount(HashType.SHA512));
|
||||||
Assert.Equal(0, stats.GetHashCount(HashType.SpamSum));
|
Assert.Equal(0, stats.GetHashCount(HashType.SpamSum));
|
||||||
|
Assert.Equal(0, stats.GetHashCount(HashType.BLAKE3));
|
||||||
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Disk));
|
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Disk));
|
||||||
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.File));
|
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.File));
|
||||||
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Media));
|
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Media));
|
||||||
@@ -151,6 +154,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal(0, stats.GetHashCount(HashType.SHA384));
|
Assert.Equal(0, stats.GetHashCount(HashType.SHA384));
|
||||||
Assert.Equal(0, stats.GetHashCount(HashType.SHA512));
|
Assert.Equal(0, stats.GetHashCount(HashType.SHA512));
|
||||||
Assert.Equal(0, stats.GetHashCount(HashType.SpamSum));
|
Assert.Equal(0, stats.GetHashCount(HashType.SpamSum));
|
||||||
|
Assert.Equal(0, stats.GetHashCount(HashType.BLAKE3));
|
||||||
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Disk));
|
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Disk));
|
||||||
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.File));
|
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.File));
|
||||||
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Media));
|
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Media));
|
||||||
@@ -179,6 +183,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal(1, stats.GetHashCount(HashType.SHA384));
|
Assert.Equal(1, stats.GetHashCount(HashType.SHA384));
|
||||||
Assert.Equal(1, stats.GetHashCount(HashType.SHA512));
|
Assert.Equal(1, stats.GetHashCount(HashType.SHA512));
|
||||||
Assert.Equal(2, stats.GetHashCount(HashType.SpamSum));
|
Assert.Equal(2, stats.GetHashCount(HashType.SpamSum));
|
||||||
|
Assert.Equal(1, stats.GetHashCount(HashType.BLAKE3));
|
||||||
Assert.Equal(1, stats.GetItemCount(Data.Models.Metadata.ItemType.Disk));
|
Assert.Equal(1, stats.GetItemCount(Data.Models.Metadata.ItemType.Disk));
|
||||||
Assert.Equal(1, stats.GetItemCount(Data.Models.Metadata.ItemType.File));
|
Assert.Equal(1, stats.GetItemCount(Data.Models.Metadata.ItemType.File));
|
||||||
Assert.Equal(1, stats.GetItemCount(Data.Models.Metadata.ItemType.Media));
|
Assert.Equal(1, stats.GetItemCount(Data.Models.Metadata.ItemType.Media));
|
||||||
@@ -203,6 +208,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal(0, stats.GetHashCount(HashType.SHA384));
|
Assert.Equal(0, stats.GetHashCount(HashType.SHA384));
|
||||||
Assert.Equal(0, stats.GetHashCount(HashType.SHA512));
|
Assert.Equal(0, stats.GetHashCount(HashType.SHA512));
|
||||||
Assert.Equal(0, stats.GetHashCount(HashType.SpamSum));
|
Assert.Equal(0, stats.GetHashCount(HashType.SpamSum));
|
||||||
|
Assert.Equal(0, stats.GetHashCount(HashType.BLAKE3));
|
||||||
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Disk));
|
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Disk));
|
||||||
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.File));
|
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.File));
|
||||||
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Media));
|
Assert.Equal(0, stats.GetItemCount(Data.Models.Metadata.ItemType.Media));
|
||||||
@@ -238,6 +244,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
Assert.Equal(1, newStats.GetHashCount(HashType.SHA384));
|
Assert.Equal(1, newStats.GetHashCount(HashType.SHA384));
|
||||||
Assert.Equal(1, newStats.GetHashCount(HashType.SHA512));
|
Assert.Equal(1, newStats.GetHashCount(HashType.SHA512));
|
||||||
Assert.Equal(1, newStats.GetHashCount(HashType.SpamSum));
|
Assert.Equal(1, newStats.GetHashCount(HashType.SpamSum));
|
||||||
|
Assert.Equal(1, newStats.GetHashCount(HashType.BLAKE3));
|
||||||
Assert.Equal(1, newStats.GetItemCount(Data.Models.Metadata.ItemType.Rom));
|
Assert.Equal(1, newStats.GetItemCount(Data.Models.Metadata.ItemType.Rom));
|
||||||
Assert.Equal(1, newStats.GetStatusCount(ItemStatus.Good));
|
Assert.Equal(1, newStats.GetStatusCount(ItemStatus.Good));
|
||||||
}
|
}
|
||||||
@@ -317,6 +324,7 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
rom.SHA384 = HashType.SHA384.ZeroString;
|
rom.SHA384 = HashType.SHA384.ZeroString;
|
||||||
rom.SHA512 = HashType.SHA512.ZeroString;
|
rom.SHA512 = HashType.SHA512.ZeroString;
|
||||||
rom.SpamSum = HashType.SpamSum.ZeroString;
|
rom.SpamSum = HashType.SpamSum.ZeroString;
|
||||||
|
rom.BLAKE3 = HashType.BLAKE3.ZeroString;
|
||||||
|
|
||||||
return rom;
|
return rom;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -700,6 +700,31 @@ namespace SabreTools.Metadata.DatFiles.Test
|
|||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Blake3File_SupportedTypes()
|
||||||
|
{
|
||||||
|
var datFile = new Blake3File(null);
|
||||||
|
var actual = datFile.SupportedTypes;
|
||||||
|
Assert.True(actual.SequenceEqual([
|
||||||
|
Data.Models.Metadata.ItemType.Rom,
|
||||||
|
]));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Blake3File_GetMissingRequiredFields_Rom()
|
||||||
|
{
|
||||||
|
var datItem = new Rom();
|
||||||
|
var datFile = new Blake3File(null);
|
||||||
|
|
||||||
|
var actual = datFile.GetMissingRequiredFields(datItem);
|
||||||
|
|
||||||
|
Assert.NotNull(actual);
|
||||||
|
Assert.True(actual.SequenceEqual([
|
||||||
|
nameof(Data.Models.Metadata.Rom.Name),
|
||||||
|
nameof(Data.Models.Metadata.Rom.BLAKE3),
|
||||||
|
]));
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Listrom
|
#region Listrom
|
||||||
|
|||||||
@@ -8,11 +8,11 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="coverlet.collector" Version="10.0.0" />
|
<PackageReference Include="coverlet.collector" Version="10.0.1" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
|
||||||
<PackageReference Include="SabreTools.Hashing" Version="[2.0.0]" />
|
<PackageReference Include="SabreTools.Hashing" Version="2.1.0" />
|
||||||
<PackageReference Include="xunit" Version="2.9.3" />
|
<PackageReference Include="xunit" Version="2.9.3" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -104,6 +104,8 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
Header.Debug = header.Debug;
|
Header.Debug = header.Debug;
|
||||||
if (Header.Description is null)
|
if (Header.Description is null)
|
||||||
Header.Description = header.Description;
|
Header.Description = header.Description;
|
||||||
|
if (Header.DirHandling is null)
|
||||||
|
Header.DirHandling = header.DirHandling;
|
||||||
if (Header.Email is null)
|
if (Header.Email is null)
|
||||||
Header.Email = header.Email;
|
Header.Email = header.Email;
|
||||||
if (Header.EmulatorVersion is null)
|
if (Header.EmulatorVersion is null)
|
||||||
@@ -156,6 +158,8 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
Header.ScreenshotsWidth = header.ScreenshotsWidth;
|
Header.ScreenshotsWidth = header.ScreenshotsWidth;
|
||||||
if (Header.System is null)
|
if (Header.System is null)
|
||||||
Header.System = header.System;
|
Header.System = header.System;
|
||||||
|
if (Header.Subset is null)
|
||||||
|
Header.Subset = header.Subset;
|
||||||
if (Header.Timestamp is null)
|
if (Header.Timestamp is null)
|
||||||
Header.Timestamp = header.Timestamp;
|
Header.Timestamp = header.Timestamp;
|
||||||
if (Header.Type is null)
|
if (Header.Type is null)
|
||||||
|
|||||||
@@ -593,7 +593,8 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
sha384 = string.Empty,
|
sha384 = string.Empty,
|
||||||
sha512 = string.Empty,
|
sha512 = string.Empty,
|
||||||
size = string.Empty,
|
size = string.Empty,
|
||||||
spamsum = string.Empty;
|
spamsum = string.Empty,
|
||||||
|
blake3 = string.Empty;
|
||||||
|
|
||||||
// Ensure we have the proper values for replacement
|
// Ensure we have the proper values for replacement
|
||||||
if (item is Disk disk)
|
if (item is Disk disk)
|
||||||
@@ -633,6 +634,7 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
sha512 = rom.SHA512 ?? string.Empty;
|
sha512 = rom.SHA512 ?? string.Empty;
|
||||||
size = rom.Size.ToString() ?? string.Empty;
|
size = rom.Size.ToString() ?? string.Empty;
|
||||||
spamsum = rom.SpamSum ?? string.Empty;
|
spamsum = rom.SpamSum ?? string.Empty;
|
||||||
|
blake3 = rom.BLAKE3 ?? string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Now do bulk replacement where possible
|
// Now do bulk replacement where possible
|
||||||
@@ -657,7 +659,8 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
.Replace("%sha384%", sha384)
|
.Replace("%sha384%", sha384)
|
||||||
.Replace("%sha512%", sha512)
|
.Replace("%sha512%", sha512)
|
||||||
.Replace("%size%", size)
|
.Replace("%size%", size)
|
||||||
.Replace("%spamsum%", spamsum);
|
.Replace("%spamsum%", spamsum)
|
||||||
|
.Replace("%blake3%", blake3);
|
||||||
|
|
||||||
return fix;
|
return fix;
|
||||||
}
|
}
|
||||||
@@ -697,6 +700,7 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
rom.SHA384 = rom.SHA384 == "null" ? HashType.SHA384.ZeroString : null;
|
rom.SHA384 = rom.SHA384 == "null" ? HashType.SHA384.ZeroString : null;
|
||||||
rom.SHA512 = rom.SHA512 == "null" ? HashType.SHA512.ZeroString : null;
|
rom.SHA512 = rom.SHA512 == "null" ? HashType.SHA512.ZeroString : null;
|
||||||
rom.SpamSum = rom.SpamSum == "null" ? HashType.SpamSum.ZeroString : null;
|
rom.SpamSum = rom.SpamSum == "null" ? HashType.SpamSum.ZeroString : null;
|
||||||
|
rom.BLAKE3 = rom.BLAKE3 == "null" ? HashType.BLAKE3.ZeroString : null;
|
||||||
|
|
||||||
return rom;
|
return rom;
|
||||||
}
|
}
|
||||||
@@ -1127,6 +1131,10 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
if (!string.IsNullOrEmpty(spamSum))
|
if (!string.IsNullOrEmpty(spamSum))
|
||||||
return $"_{spamSum}";
|
return $"_{spamSum}";
|
||||||
|
|
||||||
|
string? blake3 = datItem.BLAKE3;
|
||||||
|
if (!string.IsNullOrEmpty(blake3))
|
||||||
|
return $"_{blake3}";
|
||||||
|
|
||||||
return "_1";
|
return "_1";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -84,6 +84,12 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
set => _internal.Description = value;
|
set => _internal.Description = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string? DirHandling
|
||||||
|
{
|
||||||
|
get => _internal.DirHandling;
|
||||||
|
set => _internal.DirHandling = value;
|
||||||
|
}
|
||||||
|
|
||||||
public string? Email
|
public string? Email
|
||||||
{
|
{
|
||||||
get => _internal.Email;
|
get => _internal.Email;
|
||||||
@@ -282,6 +288,12 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public bool SearchSpecified => Search is not null;
|
public bool SearchSpecified => Search is not null;
|
||||||
|
|
||||||
|
public string? Subset
|
||||||
|
{
|
||||||
|
get => _internal.Subset;
|
||||||
|
set => _internal.Subset = value;
|
||||||
|
}
|
||||||
|
|
||||||
public string? System
|
public string? System
|
||||||
{
|
{
|
||||||
get => _internal.System;
|
get => _internal.System;
|
||||||
|
|||||||
@@ -353,6 +353,12 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
ModifyHashCount(HashType.SHA384, string.IsNullOrEmpty(rom.SHA384) ? 0 : 1);
|
ModifyHashCount(HashType.SHA384, string.IsNullOrEmpty(rom.SHA384) ? 0 : 1);
|
||||||
ModifyHashCount(HashType.SHA512, string.IsNullOrEmpty(rom.SHA512) ? 0 : 1);
|
ModifyHashCount(HashType.SHA512, string.IsNullOrEmpty(rom.SHA512) ? 0 : 1);
|
||||||
ModifyHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.SpamSum) ? 0 : 1);
|
ModifyHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.SpamSum) ? 0 : 1);
|
||||||
|
#if NET7_0_OR_GREATER
|
||||||
|
ModifyHashCount(HashType.BLAKE3, string.IsNullOrEmpty(rom.BLAKE3) ? 0 : 1);
|
||||||
|
#else
|
||||||
|
// HACK because BLAKE3 is not supported below .NET 7
|
||||||
|
ModifyHashCount(HashType.CRC1_ZERO, string.IsNullOrEmpty(rom.BLAKE3) ? 0 : 1);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
ModifyStatusCount(ItemStatus.BadDump, status == ItemStatus.BadDump ? 1 : 0);
|
ModifyStatusCount(ItemStatus.BadDump, status == ItemStatus.BadDump ? 1 : 0);
|
||||||
@@ -430,6 +436,12 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
ModifyHashCount(HashType.SHA384, string.IsNullOrEmpty(rom.SHA384) ? 0 : -1);
|
ModifyHashCount(HashType.SHA384, string.IsNullOrEmpty(rom.SHA384) ? 0 : -1);
|
||||||
ModifyHashCount(HashType.SHA512, string.IsNullOrEmpty(rom.SHA512) ? 0 : -1);
|
ModifyHashCount(HashType.SHA512, string.IsNullOrEmpty(rom.SHA512) ? 0 : -1);
|
||||||
ModifyHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.SpamSum) ? 0 : -1);
|
ModifyHashCount(HashType.SpamSum, string.IsNullOrEmpty(rom.SpamSum) ? 0 : -1);
|
||||||
|
#if NET7_0_OR_GREATER
|
||||||
|
ModifyHashCount(HashType.BLAKE3, string.IsNullOrEmpty(rom.BLAKE3) ? 0 : -1);
|
||||||
|
#else
|
||||||
|
// HACK because BLAKE3 is not supported below .NET 7
|
||||||
|
ModifyHashCount(HashType.CRC1_ZERO, string.IsNullOrEmpty(rom.BLAKE3) ? 0 : -1);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
ModifyStatusCount(ItemStatus.BadDump, status == ItemStatus.BadDump ? -1 : 0);
|
ModifyStatusCount(ItemStatus.BadDump, status == ItemStatus.BadDump ? -1 : 0);
|
||||||
|
|||||||
@@ -169,6 +169,11 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
RedumpSpamSum,
|
RedumpSpamSum,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// BLAKE3 hash list
|
||||||
|
/// </summary>
|
||||||
|
RedumpBLAKE3,
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
56
SabreTools.Metadata.DatFiles/Formats/Blake3File.cs
Normal file
56
SabreTools.Metadata.DatFiles/Formats/Blake3File.cs
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using SabreTools.Hashing;
|
||||||
|
using SabreTools.Metadata.DatItems;
|
||||||
|
using SabreTools.Metadata.DatItems.Formats;
|
||||||
|
|
||||||
|
namespace SabreTools.Metadata.DatFiles.Formats
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Represents an BLAKE3 hashfile
|
||||||
|
/// </summary>
|
||||||
|
public sealed class Blake3File : Hashfile
|
||||||
|
{
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public override Data.Models.Metadata.ItemType[] SupportedTypes
|
||||||
|
=> [
|
||||||
|
Data.Models.Metadata.ItemType.Rom,
|
||||||
|
];
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Constructor designed for casting a base DatFile
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="datFile">Parent DatFile to copy from</param>
|
||||||
|
public Blake3File(DatFile? datFile) : base(datFile)
|
||||||
|
{
|
||||||
|
#if NET7_0_OR_GREATER
|
||||||
|
_hash = HashType.BLAKE3;
|
||||||
|
#else
|
||||||
|
// HACK because BLAKE3 is not supported below .NET 7
|
||||||
|
_hash = HashType.CRC1_ZERO;
|
||||||
|
#endif
|
||||||
|
Header.DatFormat = DatFormat.RedumpBLAKE3;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
protected internal override List<string>? GetMissingRequiredFields(DatItem datItem)
|
||||||
|
{
|
||||||
|
List<string> missingFields = [];
|
||||||
|
|
||||||
|
switch (datItem)
|
||||||
|
{
|
||||||
|
case Rom rom:
|
||||||
|
if (string.IsNullOrEmpty(rom.Name))
|
||||||
|
missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
|
||||||
|
if (string.IsNullOrEmpty(rom.BLAKE3))
|
||||||
|
missingFields.Add(nameof(Data.Models.Metadata.Rom.BLAKE3));
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
// Item type is not supported
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return missingFields;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -90,7 +90,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
|
|||||||
missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
|
missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
|
||||||
if (rom.Size is null || rom.Size < 0)
|
if (rom.Size is null || rom.Size < 0)
|
||||||
missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
|
missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
|
||||||
if (string.IsNullOrEmpty(rom.CRC16)
|
if (string.IsNullOrEmpty(rom.BLAKE3)
|
||||||
|
&& string.IsNullOrEmpty(rom.CRC16)
|
||||||
&& string.IsNullOrEmpty(rom.CRC32)
|
&& string.IsNullOrEmpty(rom.CRC32)
|
||||||
&& string.IsNullOrEmpty(rom.CRC64)
|
&& string.IsNullOrEmpty(rom.CRC64)
|
||||||
&& string.IsNullOrEmpty(rom.MD2)
|
&& string.IsNullOrEmpty(rom.MD2)
|
||||||
|
|||||||
@@ -284,7 +284,8 @@ namespace SabreTools.Metadata.DatFiles.Formats
|
|||||||
missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
|
missingFields.Add(nameof(Data.Models.Metadata.Rom.Name));
|
||||||
if (rom.Size is null || rom.Size < 0)
|
if (rom.Size is null || rom.Size < 0)
|
||||||
missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
|
missingFields.Add(nameof(Data.Models.Metadata.Rom.Size));
|
||||||
if (string.IsNullOrEmpty(rom.CRC16)
|
if (string.IsNullOrEmpty(rom.BLAKE3)
|
||||||
|
&& string.IsNullOrEmpty(rom.CRC16)
|
||||||
&& string.IsNullOrEmpty(rom.CRC32)
|
&& string.IsNullOrEmpty(rom.CRC32)
|
||||||
&& string.IsNullOrEmpty(rom.CRC64)
|
&& string.IsNullOrEmpty(rom.CRC64)
|
||||||
&& string.IsNullOrEmpty(rom.MD2)
|
&& string.IsNullOrEmpty(rom.MD2)
|
||||||
|
|||||||
@@ -482,6 +482,7 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
rom.SHA384 = null; // HashType.SHA384.ZeroString;
|
rom.SHA384 = null; // HashType.SHA384.ZeroString;
|
||||||
rom.SHA512 = null; // HashType.SHA512.ZeroString;
|
rom.SHA512 = null; // HashType.SHA512.ZeroString;
|
||||||
rom.SpamSum = null; // HashType.SpamSum.ZeroString;
|
rom.SpamSum = null; // HashType.SpamSum.ZeroString;
|
||||||
|
rom.BLAKE3 = null; // HashType.BLAKE3.ZeroString;
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the file has no size and it's not the above case, skip and log
|
// If the file has no size and it's not the above case, skip and log
|
||||||
|
|||||||
@@ -40,6 +40,15 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
private readonly Dictionary<string, List<DatItem>?> _items = [];
|
private readonly Dictionary<string, List<DatItem>?> _items = [];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Internal dictionary for the class
|
||||||
|
/// </summary>
|
||||||
|
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
|
||||||
|
private readonly ConcurrentDictionary<string, object> _itemsLocks = [];
|
||||||
|
#else
|
||||||
|
private readonly Dictionary<string, object> _itemsLocks = [];
|
||||||
|
#endif
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Logging object
|
/// Logging object
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -163,6 +172,7 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
rom.SHA384 = null; // HashType.SHA384.ZeroString;
|
rom.SHA384 = null; // HashType.SHA384.ZeroString;
|
||||||
rom.SHA512 = null; // HashType.SHA512.ZeroString;
|
rom.SHA512 = null; // HashType.SHA512.ZeroString;
|
||||||
rom.SpamSum = null; // HashType.SpamSum.ZeroString;
|
rom.SpamSum = null; // HashType.SpamSum.ZeroString;
|
||||||
|
rom.BLAKE3 = null; // HashType.BLAKE3.ZeroString;
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the file has no size and it's not the above case, skip and log
|
// If the file has no size and it's not the above case, skip and log
|
||||||
@@ -190,7 +200,14 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
// If only adding statistics, we add an empty key for games and then just item stats
|
// If only adding statistics, we add an empty key for games and then just item stats
|
||||||
if (statsOnly)
|
if (statsOnly)
|
||||||
{
|
{
|
||||||
EnsureBucketingKey(key);
|
// Add an empty key
|
||||||
|
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
|
||||||
|
_items.GetOrAdd(key, []);
|
||||||
|
#else
|
||||||
|
if (!_items.ContainsKey(key))
|
||||||
|
_items[key] = [];
|
||||||
|
#endif
|
||||||
|
|
||||||
DatStatistics.AddItemStatistics(item);
|
DatStatistics.AddItemStatistics(item);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -293,7 +310,16 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
public bool RemoveItem(string key, DatItem value, int index)
|
public bool RemoveItem(string key, DatItem value, int index)
|
||||||
{
|
{
|
||||||
// Explicit lock for some weird corner cases
|
// Explicit lock for some weird corner cases
|
||||||
lock (key)
|
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
|
||||||
|
object lockObj = _itemsLocks.GetOrAdd(key, _ => new object());
|
||||||
|
#else
|
||||||
|
if (!_itemsLocks.ContainsKey(key))
|
||||||
|
_itemsLocks[key] = new object();
|
||||||
|
|
||||||
|
object lockObj = _itemsLocks[key];
|
||||||
|
#endif
|
||||||
|
|
||||||
|
lock (lockObj)
|
||||||
{
|
{
|
||||||
// If the key doesn't exist, return
|
// If the key doesn't exist, return
|
||||||
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
|
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
|
||||||
@@ -337,10 +363,24 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
internal void AddItem(string key, DatItem value)
|
internal void AddItem(string key, DatItem value)
|
||||||
{
|
{
|
||||||
// Explicit lock for some weird corner cases
|
// Explicit lock for some weird corner cases
|
||||||
lock (key)
|
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
|
||||||
|
object lockObj = _itemsLocks.GetOrAdd(key, _ => new object());
|
||||||
|
#else
|
||||||
|
if (!_itemsLocks.ContainsKey(key))
|
||||||
|
_itemsLocks[key] = new object();
|
||||||
|
|
||||||
|
object lockObj = _itemsLocks[key];
|
||||||
|
#endif
|
||||||
|
|
||||||
|
lock (lockObj)
|
||||||
{
|
{
|
||||||
// Ensure the key exists
|
// Ensure the key exists
|
||||||
EnsureBucketingKey(key);
|
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
|
||||||
|
_items.GetOrAdd(key, []);
|
||||||
|
#else
|
||||||
|
if (!_items.ContainsKey(key))
|
||||||
|
_items[key] = [];
|
||||||
|
#endif
|
||||||
|
|
||||||
// If item is null, don't add it
|
// If item is null, don't add it
|
||||||
if (value is null)
|
if (value is null)
|
||||||
@@ -639,21 +679,6 @@ namespace SabreTools.Metadata.DatFiles
|
|||||||
return roms.FindIndex(datItem.Equals) > -1;
|
return roms.FindIndex(datItem.Equals) > -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Ensure the key exists in the items dictionary
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="key">Key to ensure</param>
|
|
||||||
private void EnsureBucketingKey(string key)
|
|
||||||
{
|
|
||||||
// If the key is missing from the dictionary, add it
|
|
||||||
#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
|
|
||||||
_items.GetOrAdd(key, []);
|
|
||||||
#else
|
|
||||||
if (!_items.ContainsKey(key))
|
|
||||||
_items[key] = [];
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get the highest-order Field value that represents the statistics
|
/// Get the highest-order Field value that represents the statistics
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
||||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<Version>3.0.0</Version>
|
<Version>3.2.0</Version>
|
||||||
|
|
||||||
<!-- Package Properties -->
|
<!-- Package Properties -->
|
||||||
<Authors>Matt Nadareski</Authors>
|
<Authors>Matt Nadareski</Authors>
|
||||||
@@ -46,8 +46,8 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="MinValueTupleBridge" Version="0.2.1" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))" />
|
<PackageReference Include="MinValueTupleBridge" Version="0.2.1" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||||
<PackageReference Include="SabreTools.Hashing" Version="[2.0.0]" />
|
<PackageReference Include="SabreTools.Hashing" Version="2.1.0" />
|
||||||
<PackageReference Include="SabreTools.IO" Version="[2.1.0]" />
|
<PackageReference Include="SabreTools.IO" Version="2.3.0" />
|
||||||
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="$(TargetFramework.StartsWith(`net40`)) OR $(TargetFramework.StartsWith(`net45`))" />
|
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="$(TargetFramework.StartsWith(`net40`)) OR $(TargetFramework.StartsWith(`net45`))" />
|
||||||
<PackageReference Include="System.ValueTuple" Version="4.6.2" Condition="$(TargetFramework.StartsWith(`net46`)) OR $(TargetFramework.StartsWith(`net47`)) OR $(TargetFramework.StartsWith(`net48`))" />
|
<PackageReference Include="System.ValueTuple" Version="4.6.2" Condition="$(TargetFramework.StartsWith(`net46`)) OR $(TargetFramework.StartsWith(`net47`)) OR $(TargetFramework.StartsWith(`net48`))" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -290,6 +290,10 @@ namespace SabreTools.Metadata.DatItems.Test
|
|||||||
[InlineData(ItemKey.SpamSum, false, true, "3::")]
|
[InlineData(ItemKey.SpamSum, false, true, "3::")]
|
||||||
[InlineData(ItemKey.SpamSum, true, false, "3::")]
|
[InlineData(ItemKey.SpamSum, true, false, "3::")]
|
||||||
[InlineData(ItemKey.SpamSum, true, true, "3::")]
|
[InlineData(ItemKey.SpamSum, true, true, "3::")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, false, false, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, false, true, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, true, false, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, true, true, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
public void GetKeyDB_DefaultImplementation(ItemKey bucketedBy, bool lower, bool norename, string expected)
|
public void GetKeyDB_DefaultImplementation(ItemKey bucketedBy, bool lower, bool norename, string expected)
|
||||||
{
|
{
|
||||||
Source source = new Source(0);
|
Source source = new Source(0);
|
||||||
@@ -363,6 +367,10 @@ namespace SabreTools.Metadata.DatItems.Test
|
|||||||
[InlineData(ItemKey.SpamSum, false, true, "BASE64")]
|
[InlineData(ItemKey.SpamSum, false, true, "BASE64")]
|
||||||
[InlineData(ItemKey.SpamSum, true, false, "base64")]
|
[InlineData(ItemKey.SpamSum, true, false, "base64")]
|
||||||
[InlineData(ItemKey.SpamSum, true, true, "base64")]
|
[InlineData(ItemKey.SpamSum, true, true, "base64")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, false, false, "DEADBEEF")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, false, true, "DEADBEEF")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, true, false, "deadbeef")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, true, true, "deadbeef")]
|
||||||
public void GetKeyDB_CustomImplementation(ItemKey bucketedBy, bool lower, bool norename, string expected)
|
public void GetKeyDB_CustomImplementation(ItemKey bucketedBy, bool lower, bool norename, string expected)
|
||||||
{
|
{
|
||||||
Source source = new Source(0);
|
Source source = new Source(0);
|
||||||
@@ -383,7 +391,8 @@ namespace SabreTools.Metadata.DatItems.Test
|
|||||||
SHA256 = "DEADBEEF",
|
SHA256 = "DEADBEEF",
|
||||||
SHA384 = "DEADBEEF",
|
SHA384 = "DEADBEEF",
|
||||||
SHA512 = "DEADBEEF",
|
SHA512 = "DEADBEEF",
|
||||||
SpamSum = "BASE64"
|
SpamSum = "BASE64",
|
||||||
|
BLAKE3 = "DEADBEEF",
|
||||||
};
|
};
|
||||||
|
|
||||||
string actual = datItem.GetKey(bucketedBy, machine, source, lower, norename);
|
string actual = datItem.GetKey(bucketedBy, machine, source, lower, norename);
|
||||||
|
|||||||
@@ -260,6 +260,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
[InlineData(ItemKey.SpamSum, false, true, "3::")]
|
[InlineData(ItemKey.SpamSum, false, true, "3::")]
|
||||||
[InlineData(ItemKey.SpamSum, true, false, "3::")]
|
[InlineData(ItemKey.SpamSum, true, false, "3::")]
|
||||||
[InlineData(ItemKey.SpamSum, true, true, "3::")]
|
[InlineData(ItemKey.SpamSum, true, true, "3::")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, false, false, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, false, true, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, true, false, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, true, true, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
public void GetKeyDBTest(ItemKey bucketedBy, bool lower, bool norename, string expected)
|
public void GetKeyDBTest(ItemKey bucketedBy, bool lower, bool norename, string expected)
|
||||||
{
|
{
|
||||||
Source source = new Source(0);
|
Source source = new Source(0);
|
||||||
|
|||||||
@@ -337,6 +337,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
[InlineData(ItemKey.SpamSum, false, true, "3::")]
|
[InlineData(ItemKey.SpamSum, false, true, "3::")]
|
||||||
[InlineData(ItemKey.SpamSum, true, false, "3::")]
|
[InlineData(ItemKey.SpamSum, true, false, "3::")]
|
||||||
[InlineData(ItemKey.SpamSum, true, true, "3::")]
|
[InlineData(ItemKey.SpamSum, true, true, "3::")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, false, false, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, false, true, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, true, false, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, true, true, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
public void GetKeyDBTest(ItemKey bucketedBy, bool lower, bool norename, string expected)
|
public void GetKeyDBTest(ItemKey bucketedBy, bool lower, bool norename, string expected)
|
||||||
{
|
{
|
||||||
Source source = new Source(0);
|
Source source = new Source(0);
|
||||||
|
|||||||
@@ -330,6 +330,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
[InlineData(ItemKey.SpamSum, false, true, "DEADBEEF")]
|
[InlineData(ItemKey.SpamSum, false, true, "DEADBEEF")]
|
||||||
[InlineData(ItemKey.SpamSum, true, false, "deadbeef")]
|
[InlineData(ItemKey.SpamSum, true, false, "deadbeef")]
|
||||||
[InlineData(ItemKey.SpamSum, true, true, "deadbeef")]
|
[InlineData(ItemKey.SpamSum, true, true, "deadbeef")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, false, false, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, false, true, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, true, false, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, true, true, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
public void GetKeyDBTest(ItemKey bucketedBy, bool lower, bool norename, string expected)
|
public void GetKeyDBTest(ItemKey bucketedBy, bool lower, bool norename, string expected)
|
||||||
{
|
{
|
||||||
Source source = new Source(0);
|
Source source = new Source(0);
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
Assert.Null(self.SHA384);
|
Assert.Null(self.SHA384);
|
||||||
Assert.Null(self.SHA512);
|
Assert.Null(self.SHA512);
|
||||||
Assert.Null(self.SpamSum);
|
Assert.Null(self.SpamSum);
|
||||||
|
Assert.Null(self.BLAKE3);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
@@ -49,7 +50,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = "sha256",
|
SHA256 = "sha256",
|
||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum"
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
self.FillMissingInformation(other);
|
self.FillMissingInformation(other);
|
||||||
@@ -67,6 +69,7 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
Assert.Equal("sha384", self.SHA384);
|
Assert.Equal("sha384", self.SHA384);
|
||||||
Assert.Equal("sha512", self.SHA512);
|
Assert.Equal("sha512", self.SHA512);
|
||||||
Assert.Equal("spamsum", self.SpamSum);
|
Assert.Equal("spamsum", self.SpamSum);
|
||||||
|
Assert.Equal("blake3", self.BLAKE3);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
@@ -98,7 +101,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasHashes();
|
bool actual = self.HasHashes();
|
||||||
@@ -122,7 +126,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasHashes();
|
bool actual = self.HasHashes();
|
||||||
@@ -146,7 +151,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasHashes();
|
bool actual = self.HasHashes();
|
||||||
@@ -170,7 +176,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasHashes();
|
bool actual = self.HasHashes();
|
||||||
@@ -194,7 +201,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasHashes();
|
bool actual = self.HasHashes();
|
||||||
@@ -218,7 +226,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasHashes();
|
bool actual = self.HasHashes();
|
||||||
@@ -242,7 +251,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasHashes();
|
bool actual = self.HasHashes();
|
||||||
@@ -266,7 +276,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasHashes();
|
bool actual = self.HasHashes();
|
||||||
@@ -290,7 +301,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasHashes();
|
bool actual = self.HasHashes();
|
||||||
@@ -314,7 +326,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = "sha256",
|
SHA256 = "sha256",
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasHashes();
|
bool actual = self.HasHashes();
|
||||||
@@ -338,7 +351,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasHashes();
|
bool actual = self.HasHashes();
|
||||||
@@ -362,7 +376,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasHashes();
|
bool actual = self.HasHashes();
|
||||||
@@ -386,7 +401,33 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = "spamsum"
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
|
};
|
||||||
|
|
||||||
|
bool actual = self.HasHashes();
|
||||||
|
Assert.True(actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void HasHashes_BLAKE3_True()
|
||||||
|
{
|
||||||
|
Rom self = new Rom
|
||||||
|
{
|
||||||
|
CRC16 = string.Empty,
|
||||||
|
CRC32 = 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,
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasHashes();
|
bool actual = self.HasHashes();
|
||||||
@@ -410,7 +451,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = "sha256",
|
SHA256 = "sha256",
|
||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum"
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasHashes();
|
bool actual = self.HasHashes();
|
||||||
@@ -446,7 +488,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = "sha256",
|
SHA256 = "sha256",
|
||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum"
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -470,7 +513,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -494,7 +538,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -518,7 +563,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -542,7 +588,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -566,7 +613,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -590,7 +638,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -614,7 +663,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -638,7 +688,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -662,7 +713,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -686,7 +738,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = HashType.SHA256.ZeroString,
|
SHA256 = HashType.SHA256.ZeroString,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -710,7 +763,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = HashType.SHA384.ZeroString,
|
SHA384 = HashType.SHA384.ZeroString,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -734,7 +788,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = HashType.SHA512.ZeroString,
|
SHA512 = HashType.SHA512.ZeroString,
|
||||||
SpamSum = string.Empty
|
SpamSum = string.Empty,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -758,7 +813,33 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = string.Empty,
|
SHA256 = string.Empty,
|
||||||
SHA384 = string.Empty,
|
SHA384 = string.Empty,
|
||||||
SHA512 = string.Empty,
|
SHA512 = string.Empty,
|
||||||
SpamSum = HashType.SpamSum.ZeroString
|
SpamSum = HashType.SpamSum.ZeroString,
|
||||||
|
BLAKE3 = string.Empty,
|
||||||
|
};
|
||||||
|
|
||||||
|
bool actual = self.HasZeroHash();
|
||||||
|
Assert.True(actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void HasZeroHash_ZeroBLAKE3_True()
|
||||||
|
{
|
||||||
|
Rom self = new Rom
|
||||||
|
{
|
||||||
|
CRC16 = string.Empty,
|
||||||
|
CRC32 = 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,
|
||||||
|
BLAKE3 = HashType.BLAKE3.ZeroString,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -782,7 +863,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = HashType.SHA256.ZeroString,
|
SHA256 = HashType.SHA256.ZeroString,
|
||||||
SHA384 = HashType.SHA384.ZeroString,
|
SHA384 = HashType.SHA384.ZeroString,
|
||||||
SHA512 = HashType.SHA512.ZeroString,
|
SHA512 = HashType.SHA512.ZeroString,
|
||||||
SpamSum = HashType.SpamSum.ZeroString
|
SpamSum = HashType.SpamSum.ZeroString,
|
||||||
|
BLAKE3 = HashType.BLAKE3.ZeroString,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool actual = self.HasZeroHash();
|
bool actual = self.HasZeroHash();
|
||||||
@@ -855,6 +937,10 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
[InlineData(ItemKey.SpamSum, false, true, "DEADBEEF")]
|
[InlineData(ItemKey.SpamSum, false, true, "DEADBEEF")]
|
||||||
[InlineData(ItemKey.SpamSum, true, false, "deadbeef")]
|
[InlineData(ItemKey.SpamSum, true, false, "deadbeef")]
|
||||||
[InlineData(ItemKey.SpamSum, true, true, "deadbeef")]
|
[InlineData(ItemKey.SpamSum, true, true, "deadbeef")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, false, false, "DEADBEEF")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, false, true, "DEADBEEF")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, true, false, "deadbeef")]
|
||||||
|
[InlineData(ItemKey.BLAKE3, true, true, "deadbeef")]
|
||||||
public void GetKeyDBTest(ItemKey bucketedBy, bool lower, bool norename, string expected)
|
public void GetKeyDBTest(ItemKey bucketedBy, bool lower, bool norename, string expected)
|
||||||
{
|
{
|
||||||
Source source = new Source(0);
|
Source source = new Source(0);
|
||||||
@@ -875,7 +961,8 @@ namespace SabreTools.Metadata.DatItems.Formats.Test
|
|||||||
SHA256 = "DEADBEEF",
|
SHA256 = "DEADBEEF",
|
||||||
SHA384 = "DEADBEEF",
|
SHA384 = "DEADBEEF",
|
||||||
SHA512 = "DEADBEEF",
|
SHA512 = "DEADBEEF",
|
||||||
SpamSum = "DEADBEEF"
|
SpamSum = "DEADBEEF",
|
||||||
|
BLAKE3 = "DEADBEEF",
|
||||||
};
|
};
|
||||||
|
|
||||||
string actual = datItem.GetKey(bucketedBy, machine, source, lower, norename);
|
string actual = datItem.GetKey(bucketedBy, machine, source, lower, norename);
|
||||||
|
|||||||
@@ -8,11 +8,11 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="coverlet.collector" Version="10.0.0" />
|
<PackageReference Include="coverlet.collector" Version="10.0.1" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
|
||||||
<PackageReference Include="SabreTools.Hashing" Version="[2.0.0]" />
|
<PackageReference Include="SabreTools.Hashing" Version="2.1.0" />
|
||||||
<PackageReference Include="xunit" Version="2.9.3" />
|
<PackageReference Include="xunit" Version="2.9.3" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -191,6 +191,10 @@ namespace SabreTools.Metadata.DatItems
|
|||||||
// Now determine what the key should be based on the bucketedBy value
|
// Now determine what the key should be based on the bucketedBy value
|
||||||
switch (bucketedBy)
|
switch (bucketedBy)
|
||||||
{
|
{
|
||||||
|
case ItemKey.BLAKE3:
|
||||||
|
key = HashType.BLAKE3.ZeroString;
|
||||||
|
break;
|
||||||
|
|
||||||
case ItemKey.CRC16:
|
case ItemKey.CRC16:
|
||||||
key = HashType.CRC16.ZeroString;
|
key = HashType.CRC16.ZeroString;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ namespace SabreTools.Metadata.DatItems
|
|||||||
|
|
||||||
Machine,
|
Machine,
|
||||||
|
|
||||||
|
BLAKE3,
|
||||||
CRC16,
|
CRC16,
|
||||||
CRC32,
|
CRC32,
|
||||||
CRC64,
|
CRC64,
|
||||||
|
|||||||
@@ -74,6 +74,12 @@ namespace SabreTools.Metadata.DatItems.Formats
|
|||||||
set => _internal.BitTorrentMagnetHash = value;
|
set => _internal.BitTorrentMagnetHash = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string? BLAKE3
|
||||||
|
{
|
||||||
|
get => _internal.BLAKE3;
|
||||||
|
set => _internal.BLAKE3 = value;
|
||||||
|
}
|
||||||
|
|
||||||
public string? ClothCoverDetectionModuleVersion
|
public string? ClothCoverDetectionModuleVersion
|
||||||
{
|
{
|
||||||
get => _internal.ClothCoverDetectionModuleVersion;
|
get => _internal.ClothCoverDetectionModuleVersion;
|
||||||
@@ -858,6 +864,10 @@ namespace SabreTools.Metadata.DatItems.Formats
|
|||||||
// Now determine what the key should be based on the bucketedBy value
|
// Now determine what the key should be based on the bucketedBy value
|
||||||
switch (bucketedBy)
|
switch (bucketedBy)
|
||||||
{
|
{
|
||||||
|
case ItemKey.BLAKE3:
|
||||||
|
key = BLAKE3;
|
||||||
|
break;
|
||||||
|
|
||||||
case ItemKey.CRC16:
|
case ItemKey.CRC16:
|
||||||
key = CRC16;
|
key = CRC16;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -314,6 +314,18 @@ namespace SabreTools.Metadata.DatItems
|
|||||||
set => _internal.Score = value;
|
set => _internal.Score = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string? Serial
|
||||||
|
{
|
||||||
|
get => _internal.Serial;
|
||||||
|
set => _internal.Serial = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string? SetType
|
||||||
|
{
|
||||||
|
get => _internal.SetType;
|
||||||
|
set => _internal.SetType = value;
|
||||||
|
}
|
||||||
|
|
||||||
public string? Source
|
public string? Source
|
||||||
{
|
{
|
||||||
get => _internal.Source;
|
get => _internal.Source;
|
||||||
@@ -374,6 +386,12 @@ namespace SabreTools.Metadata.DatItems
|
|||||||
set => _internal.Url = value;
|
set => _internal.Url = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string? Version
|
||||||
|
{
|
||||||
|
get => _internal.Version;
|
||||||
|
set => _internal.Version = value;
|
||||||
|
}
|
||||||
|
|
||||||
public string? Year
|
public string? Year
|
||||||
{
|
{
|
||||||
get => _internal.Year;
|
get => _internal.Year;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Assembly Properties -->
|
<!-- Assembly Properties -->
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
||||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<Version>3.0.0</Version>
|
<Version>3.2.0</Version>
|
||||||
|
|
||||||
<!-- Package Properties -->
|
<!-- Package Properties -->
|
||||||
<Authors>Matt Nadareski</Authors>
|
<Authors>Matt Nadareski</Authors>
|
||||||
@@ -32,8 +32,8 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||||
<PackageReference Include="SabreTools.Hashing" Version="[2.0.0]" />
|
<PackageReference Include="SabreTools.Hashing" Version="2.1.0" />
|
||||||
<PackageReference Include="SabreTools.IO" Version="[2.1.0]" />
|
<PackageReference Include="SabreTools.IO" Version="2.3.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -1103,6 +1103,7 @@ namespace SabreTools.Metadata.Filter.Test
|
|||||||
[InlineData("header.datversion", "datversion")]
|
[InlineData("header.datversion", "datversion")]
|
||||||
[InlineData("header.debug", "yes")]
|
[InlineData("header.debug", "yes")]
|
||||||
[InlineData("header.description", "description")]
|
[InlineData("header.description", "description")]
|
||||||
|
[InlineData("header.dir", "noautodir")]
|
||||||
[InlineData("header.email", "email")]
|
[InlineData("header.email", "email")]
|
||||||
[InlineData("header.emulatorversion", "emulatorversion")]
|
[InlineData("header.emulatorversion", "emulatorversion")]
|
||||||
[InlineData("header.filename", "filename")]
|
[InlineData("header.filename", "filename")]
|
||||||
@@ -1131,6 +1132,7 @@ namespace SabreTools.Metadata.Filter.Test
|
|||||||
[InlineData("header.schemalocation", "schemalocation")]
|
[InlineData("header.schemalocation", "schemalocation")]
|
||||||
[InlineData("header.screenshotsheight", "screenshotsheight")]
|
[InlineData("header.screenshotsheight", "screenshotsheight")]
|
||||||
[InlineData("header.screenshotswidth", "screenshotswidth")]
|
[InlineData("header.screenshotswidth", "screenshotswidth")]
|
||||||
|
[InlineData("header.subset", "subset")]
|
||||||
[InlineData("header.system", "system")]
|
[InlineData("header.system", "system")]
|
||||||
[InlineData("header.timestamp", "timestamp")]
|
[InlineData("header.timestamp", "timestamp")]
|
||||||
[InlineData("header.type", "type")]
|
[InlineData("header.type", "type")]
|
||||||
@@ -1150,6 +1152,7 @@ namespace SabreTools.Metadata.Filter.Test
|
|||||||
DatVersion = "datversion",
|
DatVersion = "datversion",
|
||||||
Debug = true,
|
Debug = true,
|
||||||
Description = "description",
|
Description = "description",
|
||||||
|
DirHandling = "noautodir",
|
||||||
Email = "email",
|
Email = "email",
|
||||||
EmulatorVersion = "emulatorversion",
|
EmulatorVersion = "emulatorversion",
|
||||||
FileName = "filename",
|
FileName = "filename",
|
||||||
@@ -1176,6 +1179,7 @@ namespace SabreTools.Metadata.Filter.Test
|
|||||||
SchemaLocation = "schemalocation",
|
SchemaLocation = "schemalocation",
|
||||||
ScreenshotsHeight = "screenshotsheight",
|
ScreenshotsHeight = "screenshotsheight",
|
||||||
ScreenshotsWidth = "screenshotswidth",
|
ScreenshotsWidth = "screenshotswidth",
|
||||||
|
Subset = "subset",
|
||||||
System = "system",
|
System = "system",
|
||||||
Timestamp = "timestamp",
|
Timestamp = "timestamp",
|
||||||
Type = "type",
|
Type = "type",
|
||||||
@@ -1290,6 +1294,8 @@ namespace SabreTools.Metadata.Filter.Test
|
|||||||
[InlineData("machine.sampleof", "sampleof")]
|
[InlineData("machine.sampleof", "sampleof")]
|
||||||
[InlineData("machine.savetype", "savetype")]
|
[InlineData("machine.savetype", "savetype")]
|
||||||
[InlineData("machine.score", "score")]
|
[InlineData("machine.score", "score")]
|
||||||
|
[InlineData("machine.serial", "serial")]
|
||||||
|
[InlineData("machine.settype", "dir")]
|
||||||
[InlineData("machine.source", "source")]
|
[InlineData("machine.source", "source")]
|
||||||
[InlineData("machine.sourcefile", "sourcefile")]
|
[InlineData("machine.sourcefile", "sourcefile")]
|
||||||
[InlineData("machine.sourcerom", "sourcerom")]
|
[InlineData("machine.sourcerom", "sourcerom")]
|
||||||
@@ -1359,6 +1365,8 @@ namespace SabreTools.Metadata.Filter.Test
|
|||||||
SampleOf = "sampleof",
|
SampleOf = "sampleof",
|
||||||
SaveType = "savetype",
|
SaveType = "savetype",
|
||||||
Score = "score",
|
Score = "score",
|
||||||
|
Serial = "serial",
|
||||||
|
SetType = "dir",
|
||||||
Source = "source",
|
Source = "source",
|
||||||
SourceFile = "sourcefile",
|
SourceFile = "sourcefile",
|
||||||
SourceRom = "sourcerom",
|
SourceRom = "sourcerom",
|
||||||
@@ -1369,6 +1377,7 @@ namespace SabreTools.Metadata.Filter.Test
|
|||||||
Tags = "tags",
|
Tags = "tags",
|
||||||
TitleID = "titleid",
|
TitleID = "titleid",
|
||||||
Url = "url",
|
Url = "url",
|
||||||
|
Version = "version",
|
||||||
Year = "year",
|
Year = "year",
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1580,6 +1589,7 @@ namespace SabreTools.Metadata.Filter.Test
|
|||||||
[InlineData("rom.bitrate", "bitrate")]
|
[InlineData("rom.bitrate", "bitrate")]
|
||||||
[InlineData("rom.bittorrentmagnethash", "btih")]
|
[InlineData("rom.bittorrentmagnethash", "btih")]
|
||||||
[InlineData("rom.btih", "btih")]
|
[InlineData("rom.btih", "btih")]
|
||||||
|
[InlineData("rom.blake3", "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")]
|
||||||
[InlineData("rom.cloth_cover_detection_module_version", "cloth_cover_detection_module_version")]
|
[InlineData("rom.cloth_cover_detection_module_version", "cloth_cover_detection_module_version")]
|
||||||
[InlineData("rom.clothcoverdetectionmoduleversion", "cloth_cover_detection_module_version")]
|
[InlineData("rom.clothcoverdetectionmoduleversion", "cloth_cover_detection_module_version")]
|
||||||
[InlineData("rom.collection-catalog-number", "collection-catalog-number")]
|
[InlineData("rom.collection-catalog-number", "collection-catalog-number")]
|
||||||
@@ -1717,6 +1727,7 @@ namespace SabreTools.Metadata.Filter.Test
|
|||||||
Bios = "bios",
|
Bios = "bios",
|
||||||
Bitrate = "bitrate",
|
Bitrate = "bitrate",
|
||||||
BitTorrentMagnetHash = "btih",
|
BitTorrentMagnetHash = "btih",
|
||||||
|
BLAKE3 = HashType.BLAKE3.ZeroString,
|
||||||
ClothCoverDetectionModuleVersion = "cloth_cover_detection_module_version",
|
ClothCoverDetectionModuleVersion = "cloth_cover_detection_module_version",
|
||||||
CollectionCatalogNumber = "collection-catalog-number",
|
CollectionCatalogNumber = "collection-catalog-number",
|
||||||
Comment = "comment",
|
Comment = "comment",
|
||||||
|
|||||||
@@ -18,10 +18,10 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="coverlet.collector" Version="10.0.0" />
|
<PackageReference Include="coverlet.collector" Version="10.0.1" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
|
||||||
<PackageReference Include="xunit" Version="2.9.3" />
|
<PackageReference Include="xunit" Version="2.9.3" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -309,6 +309,8 @@ namespace SabreTools.Metadata.Filter
|
|||||||
"datversion",
|
"datversion",
|
||||||
"debug",
|
"debug",
|
||||||
"description",
|
"description",
|
||||||
|
"dir",
|
||||||
|
"dirhandling",
|
||||||
"email",
|
"email",
|
||||||
"emulatorversion",
|
"emulatorversion",
|
||||||
"filename",
|
"filename",
|
||||||
@@ -337,6 +339,7 @@ namespace SabreTools.Metadata.Filter
|
|||||||
"screenshotsheight",
|
"screenshotsheight",
|
||||||
"screenshotswidth",
|
"screenshotswidth",
|
||||||
"skipper",
|
"skipper",
|
||||||
|
"subset",
|
||||||
"system",
|
"system",
|
||||||
"timestamp",
|
"timestamp",
|
||||||
"type",
|
"type",
|
||||||
@@ -421,6 +424,8 @@ namespace SabreTools.Metadata.Filter
|
|||||||
"sampleof",
|
"sampleof",
|
||||||
"savetype",
|
"savetype",
|
||||||
"score",
|
"score",
|
||||||
|
"serial",
|
||||||
|
"settype",
|
||||||
"source",
|
"source",
|
||||||
"sourcefile",
|
"sourcefile",
|
||||||
"sourcerom",
|
"sourcerom",
|
||||||
@@ -540,6 +545,7 @@ namespace SabreTools.Metadata.Filter
|
|||||||
"bitrate",
|
"bitrate",
|
||||||
"bittorrentmagnethash",
|
"bittorrentmagnethash",
|
||||||
"btih",
|
"btih",
|
||||||
|
"blake3",
|
||||||
"cloth_cover_detection_module_version",
|
"cloth_cover_detection_module_version",
|
||||||
"clothcoverdetectionmoduleversion",
|
"clothcoverdetectionmoduleversion",
|
||||||
"collection-catalog-number",
|
"collection-catalog-number",
|
||||||
|
|||||||
@@ -1280,6 +1280,10 @@ namespace SabreTools.Metadata.Filter
|
|||||||
case "description":
|
case "description":
|
||||||
checkValue = obj.Description;
|
checkValue = obj.Description;
|
||||||
return true;
|
return true;
|
||||||
|
case "dir":
|
||||||
|
case "dirhandling":
|
||||||
|
checkValue = obj.DirHandling;
|
||||||
|
return true;
|
||||||
case "email":
|
case "email":
|
||||||
checkValue = obj.Email;
|
checkValue = obj.Email;
|
||||||
return true;
|
return true;
|
||||||
@@ -1365,6 +1369,9 @@ namespace SabreTools.Metadata.Filter
|
|||||||
checkValue = obj.ScreenshotsWidth;
|
checkValue = obj.ScreenshotsWidth;
|
||||||
return true;
|
return true;
|
||||||
// Header.Search is intentionally skipped
|
// Header.Search is intentionally skipped
|
||||||
|
case "subset":
|
||||||
|
checkValue = obj.Subset;
|
||||||
|
return true;
|
||||||
case "system":
|
case "system":
|
||||||
checkValue = obj.System;
|
checkValue = obj.System;
|
||||||
return true;
|
return true;
|
||||||
@@ -1600,6 +1607,12 @@ namespace SabreTools.Metadata.Filter
|
|||||||
case "score":
|
case "score":
|
||||||
checkValue = obj.Score;
|
checkValue = obj.Score;
|
||||||
return true;
|
return true;
|
||||||
|
case "serial":
|
||||||
|
checkValue = obj.Serial;
|
||||||
|
return true;
|
||||||
|
case "settype":
|
||||||
|
checkValue = obj.SetType;
|
||||||
|
return true;
|
||||||
case "source":
|
case "source":
|
||||||
checkValue = obj.Source;
|
checkValue = obj.Source;
|
||||||
return true;
|
return true;
|
||||||
@@ -1630,6 +1643,9 @@ namespace SabreTools.Metadata.Filter
|
|||||||
case "url":
|
case "url":
|
||||||
checkValue = obj.Url;
|
checkValue = obj.Url;
|
||||||
return true;
|
return true;
|
||||||
|
case "version":
|
||||||
|
checkValue = obj.Version;
|
||||||
|
return true;
|
||||||
case "year":
|
case "year":
|
||||||
checkValue = obj.Year;
|
checkValue = obj.Year;
|
||||||
return true;
|
return true;
|
||||||
@@ -1895,6 +1911,9 @@ namespace SabreTools.Metadata.Filter
|
|||||||
case "bittorrentmagnethash":
|
case "bittorrentmagnethash":
|
||||||
checkValue = obj.BitTorrentMagnetHash;
|
checkValue = obj.BitTorrentMagnetHash;
|
||||||
return true;
|
return true;
|
||||||
|
case "blake3":
|
||||||
|
checkValue = obj.BLAKE3;
|
||||||
|
return true;
|
||||||
case "cloth_cover_detection_module_version":
|
case "cloth_cover_detection_module_version":
|
||||||
case "clothcoverdetectionmoduleversion":
|
case "clothcoverdetectionmoduleversion":
|
||||||
checkValue = obj.ClothCoverDetectionModuleVersion;
|
checkValue = obj.ClothCoverDetectionModuleVersion;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Assembly Properties -->
|
<!-- Assembly Properties -->
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
||||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<Version>3.0.0</Version>
|
<Version>3.2.0</Version>
|
||||||
|
|
||||||
<!-- Package Properties -->
|
<!-- Package Properties -->
|
||||||
<Authors>Matt Nadareski</Authors>
|
<Authors>Matt Nadareski</Authors>
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="SabreTools.IO" Version="[2.1.0]" />
|
<PackageReference Include="SabreTools.IO" Version="2.3.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Assembly Properties -->
|
<!-- Assembly Properties -->
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
||||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<Version>3.0.0</Version>
|
<Version>3.2.0</Version>
|
||||||
|
|
||||||
<!-- Package Properties -->
|
<!-- Package Properties -->
|
||||||
<Authors>Matt Nadareski</Authors>
|
<Authors>Matt Nadareski</Authors>
|
||||||
@@ -37,8 +37,8 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="SabreTools.Hashing" Version="[2.0.0]" />
|
<PackageReference Include="SabreTools.Hashing" Version="2.1.0" />
|
||||||
<PackageReference Include="SabreTools.IO" Version="[2.1.0]" />
|
<PackageReference Include="SabreTools.IO" Version="2.3.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -8,10 +8,10 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="coverlet.collector" Version="10.0.0" />
|
<PackageReference Include="coverlet.collector" Version="10.0.1" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
|
||||||
<PackageReference Include="xunit" Version="2.9.3" />
|
<PackageReference Include="xunit" Version="2.9.3" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
||||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<Version>3.0.0</Version>
|
<Version>3.2.0</Version>
|
||||||
|
|
||||||
<!-- Package Properties -->
|
<!-- Package Properties -->
|
||||||
<Authors>Matt Nadareski</Authors>
|
<Authors>Matt Nadareski</Authors>
|
||||||
|
|||||||
@@ -115,6 +115,7 @@ namespace SabreTools.Serialization.CrossModel.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
xxHash364 = "xxhash364",
|
xxHash364 = "xxhash364",
|
||||||
xxHash3128 = "xxhash3128",
|
xxHash3128 = "xxhash3128",
|
||||||
Region = "region",
|
Region = "region",
|
||||||
@@ -378,6 +379,7 @@ namespace SabreTools.Serialization.CrossModel.Test
|
|||||||
Assert.Equal("sha384", rom.SHA384);
|
Assert.Equal("sha384", rom.SHA384);
|
||||||
Assert.Equal("sha512", rom.SHA512);
|
Assert.Equal("sha512", rom.SHA512);
|
||||||
Assert.Equal("spamsum", rom.SpamSum);
|
Assert.Equal("spamsum", rom.SpamSum);
|
||||||
|
Assert.Equal("blake3", rom.BLAKE3);
|
||||||
Assert.Equal("xxhash364", rom.xxHash364);
|
Assert.Equal("xxhash364", rom.xxHash364);
|
||||||
Assert.Equal("xxhash3128", rom.xxHash3128);
|
Assert.Equal("xxhash3128", rom.xxHash3128);
|
||||||
Assert.Equal("region", rom.Region);
|
Assert.Equal("region", rom.Region);
|
||||||
|
|||||||
@@ -213,6 +213,29 @@ namespace SabreTools.Serialization.CrossModel.Test
|
|||||||
Validate(newSpamsum);
|
Validate(newSpamsum);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void RoundTripBLAKE3Test()
|
||||||
|
{
|
||||||
|
// Get the cross-model serializer
|
||||||
|
var serializer = new Hashfile();
|
||||||
|
|
||||||
|
// Build the data
|
||||||
|
Data.Models.Hashfile.Hashfile hf = Build(HashType.BLAKE3);
|
||||||
|
|
||||||
|
// Serialize to generic model
|
||||||
|
Data.Models.Metadata.MetadataFile? metadata = serializer.Serialize(hf);
|
||||||
|
Assert.NotNull(metadata);
|
||||||
|
|
||||||
|
// Serialize back to original model
|
||||||
|
Data.Models.Hashfile.Hashfile? newHf = serializer.Deserialize(metadata, HashType.BLAKE3);
|
||||||
|
|
||||||
|
// Validate the data
|
||||||
|
Assert.NotNull(newHf);
|
||||||
|
Assert.NotNull(newHf.BLAKE3);
|
||||||
|
var newBlake3 = Assert.Single(newHf.BLAKE3);
|
||||||
|
Validate(newBlake3);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Build model for serialization and deserialization
|
/// Build model for serialization and deserialization
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -236,6 +259,8 @@ namespace SabreTools.Serialization.CrossModel.Test
|
|||||||
return new Data.Models.Hashfile.Hashfile { SHA512 = [new Data.Models.Hashfile.SHA512 { Hash = "hash", File = "file" }] };
|
return new Data.Models.Hashfile.Hashfile { SHA512 = [new Data.Models.Hashfile.SHA512 { Hash = "hash", File = "file" }] };
|
||||||
else if (hashType == HashType.SpamSum)
|
else if (hashType == HashType.SpamSum)
|
||||||
return new Data.Models.Hashfile.Hashfile { SpamSum = [new Data.Models.Hashfile.SpamSum { Hash = "hash", File = "file" }] };
|
return new Data.Models.Hashfile.Hashfile { SpamSum = [new Data.Models.Hashfile.SpamSum { Hash = "hash", File = "file" }] };
|
||||||
|
else if (hashType == HashType.BLAKE3)
|
||||||
|
return new Data.Models.Hashfile.Hashfile { BLAKE3 = [new Data.Models.Hashfile.BLAKE3 { Hash = "hash", File = "file" }] };
|
||||||
else
|
else
|
||||||
throw new ArgumentOutOfRangeException(nameof(hashType));
|
throw new ArgumentOutOfRangeException(nameof(hashType));
|
||||||
}
|
}
|
||||||
@@ -329,5 +354,15 @@ namespace SabreTools.Serialization.CrossModel.Test
|
|||||||
Assert.Equal("hash", spamsum.Hash);
|
Assert.Equal("hash", spamsum.Hash);
|
||||||
Assert.Equal("file", spamsum.File);
|
Assert.Equal("file", spamsum.File);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Validate a BLAKE3
|
||||||
|
/// </summary>
|
||||||
|
private static void Validate(Data.Models.Hashfile.BLAKE3? blake3)
|
||||||
|
{
|
||||||
|
Assert.NotNull(blake3);
|
||||||
|
Assert.Equal("hash", blake3.Hash);
|
||||||
|
Assert.Equal("file", blake3.File);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ namespace SabreTools.Serialization.CrossModel.Test
|
|||||||
ForceMerging = Data.Models.Metadata.MergingFlag.Merged,
|
ForceMerging = Data.Models.Metadata.MergingFlag.Merged,
|
||||||
ForceNodump = Data.Models.Metadata.NodumpFlag.Required,
|
ForceNodump = Data.Models.Metadata.NodumpFlag.Required,
|
||||||
ForcePacking = Data.Models.Metadata.PackingFlag.Zip,
|
ForcePacking = Data.Models.Metadata.PackingFlag.Zip,
|
||||||
|
Dir = "noautodir",
|
||||||
};
|
};
|
||||||
|
|
||||||
var clrmamepro = new Data.Models.Logiqx.ClrMamePro
|
var clrmamepro = new Data.Models.Logiqx.ClrMamePro
|
||||||
@@ -115,6 +116,7 @@ namespace SabreTools.Serialization.CrossModel.Test
|
|||||||
Url = "url",
|
Url = "url",
|
||||||
Comment = "comment",
|
Comment = "comment",
|
||||||
Type = "type",
|
Type = "type",
|
||||||
|
Subset = "subset",
|
||||||
RomVault = romvault,
|
RomVault = romvault,
|
||||||
ClrMamePro = clrmamepro,
|
ClrMamePro = clrmamepro,
|
||||||
RomCenter = romcenter,
|
RomCenter = romcenter,
|
||||||
@@ -171,6 +173,7 @@ namespace SabreTools.Serialization.CrossModel.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
xxHash364 = "xxhash364",
|
xxHash364 = "xxhash364",
|
||||||
xxHash3128 = "xxhash3128",
|
xxHash3128 = "xxhash3128",
|
||||||
Merge = "merge",
|
Merge = "merge",
|
||||||
@@ -252,11 +255,14 @@ namespace SabreTools.Serialization.CrossModel.Test
|
|||||||
gameBase.Id = "id";
|
gameBase.Id = "id";
|
||||||
gameBase.CloneOfId = "cloneofid";
|
gameBase.CloneOfId = "cloneofid";
|
||||||
gameBase.Runnable = Data.Models.Metadata.Runnable.Yes;
|
gameBase.Runnable = Data.Models.Metadata.Runnable.Yes;
|
||||||
|
gameBase.SetType = "dir";
|
||||||
gameBase.Comment = ["comment"];
|
gameBase.Comment = ["comment"];
|
||||||
gameBase.Description = "description";
|
gameBase.Description = "description";
|
||||||
gameBase.Year = "year";
|
gameBase.Year = "year";
|
||||||
gameBase.Manufacturer = "manufacturer";
|
gameBase.Manufacturer = "manufacturer";
|
||||||
gameBase.Publisher = "publisher";
|
gameBase.Publisher = "publisher";
|
||||||
|
gameBase.Serial = "serial";
|
||||||
|
gameBase.Version = "version";
|
||||||
gameBase.Category = ["category"];
|
gameBase.Category = ["category"];
|
||||||
gameBase.Trurip = trurip;
|
gameBase.Trurip = trurip;
|
||||||
gameBase.Release = [release];
|
gameBase.Release = [release];
|
||||||
@@ -312,6 +318,7 @@ namespace SabreTools.Serialization.CrossModel.Test
|
|||||||
Assert.Equal("url", header.Url);
|
Assert.Equal("url", header.Url);
|
||||||
Assert.Equal("comment", header.Comment);
|
Assert.Equal("comment", header.Comment);
|
||||||
Assert.Equal("type", header.Type);
|
Assert.Equal("type", header.Type);
|
||||||
|
Assert.Equal("subset", header.Subset);
|
||||||
Validate(header.RomVault);
|
Validate(header.RomVault);
|
||||||
Validate(header.ClrMamePro);
|
Validate(header.ClrMamePro);
|
||||||
Validate(header.RomCenter);
|
Validate(header.RomCenter);
|
||||||
@@ -327,6 +334,7 @@ namespace SabreTools.Serialization.CrossModel.Test
|
|||||||
Assert.Equal(Data.Models.Metadata.MergingFlag.Merged, rv.ForceMerging);
|
Assert.Equal(Data.Models.Metadata.MergingFlag.Merged, rv.ForceMerging);
|
||||||
Assert.Equal(Data.Models.Metadata.NodumpFlag.Required, rv.ForceNodump);
|
Assert.Equal(Data.Models.Metadata.NodumpFlag.Required, rv.ForceNodump);
|
||||||
Assert.Equal(Data.Models.Metadata.PackingFlag.Zip, rv.ForcePacking);
|
Assert.Equal(Data.Models.Metadata.PackingFlag.Zip, rv.ForcePacking);
|
||||||
|
Assert.Equal("noautodir", rv.Dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -378,6 +386,7 @@ namespace SabreTools.Serialization.CrossModel.Test
|
|||||||
Assert.Equal("id", gb.Id);
|
Assert.Equal("id", gb.Id);
|
||||||
Assert.Equal("cloneofid", gb.CloneOfId);
|
Assert.Equal("cloneofid", gb.CloneOfId);
|
||||||
Assert.Equal(Data.Models.Metadata.Runnable.Yes, gb.Runnable);
|
Assert.Equal(Data.Models.Metadata.Runnable.Yes, gb.Runnable);
|
||||||
|
Assert.Equal("dir", gb.SetType);
|
||||||
|
|
||||||
Assert.NotNull(gb.Comment);
|
Assert.NotNull(gb.Comment);
|
||||||
string comment = Assert.Single(gb.Comment);
|
string comment = Assert.Single(gb.Comment);
|
||||||
@@ -387,6 +396,8 @@ namespace SabreTools.Serialization.CrossModel.Test
|
|||||||
Assert.Equal("year", gb.Year);
|
Assert.Equal("year", gb.Year);
|
||||||
Assert.Equal("manufacturer", gb.Manufacturer);
|
Assert.Equal("manufacturer", gb.Manufacturer);
|
||||||
Assert.Equal("publisher", gb.Publisher);
|
Assert.Equal("publisher", gb.Publisher);
|
||||||
|
Assert.Equal("serial", gb.Serial);
|
||||||
|
Assert.Equal("version", gb.Version);
|
||||||
|
|
||||||
Assert.NotNull(gb.Category);
|
Assert.NotNull(gb.Category);
|
||||||
string category = Assert.Single(gb.Category);
|
string category = Assert.Single(gb.Category);
|
||||||
@@ -500,6 +511,7 @@ namespace SabreTools.Serialization.CrossModel.Test
|
|||||||
Assert.Equal("sha384", rom.SHA384);
|
Assert.Equal("sha384", rom.SHA384);
|
||||||
Assert.Equal("sha512", rom.SHA512);
|
Assert.Equal("sha512", rom.SHA512);
|
||||||
Assert.Equal("spamsum", rom.SpamSum);
|
Assert.Equal("spamsum", rom.SpamSum);
|
||||||
|
Assert.Equal("blake3", rom.BLAKE3);
|
||||||
Assert.Equal("xxhash364", rom.xxHash364);
|
Assert.Equal("xxhash364", rom.xxHash364);
|
||||||
Assert.Equal("xxhash3128", rom.xxHash3128);
|
Assert.Equal("xxhash3128", rom.xxHash3128);
|
||||||
Assert.Equal("merge", rom.Merge);
|
Assert.Equal("merge", rom.Merge);
|
||||||
|
|||||||
@@ -8,11 +8,11 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="coverlet.collector" Version="10.0.0" />
|
<PackageReference Include="coverlet.collector" Version="10.0.1" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
|
||||||
<PackageReference Include="SabreTools.Hashing" Version="[2.0.0]" />
|
<PackageReference Include="SabreTools.Hashing" Version="2.1.0" />
|
||||||
<PackageReference Include="xunit" Version="2.9.3" />
|
<PackageReference Include="xunit" Version="2.9.3" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -290,6 +290,7 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
SHA384 = item.SHA384,
|
SHA384 = item.SHA384,
|
||||||
SHA512 = item.SHA512,
|
SHA512 = item.SHA512,
|
||||||
SpamSum = item.SpamSum,
|
SpamSum = item.SpamSum,
|
||||||
|
BLAKE3 = item.BLAKE3,
|
||||||
xxHash364 = item.xxHash364,
|
xxHash364 = item.xxHash364,
|
||||||
xxHash3128 = item.xxHash3128,
|
xxHash3128 = item.xxHash3128,
|
||||||
Merge = item.Merge,
|
Merge = item.Merge,
|
||||||
|
|||||||
@@ -270,6 +270,7 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
SHA384 = item.SHA384,
|
SHA384 = item.SHA384,
|
||||||
SHA512 = item.SHA512,
|
SHA512 = item.SHA512,
|
||||||
SpamSum = item.SpamSum,
|
SpamSum = item.SpamSum,
|
||||||
|
BLAKE3 = item.BLAKE3,
|
||||||
xxHash364 = item.xxHash364,
|
xxHash364 = item.xxHash364,
|
||||||
xxHash3128 = item.xxHash3128,
|
xxHash3128 = item.xxHash3128,
|
||||||
Merge = item.Merge,
|
Merge = item.Merge,
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
var sha384s = new List<SHA384>();
|
var sha384s = new List<SHA384>();
|
||||||
var sha512s = new List<SHA512>();
|
var sha512s = new List<SHA512>();
|
||||||
var spamsums = new List<SpamSum>();
|
var spamsums = new List<SpamSum>();
|
||||||
|
var blake3s = new List<BLAKE3>();
|
||||||
|
|
||||||
foreach (var hashfile in hashfiles)
|
foreach (var hashfile in hashfiles)
|
||||||
{
|
{
|
||||||
@@ -61,6 +62,8 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
sha512s.AddRange(hashfile.SHA512);
|
sha512s.AddRange(hashfile.SHA512);
|
||||||
if (hashfile.SpamSum is not null && hashfile.SpamSum.Length > 0)
|
if (hashfile.SpamSum is not null && hashfile.SpamSum.Length > 0)
|
||||||
spamsums.AddRange(hashfile.SpamSum);
|
spamsums.AddRange(hashfile.SpamSum);
|
||||||
|
if (hashfile.BLAKE3 is not null && hashfile.BLAKE3.Length > 0)
|
||||||
|
blake3s.AddRange(hashfile.BLAKE3);
|
||||||
}
|
}
|
||||||
|
|
||||||
var hashfileItem = new Data.Models.Hashfile.Hashfile();
|
var hashfileItem = new Data.Models.Hashfile.Hashfile();
|
||||||
@@ -87,6 +90,8 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
hashfileItem.SHA512 = [.. sha512s];
|
hashfileItem.SHA512 = [.. sha512s];
|
||||||
if (spamsums.Count > 0)
|
if (spamsums.Count > 0)
|
||||||
hashfileItem.SpamSum = [.. spamsums];
|
hashfileItem.SpamSum = [.. spamsums];
|
||||||
|
if (blake3s.Count > 0)
|
||||||
|
hashfileItem.BLAKE3 = [.. blake3s];
|
||||||
|
|
||||||
return hashfileItem;
|
return hashfileItem;
|
||||||
}
|
}
|
||||||
@@ -135,6 +140,14 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
SpamSum = hash == HashType.SpamSum
|
SpamSum = hash == HashType.SpamSum
|
||||||
? Array.ConvertAll(roms, ConvertToSpamSum)
|
? Array.ConvertAll(roms, ConvertToSpamSum)
|
||||||
: null,
|
: null,
|
||||||
|
#if NET7_0_OR_GREATER
|
||||||
|
BLAKE3 = hash == HashType.BLAKE3
|
||||||
|
#else
|
||||||
|
// HACK because BLAKE3 is not supported below .NET 7
|
||||||
|
BLAKE3 = hash == HashType.CRC1_ZERO
|
||||||
|
#endif
|
||||||
|
? Array.ConvertAll(roms, ConvertToBLAKE3)
|
||||||
|
: null,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -280,5 +293,18 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
};
|
};
|
||||||
return spamsum;
|
return spamsum;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Convert from <see cref="Models.Metadata.Rom"/> to <see cref="BLAKE3"/>
|
||||||
|
/// </summary>
|
||||||
|
private static BLAKE3 ConvertToBLAKE3(Data.Models.Metadata.Rom item)
|
||||||
|
{
|
||||||
|
var spamsum = new BLAKE3
|
||||||
|
{
|
||||||
|
Hash = item.BLAKE3,
|
||||||
|
File = item.Name,
|
||||||
|
};
|
||||||
|
return spamsum;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
{
|
{
|
||||||
var header = new Data.Models.Metadata.Header
|
var header = new Data.Models.Metadata.Header
|
||||||
{
|
{
|
||||||
Name = "Hashfile",
|
Name = "Hashfile",
|
||||||
};
|
};
|
||||||
return header;
|
return header;
|
||||||
}
|
}
|
||||||
@@ -63,6 +63,8 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
machine.Rom = Array.ConvertAll(item.SHA512, ConvertToInternalModel);
|
machine.Rom = Array.ConvertAll(item.SHA512, ConvertToInternalModel);
|
||||||
else if (item.SpamSum is not null && item.SpamSum.Length > 0)
|
else if (item.SpamSum is not null && item.SpamSum.Length > 0)
|
||||||
machine.Rom = Array.ConvertAll(item.SpamSum, ConvertToInternalModel);
|
machine.Rom = Array.ConvertAll(item.SpamSum, ConvertToInternalModel);
|
||||||
|
else if (item.BLAKE3 is not null && item.BLAKE3.Length > 0)
|
||||||
|
machine.Rom = Array.ConvertAll(item.BLAKE3, ConvertToInternalModel);
|
||||||
|
|
||||||
return machine;
|
return machine;
|
||||||
}
|
}
|
||||||
@@ -209,5 +211,18 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
};
|
};
|
||||||
return rom;
|
return rom;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Convert from <see cref="BLAKE3"/> to <see cref="Models.Metadata.Rom"/>
|
||||||
|
/// </summary>
|
||||||
|
private static Data.Models.Metadata.Rom ConvertToInternalModel(BLAKE3 item)
|
||||||
|
{
|
||||||
|
var rom = new Data.Models.Metadata.Rom
|
||||||
|
{
|
||||||
|
BLAKE3 = item.Hash,
|
||||||
|
Name = item.File,
|
||||||
|
};
|
||||||
|
return rom;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
Url = item.Url,
|
Url = item.Url,
|
||||||
Comment = item.Comment,
|
Comment = item.Comment,
|
||||||
Type = item.Type,
|
Type = item.Type,
|
||||||
|
Subset = item.Subset,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (item.HeaderSkipper is not null
|
if (item.HeaderSkipper is not null
|
||||||
@@ -70,6 +71,8 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
header.RomVault.ForceNodump = item.ForceNodump;
|
header.RomVault.ForceNodump = item.ForceNodump;
|
||||||
if (item.ForcePacking is not Data.Models.Metadata.PackingFlag.None)
|
if (item.ForcePacking is not Data.Models.Metadata.PackingFlag.None)
|
||||||
header.RomVault.ForcePacking = item.ForcePacking;
|
header.RomVault.ForcePacking = item.ForcePacking;
|
||||||
|
if (item.DirHandling is not null)
|
||||||
|
header.RomVault.Dir = item.DirHandling;
|
||||||
|
|
||||||
header.ClrMamePro = new Data.Models.Logiqx.ClrMamePro();
|
header.ClrMamePro = new Data.Models.Logiqx.ClrMamePro();
|
||||||
if (item.HeaderSkipper is not null)
|
if (item.HeaderSkipper is not null)
|
||||||
@@ -130,11 +133,14 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
gameBase.Id = item.Id;
|
gameBase.Id = item.Id;
|
||||||
gameBase.CloneOfId = item.CloneOfId;
|
gameBase.CloneOfId = item.CloneOfId;
|
||||||
gameBase.Runnable = item.Runnable;
|
gameBase.Runnable = item.Runnable;
|
||||||
|
gameBase.SetType = item.SetType;
|
||||||
gameBase.Comment = item.Comment;
|
gameBase.Comment = item.Comment;
|
||||||
gameBase.Description = item.Description;
|
gameBase.Description = item.Description;
|
||||||
gameBase.Year = item.Year;
|
gameBase.Year = item.Year;
|
||||||
gameBase.Manufacturer = item.Manufacturer;
|
gameBase.Manufacturer = item.Manufacturer;
|
||||||
gameBase.Publisher = item.Publisher;
|
gameBase.Publisher = item.Publisher;
|
||||||
|
gameBase.Serial = item.Serial;
|
||||||
|
gameBase.Version = item.Version;
|
||||||
gameBase.Category = item.Category;
|
gameBase.Category = item.Category;
|
||||||
|
|
||||||
if (item.TitleID is not null
|
if (item.TitleID is not null
|
||||||
@@ -350,6 +356,7 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
SHA384 = item.SHA384,
|
SHA384 = item.SHA384,
|
||||||
SHA512 = item.SHA512,
|
SHA512 = item.SHA512,
|
||||||
SpamSum = item.SpamSum,
|
SpamSum = item.SpamSum,
|
||||||
|
BLAKE3 = item.BLAKE3,
|
||||||
xxHash364 = item.xxHash364,
|
xxHash364 = item.xxHash364,
|
||||||
xxHash3128 = item.xxHash3128,
|
xxHash3128 = item.xxHash3128,
|
||||||
Merge = item.Merge,
|
Merge = item.Merge,
|
||||||
|
|||||||
@@ -66,8 +66,18 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
Url = item.Url,
|
Url = item.Url,
|
||||||
Comment = item.Comment,
|
Comment = item.Comment,
|
||||||
Type = item.Type,
|
Type = item.Type,
|
||||||
|
Subset = item.Subset,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (item.RomVault is not null)
|
||||||
|
{
|
||||||
|
header.HeaderSkipper = item.RomVault.Header;
|
||||||
|
header.ForceMerging = item.RomVault.ForceMerging;
|
||||||
|
header.ForceNodump = item.RomVault.ForceNodump;
|
||||||
|
header.ForcePacking = item.RomVault.ForcePacking;
|
||||||
|
header.DirHandling = item.RomVault.Dir;
|
||||||
|
}
|
||||||
|
|
||||||
if (item.ClrMamePro is not null)
|
if (item.ClrMamePro is not null)
|
||||||
{
|
{
|
||||||
header.HeaderSkipper = item.ClrMamePro.Header;
|
header.HeaderSkipper = item.ClrMamePro.Header;
|
||||||
@@ -144,6 +154,8 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
Name = machineName,
|
Name = machineName,
|
||||||
Players = item.Trurip?.Players,
|
Players = item.Trurip?.Players,
|
||||||
Publisher = item.Publisher ?? item.Trurip?.Publisher,
|
Publisher = item.Publisher ?? item.Trurip?.Publisher,
|
||||||
|
Serial = item.Serial,
|
||||||
|
Version = item.Version,
|
||||||
Ratings = item.Trurip?.Ratings,
|
Ratings = item.Trurip?.Ratings,
|
||||||
RebuildTo = item.RebuildTo,
|
RebuildTo = item.RebuildTo,
|
||||||
RelatedTo = item.Trurip?.RelatedTo,
|
RelatedTo = item.Trurip?.RelatedTo,
|
||||||
@@ -151,6 +163,7 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
Runnable = item.Runnable,
|
Runnable = item.Runnable,
|
||||||
SampleOf = item.SampleOf,
|
SampleOf = item.SampleOf,
|
||||||
Score = item.Trurip?.Score,
|
Score = item.Trurip?.Score,
|
||||||
|
SetType = item.SetType,
|
||||||
Source = item.Trurip?.Source,
|
Source = item.Trurip?.Source,
|
||||||
SourceFile = item.SourceFile,
|
SourceFile = item.SourceFile,
|
||||||
Subgenre = item.Trurip?.Subgenre,
|
Subgenre = item.Trurip?.Subgenre,
|
||||||
@@ -319,6 +332,7 @@ namespace SabreTools.Serialization.CrossModel
|
|||||||
SHA384 = item.SHA384,
|
SHA384 = item.SHA384,
|
||||||
SHA512 = item.SHA512,
|
SHA512 = item.SHA512,
|
||||||
SpamSum = item.SpamSum,
|
SpamSum = item.SpamSum,
|
||||||
|
BLAKE3 = item.BLAKE3,
|
||||||
xxHash364 = item.xxHash364,
|
xxHash364 = item.xxHash364,
|
||||||
xxHash3128 = item.xxHash3128,
|
xxHash3128 = item.xxHash3128,
|
||||||
Merge = item.Merge,
|
Merge = item.Merge,
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Assembly Properties -->
|
<!-- Assembly Properties -->
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
||||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<Version>3.0.0</Version>
|
<Version>3.2.0</Version>
|
||||||
|
|
||||||
<!-- Package Properties -->
|
<!-- Package Properties -->
|
||||||
<Authors>Matt Nadareski</Authors>
|
<Authors>Matt Nadareski</Authors>
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="SabreTools.Hashing" Version="[2.0.0]" />
|
<PackageReference Include="SabreTools.Hashing" Version="2.1.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -232,6 +232,7 @@ namespace SabreTools.Serialization.Readers.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
xxHash364 = "xxhash364",
|
xxHash364 = "xxhash364",
|
||||||
xxHash3128 = "xxhash3128",
|
xxHash3128 = "xxhash3128",
|
||||||
Region = "region",
|
Region = "region",
|
||||||
@@ -495,6 +496,7 @@ namespace SabreTools.Serialization.Readers.Test
|
|||||||
Assert.Equal("sha384", rom.SHA384);
|
Assert.Equal("sha384", rom.SHA384);
|
||||||
Assert.Equal("sha512", rom.SHA512);
|
Assert.Equal("sha512", rom.SHA512);
|
||||||
Assert.Equal("spamsum", rom.SpamSum);
|
Assert.Equal("spamsum", rom.SpamSum);
|
||||||
|
Assert.Equal("blake3", rom.BLAKE3);
|
||||||
Assert.Equal("xxhash364", rom.xxHash364);
|
Assert.Equal("xxhash364", rom.xxHash364);
|
||||||
Assert.Equal("xxhash3128", rom.xxHash3128);
|
Assert.Equal("xxhash3128", rom.xxHash3128);
|
||||||
Assert.Equal("region", rom.Region);
|
Assert.Equal("region", rom.Region);
|
||||||
|
|||||||
@@ -287,6 +287,30 @@ namespace SabreTools.Serialization.Readers.Test
|
|||||||
Validate(newSpamsum);
|
Validate(newSpamsum);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void RoundTripBLAKE3Test()
|
||||||
|
{
|
||||||
|
// Get the serializer and deserializer
|
||||||
|
var deserializer = new Hashfile();
|
||||||
|
var serializer = new Writers.Hashfile();
|
||||||
|
|
||||||
|
// Build the data
|
||||||
|
Data.Models.Hashfile.Hashfile hf = Build(HashType.BLAKE3);
|
||||||
|
|
||||||
|
// Serialize to stream
|
||||||
|
Stream? actual = serializer.SerializeStream(hf, HashType.BLAKE3);
|
||||||
|
Assert.NotNull(actual);
|
||||||
|
|
||||||
|
// Serialize back to original model
|
||||||
|
Data.Models.Hashfile.Hashfile? newHf = deserializer.Deserialize(actual, HashType.BLAKE3);
|
||||||
|
|
||||||
|
// Validate the data
|
||||||
|
Assert.NotNull(newHf);
|
||||||
|
Assert.NotNull(newHf.BLAKE3);
|
||||||
|
var newBlake3 = Assert.Single(newHf.BLAKE3);
|
||||||
|
Validate(newBlake3);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Build model for serialization and deserialization
|
/// Build model for serialization and deserialization
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -310,6 +334,8 @@ namespace SabreTools.Serialization.Readers.Test
|
|||||||
return new Data.Models.Hashfile.Hashfile { SHA512 = [new Data.Models.Hashfile.SHA512 { Hash = "hash", File = "file" }] };
|
return new Data.Models.Hashfile.Hashfile { SHA512 = [new Data.Models.Hashfile.SHA512 { Hash = "hash", File = "file" }] };
|
||||||
else if (hashType == HashType.SpamSum)
|
else if (hashType == HashType.SpamSum)
|
||||||
return new Data.Models.Hashfile.Hashfile { SpamSum = [new Data.Models.Hashfile.SpamSum { Hash = "hash", File = "file" }] };
|
return new Data.Models.Hashfile.Hashfile { SpamSum = [new Data.Models.Hashfile.SpamSum { Hash = "hash", File = "file" }] };
|
||||||
|
else if (hashType == HashType.BLAKE3)
|
||||||
|
return new Data.Models.Hashfile.Hashfile { BLAKE3 = [new Data.Models.Hashfile.BLAKE3 { Hash = "hash", File = "file" }] };
|
||||||
else
|
else
|
||||||
throw new ArgumentOutOfRangeException(nameof(hashType));
|
throw new ArgumentOutOfRangeException(nameof(hashType));
|
||||||
}
|
}
|
||||||
@@ -403,5 +429,15 @@ namespace SabreTools.Serialization.Readers.Test
|
|||||||
Assert.Equal("hash", spamsum.Hash);
|
Assert.Equal("hash", spamsum.Hash);
|
||||||
Assert.Equal("file", spamsum.File);
|
Assert.Equal("file", spamsum.File);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Validate a BLAKE3
|
||||||
|
/// </summary>
|
||||||
|
private static void Validate(Data.Models.Hashfile.BLAKE3? blake3)
|
||||||
|
{
|
||||||
|
Assert.NotNull(blake3);
|
||||||
|
Assert.Equal("hash", blake3.Hash);
|
||||||
|
Assert.Equal("file", blake3.File);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -144,6 +144,7 @@ namespace SabreTools.Serialization.Readers.Test
|
|||||||
ForceMerging = Data.Models.Metadata.MergingFlag.Merged,
|
ForceMerging = Data.Models.Metadata.MergingFlag.Merged,
|
||||||
ForceNodump = Data.Models.Metadata.NodumpFlag.Required,
|
ForceNodump = Data.Models.Metadata.NodumpFlag.Required,
|
||||||
ForcePacking = Data.Models.Metadata.PackingFlag.Zip,
|
ForcePacking = Data.Models.Metadata.PackingFlag.Zip,
|
||||||
|
Dir = "noautodir",
|
||||||
};
|
};
|
||||||
|
|
||||||
var clrmamepro = new Data.Models.Logiqx.ClrMamePro
|
var clrmamepro = new Data.Models.Logiqx.ClrMamePro
|
||||||
@@ -180,6 +181,7 @@ namespace SabreTools.Serialization.Readers.Test
|
|||||||
Url = "url",
|
Url = "url",
|
||||||
Comment = "comment",
|
Comment = "comment",
|
||||||
Type = "type",
|
Type = "type",
|
||||||
|
Subset = "subset",
|
||||||
RomVault = romvault,
|
RomVault = romvault,
|
||||||
ClrMamePro = clrmamepro,
|
ClrMamePro = clrmamepro,
|
||||||
RomCenter = romcenter,
|
RomCenter = romcenter,
|
||||||
@@ -236,6 +238,7 @@ namespace SabreTools.Serialization.Readers.Test
|
|||||||
SHA384 = "sha384",
|
SHA384 = "sha384",
|
||||||
SHA512 = "sha512",
|
SHA512 = "sha512",
|
||||||
SpamSum = "spamsum",
|
SpamSum = "spamsum",
|
||||||
|
BLAKE3 = "blake3",
|
||||||
xxHash364 = "xxhash364",
|
xxHash364 = "xxhash364",
|
||||||
xxHash3128 = "xxhash3128",
|
xxHash3128 = "xxhash3128",
|
||||||
Merge = "merge",
|
Merge = "merge",
|
||||||
@@ -317,11 +320,14 @@ namespace SabreTools.Serialization.Readers.Test
|
|||||||
gameBase.Id = "id";
|
gameBase.Id = "id";
|
||||||
gameBase.CloneOfId = "cloneofid";
|
gameBase.CloneOfId = "cloneofid";
|
||||||
gameBase.Runnable = Data.Models.Metadata.Runnable.Yes;
|
gameBase.Runnable = Data.Models.Metadata.Runnable.Yes;
|
||||||
|
gameBase.SetType = "dir";
|
||||||
gameBase.Comment = ["comment"];
|
gameBase.Comment = ["comment"];
|
||||||
gameBase.Description = "description";
|
gameBase.Description = "description";
|
||||||
gameBase.Year = "year";
|
gameBase.Year = "year";
|
||||||
gameBase.Manufacturer = "manufacturer";
|
gameBase.Manufacturer = "manufacturer";
|
||||||
gameBase.Publisher = "publisher";
|
gameBase.Publisher = "publisher";
|
||||||
|
gameBase.Serial = "serial";
|
||||||
|
gameBase.Version = "version";
|
||||||
gameBase.Category = ["category"];
|
gameBase.Category = ["category"];
|
||||||
gameBase.Trurip = trurip;
|
gameBase.Trurip = trurip;
|
||||||
gameBase.Release = [release];
|
gameBase.Release = [release];
|
||||||
@@ -365,6 +371,7 @@ namespace SabreTools.Serialization.Readers.Test
|
|||||||
Assert.Equal("url", header.Url);
|
Assert.Equal("url", header.Url);
|
||||||
Assert.Equal("comment", header.Comment);
|
Assert.Equal("comment", header.Comment);
|
||||||
Assert.Equal("type", header.Type);
|
Assert.Equal("type", header.Type);
|
||||||
|
Assert.Equal("subset", header.Subset);
|
||||||
Validate(header.RomVault);
|
Validate(header.RomVault);
|
||||||
Validate(header.ClrMamePro);
|
Validate(header.ClrMamePro);
|
||||||
Validate(header.RomCenter);
|
Validate(header.RomCenter);
|
||||||
@@ -380,6 +387,7 @@ namespace SabreTools.Serialization.Readers.Test
|
|||||||
Assert.Equal(Data.Models.Metadata.MergingFlag.Merged, rv.ForceMerging);
|
Assert.Equal(Data.Models.Metadata.MergingFlag.Merged, rv.ForceMerging);
|
||||||
Assert.Equal(Data.Models.Metadata.NodumpFlag.Required, rv.ForceNodump);
|
Assert.Equal(Data.Models.Metadata.NodumpFlag.Required, rv.ForceNodump);
|
||||||
Assert.Equal(Data.Models.Metadata.PackingFlag.Zip, rv.ForcePacking);
|
Assert.Equal(Data.Models.Metadata.PackingFlag.Zip, rv.ForcePacking);
|
||||||
|
Assert.Equal("noautodir", rv.Dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -428,6 +436,7 @@ namespace SabreTools.Serialization.Readers.Test
|
|||||||
Assert.Equal("id", gb.Id);
|
Assert.Equal("id", gb.Id);
|
||||||
Assert.Equal("cloneofid", gb.CloneOfId);
|
Assert.Equal("cloneofid", gb.CloneOfId);
|
||||||
Assert.Equal(Data.Models.Metadata.Runnable.Yes, gb.Runnable);
|
Assert.Equal(Data.Models.Metadata.Runnable.Yes, gb.Runnable);
|
||||||
|
Assert.Equal("dir", gb.SetType);
|
||||||
|
|
||||||
Assert.NotNull(gb.Comment);
|
Assert.NotNull(gb.Comment);
|
||||||
string comment = Assert.Single(gb.Comment);
|
string comment = Assert.Single(gb.Comment);
|
||||||
@@ -437,6 +446,8 @@ namespace SabreTools.Serialization.Readers.Test
|
|||||||
Assert.Equal("year", gb.Year);
|
Assert.Equal("year", gb.Year);
|
||||||
Assert.Equal("manufacturer", gb.Manufacturer);
|
Assert.Equal("manufacturer", gb.Manufacturer);
|
||||||
Assert.Equal("publisher", gb.Publisher);
|
Assert.Equal("publisher", gb.Publisher);
|
||||||
|
Assert.Equal("serial", gb.Serial);
|
||||||
|
Assert.Equal("version", gb.Version);
|
||||||
|
|
||||||
Assert.NotNull(gb.Category);
|
Assert.NotNull(gb.Category);
|
||||||
string category = Assert.Single(gb.Category);
|
string category = Assert.Single(gb.Category);
|
||||||
@@ -548,6 +559,7 @@ namespace SabreTools.Serialization.Readers.Test
|
|||||||
Assert.Equal("sha384", rom.SHA384);
|
Assert.Equal("sha384", rom.SHA384);
|
||||||
Assert.Equal("sha512", rom.SHA512);
|
Assert.Equal("sha512", rom.SHA512);
|
||||||
Assert.Equal("spamsum", rom.SpamSum);
|
Assert.Equal("spamsum", rom.SpamSum);
|
||||||
|
Assert.Equal("blake3", rom.BLAKE3);
|
||||||
Assert.Equal("xxhash364", rom.xxHash364);
|
Assert.Equal("xxhash364", rom.xxHash364);
|
||||||
Assert.Equal("xxhash3128", rom.xxHash3128);
|
Assert.Equal("xxhash3128", rom.xxHash3128);
|
||||||
Assert.Equal("merge", rom.Merge);
|
Assert.Equal("merge", rom.Merge);
|
||||||
|
|||||||
@@ -8,10 +8,10 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="coverlet.collector" Version="10.0.0" />
|
<PackageReference Include="coverlet.collector" Version="10.0.1" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
|
||||||
<PackageReference Include="xunit" Version="2.9.3" />
|
<PackageReference Include="xunit" Version="2.9.3" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using Xunit;
|
||||||
|
|
||||||
|
namespace SabreTools.Serialization.Readers.Test
|
||||||
|
{
|
||||||
|
public class Steam2InstallerTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public void NullArray_Null()
|
||||||
|
{
|
||||||
|
byte[]? data = null;
|
||||||
|
int offset = 0;
|
||||||
|
var deserializer = new Steam2Installer();
|
||||||
|
|
||||||
|
var actual = deserializer.Deserialize(data, offset);
|
||||||
|
Assert.Null(actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void EmptyArray_Null()
|
||||||
|
{
|
||||||
|
byte[]? data = [];
|
||||||
|
int offset = 0;
|
||||||
|
var deserializer = new Steam2Installer();
|
||||||
|
|
||||||
|
var actual = deserializer.Deserialize(data, offset);
|
||||||
|
Assert.Null(actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void InvalidArray_Null()
|
||||||
|
{
|
||||||
|
byte[]? data = [.. Enumerable.Repeat<byte>(0xFF, 1024)];
|
||||||
|
int offset = 0;
|
||||||
|
var deserializer = new Steam2Installer();
|
||||||
|
|
||||||
|
var actual = deserializer.Deserialize(data, offset);
|
||||||
|
Assert.Null(actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void NullStream_Null()
|
||||||
|
{
|
||||||
|
Stream? data = null;
|
||||||
|
var deserializer = new Steam2Installer();
|
||||||
|
|
||||||
|
var actual = deserializer.Deserialize(data);
|
||||||
|
Assert.Null(actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void EmptyStream_Null()
|
||||||
|
{
|
||||||
|
Stream? data = new MemoryStream([]);
|
||||||
|
var deserializer = new Steam2Installer();
|
||||||
|
|
||||||
|
var actual = deserializer.Deserialize(data);
|
||||||
|
Assert.Null(actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void InvalidStream_Null()
|
||||||
|
{
|
||||||
|
Stream? data = new MemoryStream([.. Enumerable.Repeat<byte>(0xFF, 1024)]);
|
||||||
|
var deserializer = new Steam2Installer();
|
||||||
|
|
||||||
|
var actual = deserializer.Deserialize(data);
|
||||||
|
Assert.Null(actual);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -568,6 +568,9 @@ namespace SabreTools.Serialization.Readers
|
|||||||
case "spamsum":
|
case "spamsum":
|
||||||
rom.SpamSum = kvp.Value;
|
rom.SpamSum = kvp.Value;
|
||||||
break;
|
break;
|
||||||
|
case "blake3":
|
||||||
|
rom.BLAKE3 = kvp.Value;
|
||||||
|
break;
|
||||||
case "xxh3_64":
|
case "xxh3_64":
|
||||||
rom.xxHash364 = kvp.Value;
|
rom.xxHash364 = kvp.Value;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -91,6 +91,13 @@ namespace SabreTools.Serialization.Readers
|
|||||||
return DeserializeSHA512(data);
|
return DeserializeSHA512(data);
|
||||||
else if (hash == HashType.SpamSum)
|
else if (hash == HashType.SpamSum)
|
||||||
return DeserializeSpamSum(data);
|
return DeserializeSpamSum(data);
|
||||||
|
#if NET7_0_OR_GREATER
|
||||||
|
else if (hash == HashType.BLAKE3)
|
||||||
|
#else
|
||||||
|
// HACK because BLAKE3 is not supported below .NET 7
|
||||||
|
else if (hash == HashType.CRC1_ZERO)
|
||||||
|
#endif
|
||||||
|
return DeserializeBLAKE3(data);
|
||||||
else
|
else
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -558,6 +565,50 @@ namespace SabreTools.Serialization.Readers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc cref="Deserialize(Stream)"/>
|
||||||
|
public Data.Models.Hashfile.Hashfile? DeserializeBLAKE3(Stream? data)
|
||||||
|
{
|
||||||
|
// If the data is invalid
|
||||||
|
if (data is null || !data.CanRead)
|
||||||
|
return default;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Setup the reader and output
|
||||||
|
var reader = new StreamReader(data);
|
||||||
|
var blake3List = new List<BLAKE3>();
|
||||||
|
|
||||||
|
// Loop through the rows and parse out values
|
||||||
|
while (!reader.EndOfStream)
|
||||||
|
{
|
||||||
|
// Read and split the line
|
||||||
|
string? line = reader.ReadLine();
|
||||||
|
string[]? lineParts = line?.Split([' '], StringSplitOptions.RemoveEmptyEntries);
|
||||||
|
if (lineParts is null || lineParts.Length < 2)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// Parse the line into a hash
|
||||||
|
var blake3 = new BLAKE3
|
||||||
|
{
|
||||||
|
Hash = lineParts[0],
|
||||||
|
File = string.Join(" ", lineParts, 1, lineParts.Length - 1),
|
||||||
|
};
|
||||||
|
blake3List.Add(blake3);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Assign the hashes to the hashfile and return
|
||||||
|
if (blake3List.Count > 0)
|
||||||
|
return new Data.Models.Hashfile.Hashfile { BLAKE3 = [.. blake3List] };
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// Ignore the actual error
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -270,6 +270,12 @@ namespace SabreTools.Serialization.Readers
|
|||||||
|
|
||||||
obj.Type = reader.ReadElementContentAsString();
|
obj.Type = reader.ReadElementContentAsString();
|
||||||
break;
|
break;
|
||||||
|
case "subset":
|
||||||
|
if (obj.Subset is not null && Debug)
|
||||||
|
Console.WriteLine($"'{reader.Name}' element already found, overwriting");
|
||||||
|
|
||||||
|
obj.Subset = reader.ReadElementContentAsString();
|
||||||
|
break;
|
||||||
case "romvault":
|
case "romvault":
|
||||||
if (obj.RomVault is not null && Debug)
|
if (obj.RomVault is not null && Debug)
|
||||||
Console.WriteLine($"'{reader.Name}' element already found, overwriting");
|
Console.WriteLine($"'{reader.Name}' element already found, overwriting");
|
||||||
@@ -335,6 +341,7 @@ namespace SabreTools.Serialization.Readers
|
|||||||
obj.ForceMerging = reader.GetAttribute("forcemerging").AsMergingFlag();
|
obj.ForceMerging = reader.GetAttribute("forcemerging").AsMergingFlag();
|
||||||
obj.ForceNodump = reader.GetAttribute("forcenodump").AsNodumpFlag();
|
obj.ForceNodump = reader.GetAttribute("forcenodump").AsNodumpFlag();
|
||||||
obj.ForcePacking = reader.GetAttribute("forcepacking").AsPackingFlag();
|
obj.ForcePacking = reader.GetAttribute("forcepacking").AsPackingFlag();
|
||||||
|
obj.Dir = reader.GetAttribute("dir");
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
@@ -517,6 +524,7 @@ namespace SabreTools.Serialization.Readers
|
|||||||
obj.Id = reader.GetAttribute("id");
|
obj.Id = reader.GetAttribute("id");
|
||||||
obj.CloneOfId = reader.GetAttribute("cloneofid");
|
obj.CloneOfId = reader.GetAttribute("cloneofid");
|
||||||
obj.Runnable = reader.GetAttribute("runnable").AsRunnable();
|
obj.Runnable = reader.GetAttribute("runnable").AsRunnable();
|
||||||
|
obj.SetType = reader.GetAttribute("type");
|
||||||
|
|
||||||
// Handle empty elements
|
// Handle empty elements
|
||||||
if (reader.IsEmptyElement)
|
if (reader.IsEmptyElement)
|
||||||
@@ -587,6 +595,18 @@ namespace SabreTools.Serialization.Readers
|
|||||||
|
|
||||||
obj.Publisher = reader.ReadElementContentAsString();
|
obj.Publisher = reader.ReadElementContentAsString();
|
||||||
break;
|
break;
|
||||||
|
case "serial":
|
||||||
|
if (obj.Serial is not null && Debug)
|
||||||
|
Console.WriteLine($"'{reader.Name}' element already found, overwriting");
|
||||||
|
|
||||||
|
obj.Serial = reader.ReadElementContentAsString();
|
||||||
|
break;
|
||||||
|
case "version":
|
||||||
|
if (obj.Version is not null && Debug)
|
||||||
|
Console.WriteLine($"'{reader.Name}' element already found, overwriting");
|
||||||
|
|
||||||
|
obj.Version = reader.ReadElementContentAsString();
|
||||||
|
break;
|
||||||
case "category":
|
case "category":
|
||||||
var category = reader.ReadElementContentAsString();
|
var category = reader.ReadElementContentAsString();
|
||||||
if (category is not null)
|
if (category is not null)
|
||||||
@@ -776,6 +796,7 @@ namespace SabreTools.Serialization.Readers
|
|||||||
obj.SHA384 = reader.GetAttribute("sha384");
|
obj.SHA384 = reader.GetAttribute("sha384");
|
||||||
obj.SHA512 = reader.GetAttribute("sha512");
|
obj.SHA512 = reader.GetAttribute("sha512");
|
||||||
obj.SpamSum = reader.GetAttribute("spamsum");
|
obj.SpamSum = reader.GetAttribute("spamsum");
|
||||||
|
obj.BLAKE3 = reader.GetAttribute("blake3");
|
||||||
obj.xxHash364 = reader.GetAttribute("xxh3_64");
|
obj.xxHash364 = reader.GetAttribute("xxh3_64");
|
||||||
obj.xxHash3128 = reader.GetAttribute("xxh3_128");
|
obj.xxHash3128 = reader.GetAttribute("xxh3_128");
|
||||||
obj.Merge = reader.GetAttribute("merge");
|
obj.Merge = reader.GetAttribute("merge");
|
||||||
|
|||||||
@@ -749,7 +749,7 @@ namespace SabreTools.Serialization.Readers
|
|||||||
var table = new List<Data.Models.PortableExecutable.DebugData.Entry>();
|
var table = new List<Data.Models.PortableExecutable.DebugData.Entry>();
|
||||||
|
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
while (offset < data.Length)
|
while (offset < data.Length && data.Length - offset >= 28)
|
||||||
{
|
{
|
||||||
var entry = ParseDebugDirectoryEntry(data, ref offset);
|
var entry = ParseDebugDirectoryEntry(data, ref offset);
|
||||||
table.Add(entry);
|
table.Add(entry);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Assembly Properties -->
|
<!-- Assembly Properties -->
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
||||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<Version>3.0.0</Version>
|
<Version>3.2.0</Version>
|
||||||
|
|
||||||
<!-- Package Properties -->
|
<!-- Package Properties -->
|
||||||
<Authors>Matt Nadareski</Authors>
|
<Authors>Matt Nadareski</Authors>
|
||||||
@@ -36,8 +36,8 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||||
<PackageReference Include="SabreTools.Hashing" Version="[2.0.0]" />
|
<PackageReference Include="SabreTools.Hashing" Version="2.1.0" />
|
||||||
<PackageReference Include="SabreTools.IO" Version="[2.1.0]" />
|
<PackageReference Include="SabreTools.IO" Version="2.3.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
172
SabreTools.Serialization.Readers/Steam2Installer.cs
Normal file
172
SabreTools.Serialization.Readers/Steam2Installer.cs
Normal file
@@ -0,0 +1,172 @@
|
|||||||
|
using System.IO;
|
||||||
|
using System.Text;
|
||||||
|
using SabreTools.Data.Models.Steam2Installer;
|
||||||
|
using SabreTools.IO.Extensions;
|
||||||
|
using SabreTools.Numerics.Extensions;
|
||||||
|
using SabreTools.Text.Extensions;
|
||||||
|
|
||||||
|
namespace SabreTools.Serialization.Readers
|
||||||
|
{
|
||||||
|
public class Steam2Installer : BaseBinaryReader<Steam2InstallerSet>
|
||||||
|
{
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public override Steam2InstallerSet? Deserialize(Stream? data)
|
||||||
|
{
|
||||||
|
// If the data is invalid
|
||||||
|
if (data is null || !data.CanRead)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Cache the current offset
|
||||||
|
long initialOffset = data.Position;
|
||||||
|
|
||||||
|
// Create a new Steam2 Installer set to populate
|
||||||
|
var si = new Steam2InstallerSet();
|
||||||
|
|
||||||
|
// Try to parse the .sim file
|
||||||
|
var sim = ParseSim(data);
|
||||||
|
|
||||||
|
// Make sure the sim was parsed properly
|
||||||
|
if (sim == null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
// Set the sim file
|
||||||
|
si.Sim = sim;
|
||||||
|
|
||||||
|
return si;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// Ignore the actual error
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Parse a Sim file
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="data">Stream to parse</param>
|
||||||
|
/// <returns>Filled Sim on success, null on error</returns>
|
||||||
|
public static SimFile? ParseSim(Stream data)
|
||||||
|
{
|
||||||
|
// Create a new Sim file to populate
|
||||||
|
var si = new SimFile();
|
||||||
|
|
||||||
|
// Try to parse the .sim file header
|
||||||
|
var header = ParseHeader(data);
|
||||||
|
|
||||||
|
// Make sure the magic is correct
|
||||||
|
if (header.Magic != Constants.SimSignatureUInt32)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
// Make sure the version is correct
|
||||||
|
if (header.Version != 1)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
// Make sure string bytes section doesn't go beyond EOF
|
||||||
|
if (header.StringsSize > data.Length - data.Position)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
// Set the header
|
||||||
|
si.Header = header;
|
||||||
|
|
||||||
|
// Read the string section bytes
|
||||||
|
byte[] stringsBytes = data.ReadBytes((int)header.StringsSize);
|
||||||
|
|
||||||
|
// Read the size and number of file entries
|
||||||
|
uint fileEntriesSize = data.ReadUInt32LittleEndian();
|
||||||
|
uint fileEntriesCount = data.ReadUInt32LittleEndian();
|
||||||
|
|
||||||
|
// Make sure reading the file entries won't go beyond EOF
|
||||||
|
if (fileEntriesSize > data.Length - data.Position)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
// Try to parse the entry table
|
||||||
|
var table = ParseTable(data, fileEntriesCount, stringsBytes);
|
||||||
|
if (table is null || table.Length != fileEntriesCount)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
// Set the entry table
|
||||||
|
si.FileEntries = table;
|
||||||
|
|
||||||
|
return si;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Parse a Stream into a Header
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="data">Stream to parse</param>
|
||||||
|
/// <returns>Filled Header on success, null on error</returns>
|
||||||
|
public static Header ParseHeader(Stream data)
|
||||||
|
{
|
||||||
|
var obj = new Header();
|
||||||
|
|
||||||
|
obj.Magic = data.ReadUInt32LittleEndian();
|
||||||
|
obj.Version = data.ReadUInt32LittleEndian();
|
||||||
|
obj.Discs = data.ReadUInt32LittleEndian();
|
||||||
|
obj.StringsSize = data.ReadUInt32LittleEndian();
|
||||||
|
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Parse a Stream into an entry table
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="data">Stream to parse</param>
|
||||||
|
/// <param name="count">Number of entries to parse</param>
|
||||||
|
/// <returns>Filled entry table on success, null on error</returns>
|
||||||
|
public static FileEntry[]? ParseTable(Stream data, uint count, byte[] stringsBytes)
|
||||||
|
{
|
||||||
|
if (count == 0)
|
||||||
|
return [];
|
||||||
|
|
||||||
|
var obj = new FileEntry[count];
|
||||||
|
for (uint i = 0; i < count; i++)
|
||||||
|
{
|
||||||
|
var fileEntry = ParseFileEntry(data, stringsBytes);
|
||||||
|
if (fileEntry is null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
obj[i] = fileEntry;
|
||||||
|
}
|
||||||
|
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Parse a Stream into a FileEntry
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="data">Stream to parse</param>
|
||||||
|
/// <returns>Filled FileEntry on success, null on error</returns>
|
||||||
|
public static FileEntry? ParseFileEntry(Stream data, byte[] stringsBytes)
|
||||||
|
{
|
||||||
|
var obj = new FileEntry();
|
||||||
|
|
||||||
|
obj.NameOffset = data.ReadUInt32LittleEndian();
|
||||||
|
obj.PathOffset = data.ReadUInt32LittleEndian();
|
||||||
|
obj.DepotId = data.ReadUInt32LittleEndian();
|
||||||
|
obj.Offset = data.ReadUInt64LittleEndian();
|
||||||
|
obj.Size = data.ReadUInt64LittleEndian();
|
||||||
|
obj.DiscNumber = data.ReadByteValue();
|
||||||
|
obj.VolumeNumber = data.ReadByteValue();
|
||||||
|
obj.Encrypted = data.ReadByte() != 0;
|
||||||
|
obj.Unknown = data.ReadByteValue();
|
||||||
|
|
||||||
|
// Read file path and name strings
|
||||||
|
int nameOffset = (int)obj.NameOffset;
|
||||||
|
string? name = stringsBytes.ReadNullTerminatedAnsiString(ref nameOffset); // Unsure on encoding, assumed ascii/ansi
|
||||||
|
if (name is null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
obj.Name = name;
|
||||||
|
int pathOffset = (int)obj.PathOffset;
|
||||||
|
string? path = stringsBytes.ReadNullTerminatedAnsiString(ref pathOffset); // Unsure on encoding, assumed ascii/ansi
|
||||||
|
if (path is null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
obj.Path = path;
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,10 +8,10 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="coverlet.collector" Version="10.0.0" />
|
<PackageReference Include="coverlet.collector" Version="10.0.1" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
|
||||||
<PackageReference Include="xunit" Version="2.9.3" />
|
<PackageReference Include="xunit" Version="2.9.3" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -275,6 +275,7 @@ namespace SabreTools.Serialization.Writers
|
|||||||
writer.WriteOptionalAttributeString("sha384", rom.SHA384);
|
writer.WriteOptionalAttributeString("sha384", rom.SHA384);
|
||||||
writer.WriteOptionalAttributeString("sha512", rom.SHA512);
|
writer.WriteOptionalAttributeString("sha512", rom.SHA512);
|
||||||
writer.WriteOptionalAttributeString("spamsum", rom.SpamSum);
|
writer.WriteOptionalAttributeString("spamsum", rom.SpamSum);
|
||||||
|
writer.WriteOptionalAttributeString("blake3", rom.BLAKE3);
|
||||||
writer.WriteOptionalAttributeString("xxh3_64", rom.xxHash364);
|
writer.WriteOptionalAttributeString("xxh3_64", rom.xxHash364);
|
||||||
writer.WriteOptionalAttributeString("xxh3_128", rom.xxHash3128);
|
writer.WriteOptionalAttributeString("xxh3_128", rom.xxHash3128);
|
||||||
writer.WriteOptionalAttributeString("merge", rom.Merge);
|
writer.WriteOptionalAttributeString("merge", rom.Merge);
|
||||||
|
|||||||
@@ -101,6 +101,13 @@ namespace SabreTools.Serialization.Writers
|
|||||||
WriteSHA512(obj.SHA512, writer);
|
WriteSHA512(obj.SHA512, writer);
|
||||||
else if (hash == HashType.SpamSum)
|
else if (hash == HashType.SpamSum)
|
||||||
WriteSpamSum(obj.SpamSum, writer);
|
WriteSpamSum(obj.SpamSum, writer);
|
||||||
|
#if NET7_0_OR_GREATER
|
||||||
|
else if (hash == HashType.BLAKE3)
|
||||||
|
#else
|
||||||
|
// HACK because BLAKE3 is not supported below .NET 7
|
||||||
|
else if (hash == HashType.CRC1_ZERO)
|
||||||
|
#endif
|
||||||
|
WriteBLAKE3(obj.BLAKE3, writer);
|
||||||
else
|
else
|
||||||
throw new ArgumentOutOfRangeException(nameof(hash));
|
throw new ArgumentOutOfRangeException(nameof(hash));
|
||||||
|
|
||||||
@@ -351,6 +358,28 @@ namespace SabreTools.Serialization.Writers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Write BLAKE3 information to the current writer
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="blake3s">Array of BLAKE3 objects representing the files</param>
|
||||||
|
/// <param name="writer">Writer representing the output</param>
|
||||||
|
private static void WriteBLAKE3(BLAKE3[]? blake3s, Writer writer)
|
||||||
|
{
|
||||||
|
// If the item information is missing, we can't do anything
|
||||||
|
if (blake3s is null || blake3s.Length == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// Loop through and write out the items
|
||||||
|
foreach (var blake3 in blake3s)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(blake3.Hash) || string.IsNullOrEmpty(blake3.File))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
writer.WriteValues([blake3.Hash!, blake3.File!]);
|
||||||
|
writer.Flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -158,6 +158,7 @@ namespace SabreTools.Serialization.Writers
|
|||||||
writer.WriteOptionalElementString("url", obj.Url);
|
writer.WriteOptionalElementString("url", obj.Url);
|
||||||
writer.WriteOptionalElementString("comment", obj.Comment);
|
writer.WriteOptionalElementString("comment", obj.Comment);
|
||||||
writer.WriteOptionalElementString("type", obj.Type);
|
writer.WriteOptionalElementString("type", obj.Type);
|
||||||
|
writer.WriteOptionalElementString("subset", obj.Subset);
|
||||||
|
|
||||||
if (obj.RomVault is not null)
|
if (obj.RomVault is not null)
|
||||||
WriteRomVault(obj.RomVault, writer);
|
WriteRomVault(obj.RomVault, writer);
|
||||||
@@ -211,6 +212,7 @@ namespace SabreTools.Serialization.Writers
|
|||||||
writer.WriteOptionalAttributeString("forcenodump", obj.ForceNodump.AsStringValue());
|
writer.WriteOptionalAttributeString("forcenodump", obj.ForceNodump.AsStringValue());
|
||||||
if (obj.ForcePacking != Data.Models.Metadata.PackingFlag.None)
|
if (obj.ForcePacking != Data.Models.Metadata.PackingFlag.None)
|
||||||
writer.WriteOptionalAttributeString("forcepacking", obj.ForcePacking.AsStringValue());
|
writer.WriteOptionalAttributeString("forcepacking", obj.ForcePacking.AsStringValue());
|
||||||
|
writer.WriteOptionalAttributeString("dir", obj.Dir);
|
||||||
|
|
||||||
writer.WriteEndElement();
|
writer.WriteEndElement();
|
||||||
}
|
}
|
||||||
@@ -360,6 +362,7 @@ namespace SabreTools.Serialization.Writers
|
|||||||
writer.WriteOptionalAttributeString("id", obj.Id);
|
writer.WriteOptionalAttributeString("id", obj.Id);
|
||||||
writer.WriteOptionalAttributeString("cloneofid", obj.CloneOfId);
|
writer.WriteOptionalAttributeString("cloneofid", obj.CloneOfId);
|
||||||
writer.WriteOptionalAttributeString("runnable", obj.Runnable?.AsStringValue());
|
writer.WriteOptionalAttributeString("runnable", obj.Runnable?.AsStringValue());
|
||||||
|
writer.WriteOptionalAttributeString("type", obj.SetType);
|
||||||
|
|
||||||
if (obj.Comment is not null && obj.Comment.Length > 0)
|
if (obj.Comment is not null && obj.Comment.Length > 0)
|
||||||
{
|
{
|
||||||
@@ -373,6 +376,8 @@ namespace SabreTools.Serialization.Writers
|
|||||||
writer.WriteOptionalElementString("year", obj.Year);
|
writer.WriteOptionalElementString("year", obj.Year);
|
||||||
writer.WriteOptionalElementString("manufacturer", obj.Manufacturer);
|
writer.WriteOptionalElementString("manufacturer", obj.Manufacturer);
|
||||||
writer.WriteOptionalElementString("publisher", obj.Publisher);
|
writer.WriteOptionalElementString("publisher", obj.Publisher);
|
||||||
|
writer.WriteOptionalElementString("serial", obj.Serial);
|
||||||
|
writer.WriteOptionalElementString("version", obj.Version);
|
||||||
|
|
||||||
if (obj.Category is not null && obj.Category.Length > 0)
|
if (obj.Category is not null && obj.Category.Length > 0)
|
||||||
{
|
{
|
||||||
@@ -526,6 +531,7 @@ namespace SabreTools.Serialization.Writers
|
|||||||
writer.WriteOptionalAttributeString("sha384", obj.SHA384);
|
writer.WriteOptionalAttributeString("sha384", obj.SHA384);
|
||||||
writer.WriteOptionalAttributeString("sha512", obj.SHA512);
|
writer.WriteOptionalAttributeString("sha512", obj.SHA512);
|
||||||
writer.WriteOptionalAttributeString("spamsum", obj.SpamSum);
|
writer.WriteOptionalAttributeString("spamsum", obj.SpamSum);
|
||||||
|
writer.WriteOptionalAttributeString("blake3", obj.BLAKE3);
|
||||||
writer.WriteOptionalAttributeString("xxh3_64", obj.xxHash364);
|
writer.WriteOptionalAttributeString("xxh3_64", obj.xxHash364);
|
||||||
writer.WriteOptionalAttributeString("xxh3_128", obj.xxHash3128);
|
writer.WriteOptionalAttributeString("xxh3_128", obj.xxHash3128);
|
||||||
writer.WriteOptionalAttributeString("merge", obj.Merge);
|
writer.WriteOptionalAttributeString("merge", obj.Merge);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Assembly Properties -->
|
<!-- Assembly Properties -->
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
||||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<Version>3.0.0</Version>
|
<Version>3.2.0</Version>
|
||||||
|
|
||||||
<!-- Package Properties -->
|
<!-- Package Properties -->
|
||||||
<Authors>Matt Nadareski</Authors>
|
<Authors>Matt Nadareski</Authors>
|
||||||
@@ -32,8 +32,8 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||||
<PackageReference Include="SabreTools.Hashing" Version="[2.0.0]" />
|
<PackageReference Include="SabreTools.Hashing" Version="2.1.0" />
|
||||||
<PackageReference Include="SabreTools.IO" Version="[2.1.0]" />
|
<PackageReference Include="SabreTools.IO" Version="2.3.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
|
||||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<Version>3.0.0</Version>
|
<Version>3.2.0</Version>
|
||||||
|
|
||||||
<!-- Package Properties -->
|
<!-- Package Properties -->
|
||||||
<Authors>Matt Nadareski</Authors>
|
<Authors>Matt Nadareski</Authors>
|
||||||
@@ -58,14 +58,14 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="GrindCore" Version="0.7.1" />
|
<PackageReference Include="GrindCore" Version="0.9.0" />
|
||||||
<PackageReference Include="GrindCore.SharpCompress" Version="0.48.0" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
|
<PackageReference Include="GrindCore.SharpCompress" Version="0.50.5" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
|
||||||
<PackageReference Include="MinValueTupleBridge" Version="0.2.1" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))" />
|
<PackageReference Include="MinValueTupleBridge" Version="0.2.1" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))" />
|
||||||
<PackageReference Include="Net30.LinqBridge" Version="1.6.0.2" Condition="$(TargetFramework.StartsWith(`net2`))" />
|
<PackageReference Include="Net30.LinqBridge" Version="1.6.0.2" Condition="$(TargetFramework.StartsWith(`net2`))" />
|
||||||
<PackageReference Include="NetLegacySupport.Numerics" Version="1.0.1" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))" />
|
<PackageReference Include="NetLegacySupport.Numerics" Version="1.0.1" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||||
<PackageReference Include="SabreTools.Hashing" Version="[2.0.0]" />
|
<PackageReference Include="SabreTools.Hashing" Version="2.1.0" />
|
||||||
<PackageReference Include="SabreTools.IO" Version="[2.1.0]" />
|
<PackageReference Include="SabreTools.IO" Version="2.3.0" />
|
||||||
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="$(TargetFramework.StartsWith(`net40`)) OR $(TargetFramework.StartsWith(`net45`))" />
|
<PackageReference Include="System.ValueTuple" Version="4.5.0" Condition="$(TargetFramework.StartsWith(`net40`)) OR $(TargetFramework.StartsWith(`net45`))" />
|
||||||
<PackageReference Include="System.ValueTuple" Version="4.6.2" Condition="$(TargetFramework.StartsWith(`net46`)) OR $(TargetFramework.StartsWith(`net47`)) OR $(TargetFramework.StartsWith(`net48`))" />
|
<PackageReference Include="System.ValueTuple" Version="4.6.2" Condition="$(TargetFramework.StartsWith(`net46`)) OR $(TargetFramework.StartsWith(`net47`)) OR $(TargetFramework.StartsWith(`net48`))" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -18,11 +18,11 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="coverlet.collector" Version="10.0.0" />
|
<PackageReference Include="coverlet.collector" Version="10.0.1" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||||
<PackageReference Include="xunit" Version="2.9.3" />
|
<PackageReference Include="xunit" Version="2.9.3" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
60
SabreTools.Wrappers.Test/Steam2InstallerTests.cs
Normal file
60
SabreTools.Wrappers.Test/Steam2InstallerTests.cs
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using Xunit;
|
||||||
|
|
||||||
|
namespace SabreTools.Wrappers.Test
|
||||||
|
{
|
||||||
|
public class Steam2InstallerTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public void NullArray_Null()
|
||||||
|
{
|
||||||
|
byte[]? data = null;
|
||||||
|
int offset = 0;
|
||||||
|
var actual = Steam2Installer.Create(data, offset);
|
||||||
|
Assert.Null(actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void EmptyArray_Null()
|
||||||
|
{
|
||||||
|
byte[]? data = [];
|
||||||
|
int offset = 0;
|
||||||
|
var actual = Steam2Installer.Create(data, offset);
|
||||||
|
Assert.Null(actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void InvalidArray_Null()
|
||||||
|
{
|
||||||
|
byte[]? data = [.. Enumerable.Repeat<byte>(0xFF, 1024)];
|
||||||
|
int offset = 0;
|
||||||
|
var actual = Steam2Installer.Create(data, offset);
|
||||||
|
Assert.Null(actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void NullStream_Null()
|
||||||
|
{
|
||||||
|
Stream? data = null;
|
||||||
|
var actual = Steam2Installer.Create(data);
|
||||||
|
Assert.Null(actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void EmptyStream_Null()
|
||||||
|
{
|
||||||
|
Stream? data = new MemoryStream([]);
|
||||||
|
var actual = Steam2Installer.Create(data);
|
||||||
|
Assert.Null(actual);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void InvalidStream_Null()
|
||||||
|
{
|
||||||
|
Stream? data = new MemoryStream([.. Enumerable.Repeat<byte>(0xFF, 1024)]);
|
||||||
|
var actual = Steam2Installer.Create(data);
|
||||||
|
Assert.Null(actual);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using SabreTools.IO.Compression.Deflate;
|
using Nanook.GrindCore;
|
||||||
|
using Nanook.GrindCore.ZLib;
|
||||||
using SabreTools.IO.Extensions;
|
using SabreTools.IO.Extensions;
|
||||||
|
|
||||||
namespace SabreTools.Wrappers
|
namespace SabreTools.Wrappers
|
||||||
@@ -63,6 +64,7 @@ namespace SabreTools.Wrappers
|
|||||||
|
|
||||||
// Ensure directory separators are consistent
|
// Ensure directory separators are consistent
|
||||||
string filename = file.Name.Length == 0 ? $"file{index}" : file.Name;
|
string filename = file.Name.Length == 0 ? $"file{index}" : file.Name;
|
||||||
|
filename = filename.TrimStart(['\\', '/']);
|
||||||
if (Path.DirectorySeparatorChar == '\\')
|
if (Path.DirectorySeparatorChar == '\\')
|
||||||
filename = filename.Replace('/', '\\');
|
filename = filename.Replace('/', '\\');
|
||||||
else if (Path.DirectorySeparatorChar == '/')
|
else if (Path.DirectorySeparatorChar == '/')
|
||||||
@@ -94,7 +96,7 @@ namespace SabreTools.Wrappers
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
using var ms = new MemoryStream(data);
|
using var ms = new MemoryStream(data);
|
||||||
using var zs = new ZlibStream(ms, CompressionMode.Decompress);
|
using var zs = new ZLibStream(ms, new CompressionOptions { Type = CompressionType.Decompress });
|
||||||
zs.BlockCopy(fs);
|
zs.BlockCopy(fs);
|
||||||
fs.Flush();
|
fs.Flush();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,6 +66,7 @@ namespace SabreTools.Wrappers
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Ensure directory separators are consistent
|
// Ensure directory separators are consistent
|
||||||
|
filename = filename.TrimStart(['\\', '/']);
|
||||||
if (Path.DirectorySeparatorChar == '\\')
|
if (Path.DirectorySeparatorChar == '\\')
|
||||||
filename = filename.Replace('/', '\\');
|
filename = filename.Replace('/', '\\');
|
||||||
else if (Path.DirectorySeparatorChar == '/')
|
else if (Path.DirectorySeparatorChar == '/')
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using SabreTools.IO.Compression.BZip2;
|
using Nanook.GrindCore;
|
||||||
|
using Nanook.GrindCore.BZip2;
|
||||||
using SabreTools.IO.Extensions;
|
using SabreTools.IO.Extensions;
|
||||||
|
|
||||||
namespace SabreTools.Wrappers
|
namespace SabreTools.Wrappers
|
||||||
@@ -21,10 +22,12 @@ namespace SabreTools.Wrappers
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
// Try opening the stream
|
// Try opening the stream
|
||||||
using var bz2File = new BZip2InputStream(_dataSource, true);
|
using var bz2File = new BZip2Stream(_dataSource, new CompressionOptions { LeaveOpen = true, Type = CompressionType.Decompress});
|
||||||
|
|
||||||
// Ensure directory separators are consistent
|
// Ensure directory separators are consistent
|
||||||
string filename = Guid.NewGuid().ToString();
|
string filename = Guid.NewGuid().ToString();
|
||||||
|
filename = filename.TrimStart(['\\', '/']);
|
||||||
|
filename = filename.TrimStart(['\\', '/']);
|
||||||
if (Path.DirectorySeparatorChar == '\\')
|
if (Path.DirectorySeparatorChar == '\\')
|
||||||
filename = filename.Replace('/', '\\');
|
filename = filename.Replace('/', '\\');
|
||||||
else if (Path.DirectorySeparatorChar == '/')
|
else if (Path.DirectorySeparatorChar == '/')
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ namespace SabreTools.Wrappers
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Ensure directory separators are consistent
|
// Ensure directory separators are consistent
|
||||||
|
filename = filename.TrimStart(['\\', '/']);
|
||||||
if (Path.DirectorySeparatorChar == '\\')
|
if (Path.DirectorySeparatorChar == '\\')
|
||||||
filename = filename.Replace('/', '\\');
|
filename = filename.Replace('/', '\\');
|
||||||
else if (Path.DirectorySeparatorChar == '/')
|
else if (Path.DirectorySeparatorChar == '/')
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ namespace SabreTools.Wrappers
|
|||||||
|
|
||||||
// Ensure directory separators are consistent
|
// Ensure directory separators are consistent
|
||||||
string filename = file.Path ?? $"file{index}";
|
string filename = file.Path ?? $"file{index}";
|
||||||
|
filename = filename.TrimStart(['\\', '/']);
|
||||||
if (Path.DirectorySeparatorChar == '\\')
|
if (Path.DirectorySeparatorChar == '\\')
|
||||||
filename = filename.Replace('/', '\\');
|
filename = filename.Replace('/', '\\');
|
||||||
else if (Path.DirectorySeparatorChar == '/')
|
else if (Path.DirectorySeparatorChar == '/')
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using System.IO;
|
using System.IO;
|
||||||
using SabreTools.IO.Compression.Deflate;
|
using Nanook.GrindCore;
|
||||||
|
using Nanook.GrindCore.DeflateZLib;
|
||||||
using SabreTools.IO.Extensions;
|
using SabreTools.IO.Extensions;
|
||||||
using static SabreTools.Data.Models.GCZ.Constants;
|
using static SabreTools.Data.Models.GCZ.Constants;
|
||||||
|
|
||||||
@@ -61,7 +62,8 @@ namespace SabreTools.Wrappers
|
|||||||
// Verify Adler-32 checksum on the compressed (raw) data before decompressing
|
// Verify Adler-32 checksum on the compressed (raw) data before decompressing
|
||||||
if (BlockHashes is not null && blockIndex < BlockHashes.Length)
|
if (BlockHashes is not null && blockIndex < BlockHashes.Length)
|
||||||
{
|
{
|
||||||
uint actual = Adler.Adler32(1, raw, 0, raw.Length);
|
// TODO: Replace with call to Hashing library
|
||||||
|
uint actual = IO.Compression.Deflate.Adler.Adler32(1, raw, 0, raw.Length);
|
||||||
if (actual != BlockHashes[blockIndex])
|
if (actual != BlockHashes[blockIndex])
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -78,7 +80,7 @@ namespace SabreTools.Wrappers
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
using var cs = new MemoryStream(raw, 2, raw.Length - 6);
|
using var cs = new MemoryStream(raw, 2, raw.Length - 6);
|
||||||
using var ds = new DeflateStream(cs, CompressionMode.Decompress);
|
using var ds = new DeflateStream(cs, new CompressionOptions { Type = CompressionType.Decompress });
|
||||||
using var os = new MemoryStream();
|
using var os = new MemoryStream();
|
||||||
|
|
||||||
ds.BlockCopy(os, blockSize: 4096);
|
ds.BlockCopy(os, blockSize: 4096);
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using Nanook.GrindCore;
|
||||||
|
using Nanook.GrindCore.DeflateZLib;
|
||||||
using SabreTools.Data.Models.GCZ;
|
using SabreTools.Data.Models.GCZ;
|
||||||
using SabreTools.IO.Compression.Deflate;
|
|
||||||
using SabreTools.IO.Extensions;
|
using SabreTools.IO.Extensions;
|
||||||
using SabreTools.Numerics.Extensions;
|
using SabreTools.Numerics.Extensions;
|
||||||
|
|
||||||
@@ -122,13 +123,13 @@ namespace SabreTools.Wrappers
|
|||||||
{
|
{
|
||||||
blockPointers[i] = blockPointer;
|
blockPointers[i] = blockPointer;
|
||||||
destination.Write(compressBuf, 0, compressedSize);
|
destination.Write(compressBuf, 0, compressedSize);
|
||||||
blockHashes[i] = Adler.Adler32(1, compressBuf, 0, compressedSize);
|
blockHashes[i] = IO.Compression.Deflate.Adler.Adler32(1, compressBuf, 0, compressedSize);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
blockPointers[i] = blockPointer | Constants.UncompressedFlag;
|
blockPointers[i] = blockPointer | Constants.UncompressedFlag;
|
||||||
destination.Write(readBuf, 0, blockDataSize);
|
destination.Write(readBuf, 0, blockDataSize);
|
||||||
blockHashes[i] = Adler.Adler32(1, readBuf, 0, blockDataSize);
|
blockHashes[i] = IO.Compression.Deflate.Adler.Adler32(1, readBuf, 0, blockDataSize);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -175,12 +176,12 @@ namespace SabreTools.Wrappers
|
|||||||
ms.WriteByte(0x78);
|
ms.WriteByte(0x78);
|
||||||
ms.WriteByte(0x9C);
|
ms.WriteByte(0x9C);
|
||||||
|
|
||||||
using (var ds = new DeflateStream(ms, CompressionMode.Compress, leaveOpen: true))
|
using (var ds = new DeflateStream(ms, new CompressionOptions { LeaveOpen = true, Type = CompressionType.Level5 }))
|
||||||
{
|
{
|
||||||
ds.Write(input, 0, inputSize);
|
ds.Write(input, 0, inputSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint adler = Adler.Adler32(1, input, 0, inputSize);
|
uint adler = IO.Compression.Deflate.Adler.Adler32(1, input, 0, inputSize);
|
||||||
ms.WriteByte((byte)(adler >> 24));
|
ms.WriteByte((byte)(adler >> 24));
|
||||||
ms.WriteByte((byte)(adler >> 16));
|
ms.WriteByte((byte)(adler >> 16));
|
||||||
ms.WriteByte((byte)(adler >> 8));
|
ms.WriteByte((byte)(adler >> 8));
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using Nanook.GrindCore;
|
||||||
|
using Nanook.GrindCore.DeflateZLib;
|
||||||
using SabreTools.Data.Models.GZIP;
|
using SabreTools.Data.Models.GZIP;
|
||||||
using SabreTools.IO.Compression.Deflate;
|
|
||||||
using SabreTools.IO.Extensions;
|
using SabreTools.IO.Extensions;
|
||||||
|
|
||||||
namespace SabreTools.Wrappers
|
namespace SabreTools.Wrappers
|
||||||
@@ -40,6 +41,7 @@ namespace SabreTools.Wrappers
|
|||||||
?? (Filename is not null ? Path.GetFileName(Filename).Replace(".gz", string.Empty) : null)
|
?? (Filename is not null ? Path.GetFileName(Filename).Replace(".gz", string.Empty) : null)
|
||||||
?? $"extracted_file";
|
?? $"extracted_file";
|
||||||
|
|
||||||
|
filename = filename.TrimStart(['\\', '/']);
|
||||||
if (Path.DirectorySeparatorChar == '\\')
|
if (Path.DirectorySeparatorChar == '\\')
|
||||||
filename = filename.Replace('/', '\\');
|
filename = filename.Replace('/', '\\');
|
||||||
else if (Path.DirectorySeparatorChar == '/')
|
else if (Path.DirectorySeparatorChar == '/')
|
||||||
@@ -52,7 +54,7 @@ namespace SabreTools.Wrappers
|
|||||||
Directory.CreateDirectory(directoryName);
|
Directory.CreateDirectory(directoryName);
|
||||||
|
|
||||||
// Open the source as a DEFLATE stream
|
// Open the source as a DEFLATE stream
|
||||||
var deflateStream = new DeflateStream(_dataSource, CompressionMode.Decompress, leaveOpen: true);
|
var deflateStream = new DeflateStream(_dataSource, new CompressionOptions { LeaveOpen = true, Type = CompressionType.Decompress});
|
||||||
|
|
||||||
// Write the file
|
// Write the file
|
||||||
using var fs = File.Open(filename, FileMode.Create, FileAccess.Write, FileShare.None);
|
using var fs = File.Open(filename, FileMode.Create, FileAccess.Write, FileShare.None);
|
||||||
|
|||||||
@@ -95,6 +95,7 @@ namespace SabreTools.Wrappers
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Ensure directory separators are consistent
|
// Ensure directory separators are consistent
|
||||||
|
filename = filename.TrimStart(['\\', '/']);
|
||||||
if (Path.DirectorySeparatorChar == '\\')
|
if (Path.DirectorySeparatorChar == '\\')
|
||||||
filename = filename.Replace('/', '\\');
|
filename = filename.Replace('/', '\\');
|
||||||
else if (Path.DirectorySeparatorChar == '/')
|
else if (Path.DirectorySeparatorChar == '/')
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
using Nanook.GrindCore;
|
||||||
|
using Nanook.GrindCore.DeflateZLib;
|
||||||
using SabreTools.Data.Models.InstallShieldCabinet;
|
using SabreTools.Data.Models.InstallShieldCabinet;
|
||||||
using SabreTools.Hashing;
|
using SabreTools.Hashing;
|
||||||
using SabreTools.IO.Compression.zlib;
|
|
||||||
using SabreTools.IO.Extensions;
|
using SabreTools.IO.Extensions;
|
||||||
using static SabreTools.Data.Models.InstallShieldCabinet.Constants;
|
using static SabreTools.Data.Models.InstallShieldCabinet.Constants;
|
||||||
|
|
||||||
@@ -50,11 +51,6 @@ namespace SabreTools.Wrappers
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private const int BUFFER_SIZE = 64 * 1024;
|
private const int BUFFER_SIZE = 64 * 1024;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Maximum size of the window in bits
|
|
||||||
/// </summary>
|
|
||||||
private const int MAX_WBITS = 15;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Characters that should be replaced by an underscore for filenames
|
/// Characters that should be replaced by an underscore for filenames
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -245,7 +241,7 @@ namespace SabreTools.Wrappers
|
|||||||
string filename = cabinet.GetFileName(i) ?? $"BAD_FILENAME{i}";
|
string filename = cabinet.GetFileName(i) ?? $"BAD_FILENAME{i}";
|
||||||
uint dirIndex = cabinet.GetDirectoryIndexFromFile(i);
|
uint dirIndex = cabinet.GetDirectoryIndexFromFile(i);
|
||||||
string dir = cabinet.GetDirectoryName((int)dirIndex) ?? $"BAD_DIRNAME{dirIndex}";
|
string dir = cabinet.GetDirectoryName((int)dirIndex) ?? $"BAD_DIRNAME{dirIndex}";
|
||||||
string group = cabinet.GetFileGroupNameFromFile(i) ?? $"BAD_GROUPNAME{dirIndex}";
|
string? group = cabinet.GetFileGroupNameFromFile(i);
|
||||||
|
|
||||||
// Consistently replace problematic path characters
|
// Consistently replace problematic path characters
|
||||||
foreach (char c in PathReplacementCharacters)
|
foreach (char c in PathReplacementCharacters)
|
||||||
@@ -253,19 +249,22 @@ namespace SabreTools.Wrappers
|
|||||||
dir = dir.Replace(c, '_');
|
dir = dir.Replace(c, '_');
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (char c in PathReplacementCharacters)
|
// Only process the group if it's valid
|
||||||
|
if (group is not null)
|
||||||
{
|
{
|
||||||
group = group.Replace(c, '_');
|
foreach (char c in PathReplacementCharacters)
|
||||||
|
{
|
||||||
|
group = group.Replace(c, '_');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build the full path
|
// Build the full path
|
||||||
#if NET20 || NET35
|
filename = Path.Combine(dir, filename);
|
||||||
filename = Path.Combine(Path.Combine(group, dir), filename);
|
if (group is not null)
|
||||||
#else
|
filename = Path.Combine(group, filename);
|
||||||
filename = Path.Combine(group, dir, filename);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Ensure directory separators are consistent
|
// Ensure directory separators are consistent
|
||||||
|
filename = filename.TrimStart(['\\', '/']);
|
||||||
if (Path.DirectorySeparatorChar == '\\')
|
if (Path.DirectorySeparatorChar == '\\')
|
||||||
filename = filename.Replace('/', '\\');
|
filename = filename.Replace('/', '\\');
|
||||||
else if (Path.DirectorySeparatorChar == '/')
|
else if (Path.DirectorySeparatorChar == '/')
|
||||||
@@ -314,7 +313,7 @@ namespace SabreTools.Wrappers
|
|||||||
|
|
||||||
// Create the output file and hasher
|
// Create the output file and hasher
|
||||||
using var fs = File.Open(filename, FileMode.Create, FileAccess.Write, FileShare.None);
|
using var fs = File.Open(filename, FileMode.Create, FileAccess.Write, FileShare.None);
|
||||||
var md5 = new HashWrapper(HashType.MD5);
|
var md5 = new HashWrapper(Hashing.HashType.MD5);
|
||||||
|
|
||||||
ulong readBytesLeft = GetReadableBytes(fileDescriptor);
|
ulong readBytesLeft = GetReadableBytes(fileDescriptor);
|
||||||
ulong writeBytesLeft = GetWritableBytes(fileDescriptor);
|
ulong writeBytesLeft = GetWritableBytes(fileDescriptor);
|
||||||
@@ -328,7 +327,7 @@ namespace SabreTools.Wrappers
|
|||||||
while (readBytesLeft > 0 && readBytesLeft <= storedSize)
|
while (readBytesLeft > 0 && readBytesLeft <= storedSize)
|
||||||
{
|
{
|
||||||
uint bytesToWrite = BUFFER_SIZE;
|
uint bytesToWrite = BUFFER_SIZE;
|
||||||
int result;
|
bool result;
|
||||||
|
|
||||||
// Handle compressed files
|
// Handle compressed files
|
||||||
#if NET20 || NET35
|
#if NET20 || NET35
|
||||||
@@ -365,9 +364,9 @@ namespace SabreTools.Wrappers
|
|||||||
result = Uncompress(outputBuffer, ref bytesToWrite, inputBuffer, ref bytesToRead);
|
result = Uncompress(outputBuffer, ref bytesToWrite, inputBuffer, ref bytesToRead);
|
||||||
|
|
||||||
// If we didn't get a positive result that's not a data error (false positives)
|
// If we didn't get a positive result that's not a data error (false positives)
|
||||||
if (result != zlibConst.Z_OK && result != zlibConst.Z_DATA_ERROR)
|
if (!result)
|
||||||
{
|
{
|
||||||
Console.Error.WriteLine($"Decompression failed with code {result.ToZlibConstName()}. bytes_to_read={bytesToRead}, volume={fileDescriptor.Volume}, read_bytes={bytesToRead}");
|
Console.Error.WriteLine($"Decompression failed. bytes_to_read={bytesToRead}, volume={fileDescriptor.Volume}, read_bytes={bytesToRead}");
|
||||||
reader.Dispose();
|
reader.Dispose();
|
||||||
fs?.Close();
|
fs?.Close();
|
||||||
return false;
|
return false;
|
||||||
@@ -481,73 +480,42 @@ namespace SabreTools.Wrappers
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Uncompress a source byte array to a destination
|
/// Uncompress a source byte array to a destination
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static unsafe int Uncompress(byte[] dest, ref uint destLen, byte[] source, ref uint sourceLen)
|
private static bool Uncompress(byte[] dest, ref uint destLen, byte[] source, ref uint sourceLen)
|
||||||
{
|
{
|
||||||
fixed (byte* sourcePtr = source, destPtr = dest)
|
// Prepare the streams
|
||||||
{
|
using var sourceStream = new MemoryStream(source, index: 0, (int)sourceLen, false);
|
||||||
var stream = new ZLib.z_stream_s
|
using var deflateStream = new DeflateStream(sourceStream, new CompressionOptions { Type = CompressionType.Decompress });
|
||||||
{
|
using var destStream = new MemoryStream(dest);
|
||||||
next_in = sourcePtr,
|
|
||||||
avail_in = sourceLen,
|
|
||||||
next_out = destPtr,
|
|
||||||
avail_out = destLen,
|
|
||||||
};
|
|
||||||
|
|
||||||
// make second parameter negative to disable checksum verification
|
// Copy the source to the destination
|
||||||
int err = ZLib.inflateInit2_(stream, -MAX_WBITS, ZLib.zlibVersion(), source.Length);
|
bool copied = deflateStream.BlockCopy(destStream);
|
||||||
if (err != zlibConst.Z_OK)
|
|
||||||
return err;
|
|
||||||
|
|
||||||
err = ZLib.inflate(stream, zlibConst.Z_FINISH);
|
destLen = (uint)destStream.Position;
|
||||||
if (err != zlibConst.Z_OK && err != zlibConst.Z_STREAM_END)
|
sourceLen = (uint)deflateStream.Position;
|
||||||
{
|
return copied;
|
||||||
ZLib.inflateEnd(stream);
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
destLen = stream.total_out;
|
|
||||||
sourceLen = stream.total_in;
|
|
||||||
return ZLib.inflateEnd(stream);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Uncompress a source byte array to a destination (old version)
|
/// Uncompress a source byte array to a destination (old version)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static unsafe int UncompressOld(byte[] dest, ref uint destLen, byte[] source, ref uint sourceLen)
|
private static bool UncompressOld(byte[] dest, ref uint destLen, byte[] source, ref uint sourceLen)
|
||||||
{
|
{
|
||||||
fixed (byte* sourcePtr = source, destPtr = dest)
|
// Prepare the streams
|
||||||
|
using var sourceStream = new MemoryStream(source, 0, (int)sourceLen, false);
|
||||||
|
using var deflateStream = new DeflateStream(sourceStream, new CompressionOptions { Type = CompressionType.Decompress });
|
||||||
|
using var destStream = new MemoryStream(dest);
|
||||||
|
|
||||||
|
// Copy the source to the destination
|
||||||
|
while (deflateStream.Position < sourceLen)
|
||||||
{
|
{
|
||||||
var stream = new ZLib.z_stream_s
|
bool copied = deflateStream.BlockCopy(destStream);
|
||||||
{
|
if (!copied)
|
||||||
next_in = sourcePtr,
|
return false;
|
||||||
avail_in = sourceLen,
|
|
||||||
next_out = destPtr,
|
|
||||||
avail_out = destLen,
|
|
||||||
};
|
|
||||||
|
|
||||||
destLen = 0;
|
|
||||||
sourceLen = 0;
|
|
||||||
|
|
||||||
// make second parameter negative to disable checksum verification
|
|
||||||
int err = ZLib.inflateInit2_(stream, -MAX_WBITS, ZLib.zlibVersion(), source.Length);
|
|
||||||
if (err != zlibConst.Z_OK)
|
|
||||||
return err;
|
|
||||||
|
|
||||||
while (stream.avail_in > 1)
|
|
||||||
{
|
|
||||||
err = ZLib.inflate(stream, zlibConst.Z_BLOCK);
|
|
||||||
if (err != zlibConst.Z_OK)
|
|
||||||
{
|
|
||||||
ZLib.inflateEnd(stream);
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
destLen = stream.total_out;
|
|
||||||
sourceLen = stream.total_in;
|
|
||||||
return ZLib.inflateEnd(stream);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
destLen = (uint)destStream.Position;
|
||||||
|
sourceLen = (uint)deflateStream.Position;
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ namespace SabreTools.Wrappers
|
|||||||
|
|
||||||
// Ensure directory separators are consistent
|
// Ensure directory separators are consistent
|
||||||
var filename = entry.Path.TrimEnd('\0');
|
var filename = entry.Path.TrimEnd('\0');
|
||||||
|
filename = filename.TrimStart(['\\', '/']);
|
||||||
if (Path.DirectorySeparatorChar == '\\')
|
if (Path.DirectorySeparatorChar == '\\')
|
||||||
filename = filename.Replace('/', '\\');
|
filename = filename.Replace('/', '\\');
|
||||||
else if (Path.DirectorySeparatorChar == '/')
|
else if (Path.DirectorySeparatorChar == '/')
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ namespace SabreTools.Wrappers
|
|||||||
filename += $".{FileExtension}";
|
filename += $".{FileExtension}";
|
||||||
|
|
||||||
// Ensure directory separators are consistent
|
// Ensure directory separators are consistent
|
||||||
|
filename = filename.TrimStart(['\\', '/']);
|
||||||
if (Path.DirectorySeparatorChar == '\\')
|
if (Path.DirectorySeparatorChar == '\\')
|
||||||
filename = filename.Replace('/', '\\');
|
filename = filename.Replace('/', '\\');
|
||||||
else if (Path.DirectorySeparatorChar == '/')
|
else if (Path.DirectorySeparatorChar == '/')
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user