claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update packages

Browse Source
This commit is contained in:
Matt Nadareski
2024-12-06 13:20:36 -05:00
parent e8050d582b
commit a6a83b3e76
18 changed files with 73 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SabreTools.FileTypes/Aaru/AaruFormat.cs
View File

@@ -97,11 +97,7 @@ namespace SabreTools.FileTypes.Aaru
return false;
// If the bytes don't match, we don't have an AaruFormat
#if NET20
if (!Matching.Extensions.StartsWith(magicBytes, AaruFormatSignature))
#else
if (!magicBytes.StartsWith(AaruFormatSignature))
#endif
return false;
return true;

2
SabreTools.FileTypes/Archives/GZipArchive.cs
View File

@@ -399,7 +399,7 @@ namespace SabreTools.FileTypes.Archives
Size = extractedsize,
CRC = headercrc,
MD5 = headermd5,
SHA1 = ByteArrayExtensions.StringToByteArray(Path.GetFileNameWithoutExtension(this.Filename)),
SHA1 = Path.GetFileNameWithoutExtension(this.Filename).FromHexString(),
Parent = Path.GetFileNameWithoutExtension(this.Filename).ToLowerInvariant(),
};

2
SabreTools.FileTypes/Archives/XZArchive.cs
View File

@@ -285,7 +285,7 @@ namespace SabreTools.FileTypes.Archives
BaseFile baseFile = new()
{
Filename = Path.GetFileNameWithoutExtension(this.Filename).ToLowerInvariant(),
SHA1 = ByteArrayExtensions.StringToByteArray(Path.GetFileNameWithoutExtension(this.Filename)),
SHA1 = Path.GetFileNameWithoutExtension(this.Filename).FromHexString(),
Parent = Path.GetFileNameWithoutExtension(this.Filename).ToLowerInvariant(),
};

53
SabreTools.FileTypes/BaseFile.cs
View File

@@ -191,44 +191,6 @@ namespace SabreTools.FileTypes
#endif
// Now try to match it to a known signature
#if NET20
if (Matching.Extensions.StartsWith(magic, SevenZipSignature))
{
outFileType = FileType.SevenZipArchive;
}
else if (Matching.Extensions.StartsWith(magic, AaruFormatSignature))
{
outFileType = FileType.AaruFormat;
}
else if (Matching.Extensions.StartsWith(magic, CHDSignature))
{
outFileType = FileType.CHD;
}
else if (Matching.Extensions.StartsWith(magic, GzSignature))
{
outFileType = FileType.GZipArchive;
}
else if (Matching.Extensions.StartsWith(magic, RarSignature)
|| Matching.Extensions.StartsWith(magic, RarFiveSignature))
{
outFileType = FileType.RarArchive;
}
else if (Matching.Extensions.StartsWith(magic, TarSignature)
|| Matching.Extensions.StartsWith(magic, TarZeroSignature))
{
outFileType = FileType.TapeArchive;
}
else if (Matching.Extensions.StartsWith(magic, XZSignature))
{
outFileType = FileType.XZArchive;
}
else if (Matching.Extensions.StartsWith(magic, ZipSignature)
|| Matching.Extensions.StartsWith(magic, ZipSignatureEmpty)
|| Matching.Extensions.StartsWith(magic, ZipSignatureSpanned))
{
outFileType = FileType.ZipArchive;
}
#else
if (magic.StartsWith(SevenZipSignature))
{
outFileType = FileType.SevenZipArchive;
@@ -265,7 +227,6 @@ namespace SabreTools.FileTypes
{
outFileType = FileType.ZipArchive;
}
#endif
return outFileType;
}
@@ -365,13 +326,13 @@ namespace SabreTools.FileTypes
var baseFile = new BaseFile()
{
Size = size,
CRC = hashDict.ContainsKey(HashType.CRC32) ? ByteArrayExtensions.StringToByteArray(hashDict[HashType.CRC32]) : null,
MD5 = hashDict.ContainsKey(HashType.MD5) ? ByteArrayExtensions.StringToByteArray(hashDict[HashType.MD5]) : null,
SHA1 = hashDict.ContainsKey(HashType.SHA1) ? ByteArrayExtensions.StringToByteArray(hashDict[HashType.SHA1]) : null,
SHA256 = hashDict.ContainsKey(HashType.SHA256) ? ByteArrayExtensions.StringToByteArray(hashDict[HashType.SHA256]) : null,
SHA384 = hashDict.ContainsKey(HashType.SHA384) ? ByteArrayExtensions.StringToByteArray(hashDict[HashType.SHA384]) : null,
SHA512 = hashDict.ContainsKey(HashType.SHA512) ? ByteArrayExtensions.StringToByteArray(hashDict[HashType.SHA512]) : null,
SpamSum = hashDict.ContainsKey(HashType.SpamSum) ? ByteArrayExtensions.StringToByteArray(hashDict[HashType.SpamSum]) : null,
CRC = hashDict.ContainsKey(HashType.CRC32) ? hashDict[HashType.CRC32].FromHexString() : null,
MD5 = hashDict.ContainsKey(HashType.MD5) ? hashDict[HashType.MD5].FromHexString() : null,
SHA1 = hashDict.ContainsKey(HashType.SHA1) ? hashDict[HashType.SHA1].FromHexString() : null,
SHA256 = hashDict.ContainsKey(HashType.SHA256) ? hashDict[HashType.SHA256].FromHexString() : null,
SHA384 = hashDict.ContainsKey(HashType.SHA384) ? hashDict[HashType.SHA384].FromHexString() : null,
SHA512 = hashDict.ContainsKey(HashType.SHA512) ? hashDict[HashType.SHA512].FromHexString() : null,
SpamSum = hashDict.ContainsKey(HashType.SpamSum) ? hashDict[HashType.SpamSum].FromHexString() : null,
};
// Deal with the input stream

8
SabreTools.FileTypes/SabreTools.FileTypes.csproj
View File

@@ -37,10 +37,10 @@
<ItemGroup>
<PackageReference Include="SabreTools.Hashing" Version="1.4.0" />
<PackageReference Include="SabreTools.IO" Version="1.5.0" />
<PackageReference Include="SabreTools.Matching" Version="1.4.0" />
<PackageReference Include="SabreTools.Serialization" Version="1.7.0" />
<PackageReference Include="SabreTools.Skippers" Version="1.2.0" />
<PackageReference Include="SabreTools.IO" Version="1.6.1" />
<PackageReference Include="SabreTools.Matching" Version="1.5.0" />
<PackageReference Include="SabreTools.Serialization" Version="1.8.1" />
<PackageReference Include="SabreTools.Skippers" Version="1.3.0" />
</ItemGroup>
</Project>