ewip

devedse · Feb 17, 2024 · 809d852 · 809d852
1 parent ac81c64
commit 809d852
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/githubactionsbuilds.yml b/.github/workflows/githubactionsbuilds.yml
@@ -74,6 +74,8 @@ jobs:
     - uses: actions/checkout@v4
     - name: Run paq8hp12_l64 as a test
       run: |
+        pwd
+        ls
         cd /home/runner/work/DeveMultiCompressor/DeveMultiCompressor/Compressors/paq8hp12any_src
         ./paq8hp12_l64 -8 blah.paq8hp12 readme.txt
         find .

diff --git a/DeveMultiCompressor/Compressor.cs b/DeveMultiCompressor/Compressor.cs
@@ -1,6 +1,7 @@
 using DeveMultiCompressor.Compression;
 using DeveMultiCompressor.Config;
 using DeveMultiCompressor.Logging;
+using System;
 using System.Diagnostics;
 using System.IO;
 
@@ -40,11 +41,19 @@ public CompressionResult CompressFile(CompressorFileInfo input)
 
             var arguments = _configStringFiller.FillString(CompressorConfig.CompressorArguments, input);
             var w = Stopwatch.StartNew();
-            _processRunner.RunProcess(CompressorDir, _processRunInfo, arguments);
+            bool success = false;
+            try
+            {
+                _processRunner.RunProcess(CompressorDir, _processRunInfo, arguments);
+                success = File.Exists(outputFileTotalPath);
+            }
+            catch (Exception ex)
+            {
+                _logger.WriteError($"Error occured when compressing with {this.CompressorDir}. Error: {ex}");
+            }
             w.Stop();
 
             var compressedFile = new CompressorFileInfo(outputFileTotalPath);
-            var success = File.Exists(outputFileTotalPath);
             var result = new CompressionResult(success, compressedFile, this, w.Elapsed, input.FileSize, success ? compressedFile.FileSize : input.FileSize);
             return result;
         }

diff --git a/DeveMultiCompressor/CompressorRunner.cs b/DeveMultiCompressor/CompressorRunner.cs
@@ -166,13 +166,13 @@ public void GoCompress(CommandLineOptions options)
                     }
                     else
                     {
-                        _logger.WriteError($"Compression failed for {compressor.CompressorConfig.Description}. Output file {outputFile.FullPath} not found");
+                        _logger.WriteError($"Compression failed for {compressor.CompressorConfig.Description}. Success was false.");
                     }
-
                 }
                 catch (Exception ex)
                 {
-                    _logger.WriteError($"Error occured when compressing with {compressor.CompressorDir}. Error: {ex.ToString()}");
+                    //Ideally we should never get here, but if we do, we should log it and continue with the next compressor
+                    _logger.WriteError($"Unexpected exception occured when compressing with {compressor.CompressorDir}. Error: {ex}");
                 }
             }