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 Hashing to 1.4.2

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-06 10:12:46 -05:00
parent 6b977fa075
commit 7159b21afd
13 changed files with 22 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
SabreTools.FileTypes/FileTypeTool.cs
View File

@@ -64,21 +64,10 @@ namespace SabreTools.FileTypes
/// Retrieve file information for a single stream
/// </summary>
/// <param name="input">Stream to get information from</param>
/// <param name="size">Size of the input stream</param>
/// <param name="hashes">Hashes to include in the information</param>
/// <returns>Populated BaseFile object if success, null on error</returns>
public static BaseFile GetInfo(Stream? input, long size, HashType[] hashes)
=> GetInfo(input, size, hashes, keepReadOpen: false);
/// <summary>
/// Retrieve file information for a single stream
/// </summary>
/// <param name="input">Stream to get information from</param>
/// <param name="hashes">Hashes to include in the information</param>
/// <param name="keepReadOpen">Indicates if the underlying read stream should be kept open</param>
/// <returns>Populated BaseFile object if success, null on error</returns>
public static BaseFile GetInfo(Stream? input, HashType[] hashes, bool keepReadOpen)
=> GetInfo(input, size: -1, hashes, keepReadOpen);
public static BaseFile GetInfo(Stream? input, HashType[] hashes)
=> GetInfo(input, hashes, keepReadOpen: false);
/// <summary>
/// Retrieve file information for a single file
@@ -88,7 +77,7 @@ namespace SabreTools.FileTypes
/// <param name="hashes">Hashes to include in the information</param>
/// <param name="keepReadOpen">Indicates if the underlying read stream should be kept open</param>
/// <returns>Populated BaseFile object if success, empty one on error</returns>
public static BaseFile GetInfo(Stream? input, long size, HashType[] hashes, bool keepReadOpen)
public static BaseFile GetInfo(Stream? input, HashType[] hashes, bool keepReadOpen)
{
// If we have no stream
if (input == null)
@@ -96,20 +85,8 @@ namespace SabreTools.FileTypes
try
{
try
{
// If we want to automatically set the size
if (size == -1)
size = input.Length;
}
catch
{
// Don't set the length if the stream doesn't support it
}
// TODO: Replace this with size variant when added
// Run the hashing on the input stream
var hashDict = HashTool.GetStreamHashes(input, hashes);
var hashDict = HashTool.GetStreamHashesAndSize(input, hashes, out long size);
if (hashDict == null)
return new BaseFile();