SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-09-22 23:05:12 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Clean up some console writes

Browse Source
This commit is contained in:
Matt Nadareski
2025-09-24 10:55:39 -04:00
parent 0a4fd01ede
commit 676bf584d6
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SabreTools.Serialization/Wrappers/InstallShieldCabinet.Extraction.cs
View File

@@ -249,7 +249,7 @@ namespace SabreTools.Serialization.Wrappers
if (directoryName != null && !Directory.Exists(directoryName))
Directory.CreateDirectory(directoryName);
cabinet.FileSave(i, filename);
cabinet.FileSave(i, filename, includeDebug);
}
catch (Exception ex)
{
@@ -269,7 +269,7 @@ namespace SabreTools.Serialization.Wrappers
/// <summary>
/// Save the file at the given index to the filename specified
/// </summary>
public bool FileSave(int index, string filename, bool useOld = false)
public bool FileSave(int index, string filename, bool includeDebug, bool useOld = false)
{
// Get the file descriptor
if (!TryGetFileDescriptor(index, out var fileDescriptor) || fileDescriptor == null)
@@ -277,7 +277,7 @@ namespace SabreTools.Serialization.Wrappers
// If the file is split
if (fileDescriptor.LinkFlags == LinkFlags.LINK_PREV)
return FileSave((int)fileDescriptor.LinkPrevious, filename, useOld);
return FileSave((int)fileDescriptor.LinkPrevious, filename, includeDebug, useOld);
// Get the reader at the index
var reader = Reader.Create(this, index, fileDescriptor);
@@ -379,7 +379,7 @@ namespace SabreTools.Serialization.Wrappers
// Validate the number of bytes written
if ((long)fileDescriptor.ExpandedSize != totalWritten)
Console.WriteLine($"Expanded size of file {index} ({GetFileName(index)}) expected to be {fileDescriptor.ExpandedSize}, but was {totalWritten}");
if (includeDebug) Console.WriteLine($"Expanded size of file {index} ({GetFileName(index)}) expected to be {fileDescriptor.ExpandedSize}, but was {totalWritten}");
// Finalize output values
md5.Terminate();

10
SabreTools.Serialization/Wrappers/MoPaQ.Extraction.cs
View File

@@ -12,11 +12,7 @@ namespace SabreTools.Serialization.Wrappers
/// <inheritdoc/>
public bool Extract(string outputDirectory, bool includeDebug)
{
#if NET20 || NET35 || !(WINX86 || WINX64)
Console.WriteLine("Extraction is not supported for this framework!");
Console.WriteLine();
return false;
#else
#if (NET452_OR_GREATER || NETCOREAPP) && (WINX86 || WINX64)
try
{
if (Filename == null || !File.Exists(Filename))
@@ -73,6 +69,10 @@ namespace SabreTools.Serialization.Wrappers
if (includeDebug) System.Console.WriteLine(ex);
return false;
}
#else
Console.WriteLine("Extraction is not supported for this framework!");
Console.WriteLine();
return false;
#endif
}
}