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

Always write to temp file if compressing after

Browse Source
This commit is contained in:
Matt Nadareski
2024-07-16 15:14:59 -04:00
parent 41d8b4297e
commit b9817c9af5
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SabreTools.DatTools/Rebuilder.cs
View File

@@ -425,9 +425,9 @@ namespace SabreTools.DatTools
if (RebuildTorrentXz(datFile, datItem, file, outDir, outputFormat, isZip)) if (RebuildTorrentXz(datFile, datItem, file, outDir, outputFormat, isZip))
return true; return true;
// If there is more than one dupe, write to a temporary file and use that stream instead // Create a temp file if we're compressing the data after
string? tempFile = null; string? tempFile = null;
if (dupes.Count > 1) if (outputFormat != OutputFormat.Folder)
{ {
tempFile = Path.Combine(outDir, $"tmp{System.Guid.NewGuid()}"); tempFile = Path.Combine(outDir, $"tmp{System.Guid.NewGuid()}");
Stream tempStream = System.IO.File.Open(tempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.ReadWrite); Stream tempStream = System.IO.File.Open(tempFile, FileMode.Create, FileAccess.ReadWrite, FileShare.ReadWrite);

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

@@ -328,7 +328,9 @@ namespace SabreTools.FileTypes.Archives
usableDate = dt; usableDate = dt;
// Copy the input stream to the output // Copy the input stream to the output
if (inputStream.CanSeek)
inputStream.Seek(0, SeekOrigin.Begin); inputStream.Seek(0, SeekOrigin.Begin);
tarFile.AddEntry(baseFile.Filename, inputStream, size: baseFile.Size ?? 0, modified: usableDate); tarFile.AddEntry(baseFile.Filename, inputStream, size: baseFile.Size ?? 0, modified: usableDate);
} }
@@ -384,7 +386,9 @@ namespace SabreTools.FileTypes.Archives
if (index < 0) if (index < 0)
{ {
// Copy the input file to the output // Copy the input file to the output
if (inputStream.CanSeek)
inputStream.Seek(0, SeekOrigin.Begin); inputStream.Seek(0, SeekOrigin.Begin);
tarFile.AddEntry(baseFile.Filename, inputStream, size: baseFile.Size ?? 0, modified: usableDate); tarFile.AddEntry(baseFile.Filename, inputStream, size: baseFile.Size ?? 0, modified: usableDate);
} }

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

@@ -428,7 +428,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))
{ {
if (inputStream.CanSeek)
inputStream.Seek(0, SeekOrigin.Begin); 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