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

[ArchiveTools] Simplify code

Browse Source
This commit is contained in:
Matt Nadareski
2017-02-26 22:42:38 -08:00
parent 8f5a66c41d
commit 7f73a8bd38
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
SabreTools.Helper/Tools/ArchiveTools.cs
View File

@@ -155,13 +155,8 @@ namespace SabreTools.Helper.Tools
for (int i = 0; i < zf.EntriesCount && zr == ZipReturn.ZipGood; i++) for (int i = 0; i < zf.EntriesCount && zr == ZipReturn.ZipGood; i++)
{ {
// Set defaults before writing out // Open the read stream
Stream readStream; zr = zf.OpenReadStream(i, false, out Stream readStream, out ulong streamsize, out CompressionMethod cm, out uint lastMod);
ulong streamsize = 0;
CompressionMethod cm = CompressionMethod.Stored;
uint lastMod = 0;
zr = zf.OpenReadStream(i, false, out readStream, out streamsize, out cm, out lastMod);
// Create the rest of the path, if needed // Create the rest of the path, if needed
if (!String.IsNullOrEmpty(Path.GetDirectoryName(zf.Entries[i].FileName))) if (!String.IsNullOrEmpty(Path.GetDirectoryName(zf.Entries[i].FileName)))
@@ -354,13 +349,8 @@ namespace SabreTools.Helper.Tools
{ {
realEntry = zf.Entries[i].FileName; realEntry = zf.Entries[i].FileName;
// Set defaults before writing out // Open the read stream
Stream readStream; zr = zf.OpenReadStream(i, false, out Stream readStream, out ulong streamsize, out CompressionMethod cm, out uint lastMod);
ulong streamsize = 0;
CompressionMethod cm = CompressionMethod.Stored;
uint lastMod = 0;
zr = zf.OpenReadStream(i, false, out readStream, out streamsize, out cm, out lastMod);
// Get the output path // Get the output path
realEntry = Path.Combine(Path.GetFullPath(tempDir), realEntry); realEntry = Path.Combine(Path.GetFullPath(tempDir), realEntry);
@@ -1527,7 +1517,7 @@ namespace SabreTools.Helper.Tools
public static bool WriteTorrentZip(List<string> inputFiles, string outDir, List<Rom> roms, Logger logger, bool date = false) public static bool WriteTorrentZip(List<string> inputFiles, string outDir, List<Rom> roms, Logger logger, bool date = false)
{ {
bool success = false; bool success = false;
string tempFile = Path.Combine(Path.GetTempPath(), "tmp" + Guid.NewGuid().ToString()); string tempFile = Path.Combine(outDir, "tmp" + Guid.NewGuid().ToString());
// If either list of roms is null or empty, return // If either list of roms is null or empty, return
if (inputFiles == null || roms == null || inputFiles.Count == 0 || roms.Count == 0) if (inputFiles == null || roms == null || inputFiles.Count == 0 || roms.Count == 0)
@@ -1698,11 +1688,7 @@ namespace SabreTools.Helper.Tools
else else
{ {
// Instantiate the streams // Instantiate the streams
CompressionMethod icompressionMethod = CompressionMethod.Stored; oldZipFile.OpenReadStream(index, false, out Stream zreadStream, out ulong istreamSize, out CompressionMethod icompressionMethod, out uint lastMod);
uint lastMod = 0;
ulong istreamSize = 0;
Stream zreadStream;
oldZipFile.OpenReadStream(index, false, out zreadStream, out istreamSize, out icompressionMethod, out lastMod);
zipFile.OpenWriteStream(false, lastMod == Constants.TorrentZipFileDateTime, oldZipFile.Filename(index), zipFile.OpenWriteStream(false, lastMod == Constants.TorrentZipFileDateTime, oldZipFile.Filename(index),
istreamSize, CompressionMethod.Deflated, out writeStream, lastMod: lastMod); istreamSize, CompressionMethod.Deflated, out writeStream, lastMod: lastMod);