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

[ArchiveTools, SimpleSort] Add magic number matching, make archive scanning more accurate

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-17 20:03:07 -07:00
parent 18ce3860d0
commit 1e95a3515e
3 changed files with 124 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
SabreTools.Helper/Tools/ArchiveTools.cs
View File

@@ -454,19 +454,48 @@ namespace SabreTools.Helper
{
ArchiveType? outtype = null;
IReader reader = null;
// Read the first bytes of the file and get the magic numbe
try
{
reader = ReaderFactory.Open(File.OpenRead(input));
outtype = reader.ArchiveType;
byte[] magic = new byte[8];
using (BinaryReader br = new BinaryReader(File.OpenRead(input)))
{
magic = br.ReadBytes(8);
}
// Convert it to an uppercase string
string mstr = string.Empty;
for (int i = 0; i < magic.Length; i++)
{
mstr += BitConverter.ToString(new byte[] { magic[i] });
}
mstr = mstr.ToUpperInvariant();
// Now try to match it to a known signature
if (mstr.StartsWith(Constants.SevenZipSig))
{
outtype = ArchiveType.SevenZip;
}
else if (mstr.StartsWith(Constants.GzSig))
{
outtype = ArchiveType.GZip;
}
else if (mstr.StartsWith(Constants.RarSig) || mstr.StartsWith(Constants.RarFiveSig))
{
outtype = ArchiveType.Rar;
}
else if (mstr.StartsWith(Constants.TarSig) || mstr.StartsWith(Constants.TarZeroSig))
{
outtype = ArchiveType.Tar;
}
else if (mstr.StartsWith(Constants.ZipSig) || mstr.StartsWith(Constants.ZipSigEmpty) || mstr.StartsWith(Constants.ZipSigSpanned))
{
outtype = ArchiveType.Zip;
}
}
catch (Exception)
{
// Don't log archive open errors
}
finally
{
reader?.Dispose();
// Don't log file open errors
}
return outtype;