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

[SimpleSort] Bring stability improvements to SimpleSort and the classes/methods it relies on

Browse Source
This commit is contained in:
Matt Nadareski
2016-09-18 12:29:33 -07:00
parent 4f43aecea2
commit 7f08c80341
4 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
SabreTools.Helper/Tools/FileTools.cs
View File

@@ -211,7 +211,7 @@ namespace SabreTools.Helper
Rom rom = roms[inputIndexMap[key]];
// Open the input file for reading
using (Stream readStream = File.OpenRead(inputFile))
using (Stream readStream = File.Open(inputFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
{
ulong streamSize = (ulong)(new FileInfo(inputFile).Length);
zipReturn = zipFile.OpenWriteStream(false, true, rom.Name, streamSize, CompressionMethod.Deflated, out writeStream);
@@ -278,7 +278,7 @@ namespace SabreTools.Helper
if (index < 0)
{
// Open the input file for reading
Stream freadStream = File.OpenRead(key);
Stream freadStream = File.Open(key, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
ulong istreamSize = (ulong)(new FileInfo(key).Length);
zipFile.OpenWriteStream(false, true, roms[-index - 1].Name, istreamSize, CompressionMethod.Deflated, out writeStream);
@@ -710,8 +710,9 @@ namespace SabreTools.Helper
/// <param name="noMD5">True if MD5 hashes should not be calculated, false otherwise (default)</param>
/// <param name="noSHA1">True if SHA-1 hashes should not be calcluated, false otherwise (default)</param>
/// <param name="offset">Set a >0 number for getting hash for part of the file, 0 otherwise (default)</param>
/// <param name="keepReadOpen">True if the underlying read stream should be kept open, false otherwise</param>
/// <returns>Populated RomData object if success, empty one on error</returns>
public static Rom GetSingleStreamInfo(Stream input, bool noMD5 = false, bool noSHA1 = false, long offset = 0)
public static Rom GetSingleStreamInfo(Stream input, bool noMD5 = false, bool noSHA1 = false, long offset = 0, bool keepReadOpen = false)
{
// If we have a negative offset, zero it out since we don't support it yet
if (offset < 0)
@@ -777,6 +778,14 @@ namespace SabreTools.Helper
{
return new Rom();
}
finally
{
if (!keepReadOpen)
{
input.Close();
input.Dispose();
}
}
return rom;
}