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

Let calling locations handle Stream state

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-06 10:28:12 -05:00
parent 40fcf7924a
commit 3d3d22b5d3
6 changed files with 13 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
SabreTools.FileTypes/FileTypeTool.cs
View File

@@ -60,24 +60,13 @@ namespace SabreTools.FileTypes
}
}
/// <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>
/// <returns>Populated BaseFile object if success, null on error</returns>
public static BaseFile GetInfo(Stream? input, HashType[] hashes)
=> GetInfo(input, hashes, keepReadOpen: false);
/// <summary>
/// Retrieve file information for a single file
/// </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>
/// <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, HashType[] hashes, bool keepReadOpen)
public static BaseFile GetInfo(Stream? input, HashType[] hashes)
{
// If we have no stream
if (input == null)
@@ -103,17 +92,8 @@ namespace SabreTools.FileTypes
SpamSum = hashDict.ContainsKey(HashType.SpamSum) ? hashDict[HashType.SpamSum].FromHexString() : null,
};
// Deal with the input stream
if (!keepReadOpen)
{
input.Close();
input.Dispose();
}
else
{
input.SeekIfPossible();
}
// Deal with the input stream and return
input.SeekIfPossible();
return baseFile;
}
catch
@@ -148,7 +128,7 @@ namespace SabreTools.FileTypes
private static BaseFile? GetBaseFile(Stream input, FileType? fileType, HashType[] hashes)
{
// Get external file information
BaseFile? baseFile = GetInfo(input, hashes, keepReadOpen: true);
BaseFile? baseFile = GetInfo(input, hashes);
// Get internal hashes, if they exist
if (fileType == FileType.AaruFormat)