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

Add safety to GetInfo methods

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-04 23:26:06 -05:00
parent 690693c1ad
commit d726b4195f
1 changed files with 70 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
SabreTools.FileTypes/FileTypeTool.cs
View File

@@ -47,34 +47,43 @@ namespace SabreTools.FileTypes
if (!File.Exists(input)) if (!File.Exists(input))
return new BaseFile(); return new BaseFile();
// Get input information try
var fileType = GetFileType(input); {
Stream inputStream = GetInfoStream(input, header); // Get input information
var fileType = GetFileType(input);
Stream inputStream = GetInfoStream(input, header);
// Get the info in the proper manner // Get the info in the proper manner
BaseFile? baseFile; BaseFile? baseFile;
#if NET20 || NET35 #if NET20 || NET35
if (fileType == FileType.AaruFormat && (asFiles & TreatAsFile.AaruFormat) == 0) if (fileType == FileType.AaruFormat && (asFiles & TreatAsFile.AaruFormat) == 0)
baseFile = AaruFormat.Create(inputStream); baseFile = AaruFormat.Create(inputStream);
else if (fileType == FileType.CHD && (asFiles & TreatAsFile.CHD) == 0) else if (fileType == FileType.CHD && (asFiles & TreatAsFile.CHD) == 0)
baseFile = CHDFile.Create(inputStream); baseFile = CHDFile.Create(inputStream);
#else #else
if (fileType == FileType.AaruFormat && !asFiles.HasFlag(TreatAsFile.AaruFormat)) if (fileType == FileType.AaruFormat && !asFiles.HasFlag(TreatAsFile.AaruFormat))
baseFile = AaruFormat.Create(inputStream); baseFile = AaruFormat.Create(inputStream);
else if (fileType == FileType.CHD && !asFiles.HasFlag(TreatAsFile.CHD)) else if (fileType == FileType.CHD && !asFiles.HasFlag(TreatAsFile.CHD))
baseFile = CHDFile.Create(inputStream); baseFile = CHDFile.Create(inputStream);
#endif #endif
else else
baseFile = GetInfo(inputStream, hashes: hashes, keepReadOpen: false); baseFile = GetInfo(inputStream, hashes: hashes, keepReadOpen: false);
// Dispose of the input stream // Dispose of the input stream
inputStream?.Dispose(); inputStream?.Dispose();
// Add unique data from the file // Add unique data from the file
baseFile!.Filename = Path.GetFileName(input); baseFile!.Filename = Path.GetFileName(input);
baseFile.Date = new FileInfo(input).LastWriteTime.ToString("yyyy/MM/dd HH:mm:ss"); baseFile.Date = new FileInfo(input).LastWriteTime.ToString("yyyy/MM/dd HH:mm:ss");
return baseFile; return baseFile;
}
catch
{
// Exceptions are currently not logged
// TODO: Log exceptions
return new BaseFile();
}
} }
/// <summary> /// <summary>
@@ -120,40 +129,49 @@ namespace SabreTools.FileTypes
if (input == null) if (input == null)
return new BaseFile(); return new BaseFile();
// If we want to automatically set the size try
if (size == -1) {
size = input.Length; // If we want to automatically set the size
if (size == -1)
size = input.Length;
// Run the hashing on the input stream // Run the hashing on the input stream
var hashDict = HashTool.GetStreamHashes(input, hashes); var hashDict = HashTool.GetStreamHashes(input, hashes);
if (hashDict == null) if (hashDict == null)
return new BaseFile();
// Create a base file with the resulting hashes
var baseFile = new BaseFile()
{
Size = size,
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
if (!keepReadOpen)
{
input.Close();
input.Dispose();
}
else
{
input.SeekIfPossible();
}
return baseFile;
}
catch
{
// Exceptions are currently not logged
// TODO: Log exceptions
return new BaseFile(); return new BaseFile();
// Create a base file with the resulting hashes
var baseFile = new BaseFile()
{
Size = size,
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
if (!keepReadOpen)
{
input.Close();
input.Dispose();
} }
else
{
input.SeekIfPossible();
}
return baseFile;
} }
/// <summary> /// <summary>