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

Gate more seeks

Browse Source
This commit is contained in:
Matt Nadareski
2024-07-17 14:46:14 -04:00
parent 5fecdad7af
commit 11fa1544f1
6 changed files with 58 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SabreTools.FileTypes/Archives/GZipArchive.cs
View File

@@ -130,10 +130,10 @@ namespace SabreTools.FileTypes.Archives
public override string? CopyToFile(string entryName, string outDir) public override string? CopyToFile(string entryName, string outDir)
{ {
// Try to extract a stream using the given information // Try to extract a stream using the given information
(Stream? ms, string? realEntry) = GetEntryStream(entryName); (Stream? stream, string? realEntry) = GetEntryStream(entryName);
// If the stream and the entry name are both non-null, we write to file // If the stream and the entry name are both non-null, we write to file
if (ms != null && realEntry != null) if (stream != null && realEntry != null)
{ {
realEntry = Path.Combine(outDir, realEntry); realEntry = Path.Combine(outDir, realEntry);
@@ -146,21 +146,23 @@ namespace SabreTools.FileTypes.Archives
FileStream fs = File.Create(realEntry); FileStream fs = File.Create(realEntry);
if (fs != null) if (fs != null)
{ {
ms.Seek(0, SeekOrigin.Begin); if (stream.CanSeek)
stream.Seek(0, SeekOrigin.Begin);
byte[] zbuffer = new byte[_bufferSize]; byte[] zbuffer = new byte[_bufferSize];
int zlen; int zlen;
while ((zlen = ms.Read(zbuffer, 0, _bufferSize)) > 0) while ((zlen = stream.Read(zbuffer, 0, _bufferSize)) > 0)
{ {
fs.Write(zbuffer, 0, zlen); fs.Write(zbuffer, 0, zlen);
fs.Flush(); fs.Flush();
} }
ms?.Dispose(); stream?.Dispose();
fs?.Dispose(); fs?.Dispose();
} }
else else
{ {
ms?.Dispose(); stream?.Dispose();
fs?.Dispose(); fs?.Dispose();
realEntry = null; realEntry = null;
} }
@@ -226,7 +228,7 @@ namespace SabreTools.FileTypes.Archives
BaseFile gzipEntryRom = new(); BaseFile gzipEntryRom = new();
// Perform a quickscan, if flagged to // Perform a quickscan, if flagged to
if (this.AvailableHashTypes.Length == 1 && this.AvailableHashTypes[0] == HashType.CRC32) if (this.AvailableHashTypes.Length == 1 && this.AvailableHashTypes[0] == HashType.CRC32)
{ {
gzipEntryRom.Filename = gamename; gzipEntryRom.Filename = gamename;

14
SabreTools.FileTypes/Archives/RarArchive.cs
View File

@@ -96,10 +96,10 @@ namespace SabreTools.FileTypes.Archives
public override string? CopyToFile(string entryName, string outDir) public override string? CopyToFile(string entryName, string outDir)
{ {
// Try to extract a stream using the given information // Try to extract a stream using the given information
(Stream? ms, string? realEntry) = GetEntryStream(entryName); (Stream? stream, string? realEntry) = GetEntryStream(entryName);
// If the stream and the entry name are both non-null, we write to file // If the stream and the entry name are both non-null, we write to file
if (ms != null && realEntry != null) if (stream != null && realEntry != null)
{ {
realEntry = Path.Combine(outDir, realEntry); realEntry = Path.Combine(outDir, realEntry);
@@ -110,21 +110,23 @@ namespace SabreTools.FileTypes.Archives
FileStream fs = File.Create(realEntry); FileStream fs = File.Create(realEntry);
if (fs != null) if (fs != null)
{ {
ms.Seek(0, SeekOrigin.Begin); if (stream.CanSeek)
stream.Seek(0, SeekOrigin.Begin);
byte[] zbuffer = new byte[_bufferSize]; byte[] zbuffer = new byte[_bufferSize];
int zlen; int zlen;
while ((zlen = ms.Read(zbuffer, 0, _bufferSize)) > 0) while ((zlen = stream.Read(zbuffer, 0, _bufferSize)) > 0)
{ {
fs.Write(zbuffer, 0, zlen); fs.Write(zbuffer, 0, zlen);
fs.Flush(); fs.Flush();
} }
ms?.Dispose(); stream?.Dispose();
fs?.Dispose(); fs?.Dispose();
} }
else else
{ {
ms?.Dispose(); stream?.Dispose();
fs?.Dispose(); fs?.Dispose();
realEntry = null; realEntry = null;
} }

21
SabreTools.FileTypes/Archives/SevenZipArchive.cs
View File

@@ -183,10 +183,10 @@ namespace SabreTools.FileTypes.Archives
public override string? CopyToFile(string entryName, string outDir) public override string? CopyToFile(string entryName, string outDir)
{ {
// Try to extract a stream using the given information // Try to extract a stream using the given information
(Stream? ms, string? realEntry) = GetEntryStream(entryName); (Stream? stream, string? realEntry) = GetEntryStream(entryName);
// If the stream and the entry name are both non-null, we write to file // If the stream and the entry name are both non-null, we write to file
if (ms != null && realEntry != null) if (stream != null && realEntry != null)
{ {
realEntry = Path.Combine(outDir, realEntry); realEntry = Path.Combine(outDir, realEntry);
@@ -197,21 +197,23 @@ namespace SabreTools.FileTypes.Archives
FileStream fs = File.Create(realEntry); FileStream fs = File.Create(realEntry);
if (fs != null) if (fs != null)
{ {
ms.Seek(0, SeekOrigin.Begin); if (stream.CanSeek)
stream.Seek(0, SeekOrigin.Begin);
byte[] zbuffer = new byte[_bufferSize]; byte[] zbuffer = new byte[_bufferSize];
int zlen; int zlen;
while ((zlen = ms.Read(zbuffer, 0, _bufferSize)) > 0) while ((zlen = stream.Read(zbuffer, 0, _bufferSize)) > 0)
{ {
fs.Write(zbuffer, 0, zlen); fs.Write(zbuffer, 0, zlen);
fs.Flush(); fs.Flush();
} }
ms?.Dispose(); stream?.Dispose();
fs?.Dispose(); fs?.Dispose();
} }
else else
{ {
ms?.Dispose(); stream?.Dispose();
fs?.Dispose(); fs?.Dispose();
realEntry = null; realEntry = null;
} }
@@ -445,7 +447,8 @@ namespace SabreTools.FileTypes.Archives
return success; return success;
// Seek to the beginning of the stream // Seek to the beginning of the stream
inputStream.Seek(0, SeekOrigin.Begin); if (inputStream.CanSeek)
inputStream.Seek(0, SeekOrigin.Begin);
// Get the output archive name from the first rebuild rom // Get the output archive name from the first rebuild rom
string archiveFileName = Path.Combine(outDir, TextHelper.RemovePathUnsafeCharacters(baseFile.Parent) + (baseFile.Parent?.EndsWith(".7z") ?? false ? string.Empty : ".7z")); string archiveFileName = Path.Combine(outDir, TextHelper.RemovePathUnsafeCharacters(baseFile.Parent) + (baseFile.Parent?.EndsWith(".7z") ?? false ? string.Empty : ".7z"));
@@ -465,7 +468,9 @@ namespace SabreTools.FileTypes.Archives
// If the archive doesn't exist, create it and put the single file // If the archive doesn't exist, create it and put the single file
if (!File.Exists(archiveFileName)) if (!File.Exists(archiveFileName))
{ {
inputStream.Seek(0, SeekOrigin.Begin); if (inputStream.CanSeek)
inputStream.Seek(0, SeekOrigin.Begin);
zipReturn = zipFile.ZipFileCreate(tempFile); zipReturn = zipFile.ZipFileCreate(tempFile);
// Open the input file for reading // Open the input file for reading

14
SabreTools.FileTypes/Archives/TapeArchive.cs
View File

@@ -97,10 +97,10 @@ namespace SabreTools.FileTypes.Archives
public override string? CopyToFile(string entryName, string outDir) public override string? CopyToFile(string entryName, string outDir)
{ {
// Try to extract a stream using the given information // Try to extract a stream using the given information
(Stream? ms, string? realEntry) = GetEntryStream(entryName); (Stream? stream, string? realEntry) = GetEntryStream(entryName);
// If the stream and the entry name are both non-null, we write to file // If the stream and the entry name are both non-null, we write to file
if (ms != null && realEntry != null) if (stream != null && realEntry != null)
{ {
realEntry = Path.Combine(outDir, realEntry); realEntry = Path.Combine(outDir, realEntry);
@@ -111,21 +111,23 @@ namespace SabreTools.FileTypes.Archives
FileStream fs = File.Create(realEntry); FileStream fs = File.Create(realEntry);
if (fs != null) if (fs != null)
{ {
ms.Seek(0, SeekOrigin.Begin); if (stream.CanSeek)
stream.Seek(0, SeekOrigin.Begin);
byte[] zbuffer = new byte[_bufferSize]; byte[] zbuffer = new byte[_bufferSize];
int zlen; int zlen;
while ((zlen = ms.Read(zbuffer, 0, _bufferSize)) > 0) while ((zlen = stream.Read(zbuffer, 0, _bufferSize)) > 0)
{ {
fs.Write(zbuffer, 0, zlen); fs.Write(zbuffer, 0, zlen);
fs.Flush(); fs.Flush();
} }
ms?.Dispose(); stream?.Dispose();
fs?.Dispose(); fs?.Dispose();
} }
else else
{ {
ms?.Dispose(); stream?.Dispose();
fs?.Dispose(); fs?.Dispose();
realEntry = null; realEntry = null;
} }

16
SabreTools.FileTypes/Archives/XZArchive.cs
View File

@@ -114,10 +114,10 @@ namespace SabreTools.FileTypes.Archives
public override string? CopyToFile(string entryName, string outDir) public override string? CopyToFile(string entryName, string outDir)
{ {
// Try to extract a stream using the given information // Try to extract a stream using the given information
(Stream? ms, string? realEntry) = GetEntryStream(entryName); (Stream? stream, string? realEntry) = GetEntryStream(entryName);
// If the stream and the entry name are both non-null, we write to file // If the stream and the entry name are both non-null, we write to file
if (ms != null && realEntry != null) if (stream != null && realEntry != null)
{ {
realEntry = Path.Combine(outDir, realEntry); realEntry = Path.Combine(outDir, realEntry);
@@ -128,21 +128,23 @@ namespace SabreTools.FileTypes.Archives
FileStream fs = File.Create(realEntry); FileStream fs = File.Create(realEntry);
if (fs != null) if (fs != null)
{ {
ms.Seek(0, SeekOrigin.Begin); if (stream.CanSeek)
stream.Seek(0, SeekOrigin.Begin);
byte[] zbuffer = new byte[_bufferSize]; byte[] zbuffer = new byte[_bufferSize];
int zlen; int zlen;
while ((zlen = ms.Read(zbuffer, 0, _bufferSize)) > 0) while ((zlen = stream.Read(zbuffer, 0, _bufferSize)) > 0)
{ {
fs.Write(zbuffer, 0, zlen); fs.Write(zbuffer, 0, zlen);
fs.Flush(); fs.Flush();
} }
ms?.Dispose(); stream?.Dispose();
fs?.Dispose(); fs?.Dispose();
} }
else else
{ {
ms?.Dispose(); stream?.Dispose();
fs?.Dispose(); fs?.Dispose();
realEntry = null; realEntry = null;
} }
@@ -208,7 +210,7 @@ namespace SabreTools.FileTypes.Archives
BaseFile xzEntryRom = new(); BaseFile xzEntryRom = new();
// Perform a quickscan, if flagged to // Perform a quickscan, if flagged to
if (this.AvailableHashTypes.Length == 1 && this.AvailableHashTypes[0] == HashType.CRC32) if (this.AvailableHashTypes.Length == 1 && this.AvailableHashTypes[0] == HashType.CRC32)
{ {
xzEntryRom.Filename = gamename; xzEntryRom.Filename = gamename;

17
SabreTools.FileTypes/Archives/ZipArchive.cs
View File

@@ -158,10 +158,10 @@ namespace SabreTools.FileTypes.Archives
public override string? CopyToFile(string entryName, string outDir) public override string? CopyToFile(string entryName, string outDir)
{ {
// Try to extract a stream using the given information // Try to extract a stream using the given information
(Stream? ms, string? realEntry) = GetEntryStream(entryName); (Stream? stream, string? realEntry) = GetEntryStream(entryName);
// If the stream and the entry name are both non-null, we write to file // If the stream and the entry name are both non-null, we write to file
if (ms != null && realEntry != null) if (stream != null && realEntry != null)
{ {
realEntry = Path.Combine(outDir, realEntry); realEntry = Path.Combine(outDir, realEntry);
@@ -172,21 +172,23 @@ namespace SabreTools.FileTypes.Archives
FileStream fs = File.Create(realEntry); FileStream fs = File.Create(realEntry);
if (fs != null) if (fs != null)
{ {
ms.Seek(0, SeekOrigin.Begin); if (stream.CanSeek)
stream.Seek(0, SeekOrigin.Begin);
byte[] zbuffer = new byte[_bufferSize]; byte[] zbuffer = new byte[_bufferSize];
int zlen; int zlen;
while ((zlen = ms.Read(zbuffer, 0, _bufferSize)) > 0) while ((zlen = stream.Read(zbuffer, 0, _bufferSize)) > 0)
{ {
fs.Write(zbuffer, 0, zlen); fs.Write(zbuffer, 0, zlen);
fs.Flush(); fs.Flush();
} }
ms?.Dispose(); stream?.Dispose();
fs?.Dispose(); fs?.Dispose();
} }
else else
{ {
ms?.Dispose(); stream?.Dispose();
fs?.Dispose(); fs?.Dispose();
realEntry = null; realEntry = null;
} }
@@ -408,7 +410,8 @@ namespace SabreTools.FileTypes.Archives
return success; return success;
// Seek to the beginning of the stream // Seek to the beginning of the stream
inputStream.Seek(0, SeekOrigin.Begin); if (inputStream.CanSeek)
inputStream.Seek(0, SeekOrigin.Begin);
// Get the output archive name from the first rebuild rom // Get the output archive name from the first rebuild rom
string archiveFileName = Path.Combine(outDir, TextHelper.RemovePathUnsafeCharacters(baseFile.Parent) + (baseFile.Parent!.EndsWith(".zip") ? string.Empty : ".zip")); string archiveFileName = Path.Combine(outDir, TextHelper.RemovePathUnsafeCharacters(baseFile.Parent) + (baseFile.Parent!.EndsWith(".zip") ? string.Empty : ".zip"));