Log messages showing which compression impl was used

clowd · Mar 19, 2022 · 3620fad · 3620fad
1 parent 7bd9bb4
commit 3620fad
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Squirrel/Internal/EasyZip.cs b/src/Squirrel/Internal/EasyZip.cs
@@ -18,10 +18,10 @@ internal class EasyZip
 
         public static void ExtractZipToDirectory(string inputFile, string outputDirectory)
         {
-            Log.Info($"Extracting '{inputFile}' to '{outputDirectory}'...");
             if (Extract7z(inputFile, outputDirectory))
                 return;
 
+            Log.Info($"Extracting '{inputFile}' to '{outputDirectory}' using SharpCompress...");
             using var archive = ZipArchive.Open(inputFile);
             archive.WriteToDirectory(outputDirectory, new() {
                 PreserveFileTime = false,
@@ -32,10 +32,10 @@ public static void ExtractZipToDirectory(string inputFile, string outputDirector
 
         public static void CreateZipFromDirectory(string outputFile, string directoryToCompress)
         {
-            Log.Info($"Compressing '{directoryToCompress}' to '{outputFile}'...");
             if (Compress7z(outputFile, directoryToCompress))
                 return;
 
+            Log.Info($"Compressing '{directoryToCompress}' to '{outputFile}' using SharpCompress...");
             using var archive = ZipArchive.Create();
             archive.AddAllFromDirectory(directoryToCompress);
             archive.SaveTo(outputFile, CompressionType.Deflate);
@@ -47,7 +47,7 @@ private static bool Extract7z(string zipFilePath, string outFolder)
             if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 return false;
 #endif
-
+            Log.Info($"Extracting '{zipFilePath}' to '{outFolder}' using 7z...");
             try {
                 var args = String.Format("x \"{0}\" -tzip -mmt on -aoa -y -o\"{1}\" *", zipFilePath, outFolder);
                 var psi = Utility.CreateProcessStartInfo(HelperExe.SevenZipPath, args);
@@ -67,7 +67,7 @@ private static bool Compress7z(string zipFilePath, string inFolder)
             if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 return false;
 #endif
-
+            Log.Info($"Compressing '{inFolder}' to '{zipFilePath}' using 7z...");
             try {
                 var args = String.Format("a \"{0}\" -tzip -aoa -y -mmt on *", zipFilePath);
                 var psi = Utility.CreateProcessStartInfo(HelperExe.SevenZipPath, args, inFolder);