Clean up some console writes

Author: mnadareski

SabreTools.Serialization/Wrappers/InstallShieldCabinet.Extraction.cs

@@ -249,7 +249,7 @@ public bool Extract(string outputDirectory, bool includeDebug)
                         if (directoryName != null && !Directory.Exists(directoryName))
                             Directory.CreateDirectory(directoryName);
 
-                        cabinet.FileSave(i, filename);
+                        cabinet.FileSave(i, filename, includeDebug);
                     }
                     catch (Exception ex)
                     {
@@ -269,15 +269,15 @@ public bool Extract(string outputDirectory, bool includeDebug)
         /// <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)
                 return false;
 
             // 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 @@ public bool FileSave(int index, string filename, bool useOld = false)
 
             // 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();

SabreTools.Serialization/Wrappers/MoPaQ.Extraction.cs

@@ -12,11 +12,7 @@ public partial class MoPaQ : IExtractable
         /// <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 @@ public bool Extract(string outputDirectory, bool includeDebug)
                 if (includeDebug) System.Console.WriteLine(ex);
                 return false;
             }
+#else
+            Console.WriteLine("Extraction is not supported for this framework!");
+            Console.WriteLine();
+            return false;
 #endif
         }
     }