Improve tests & success message. Fix total saved size info.

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 3.1.2 (06.05.2022)
+
+Fixed total saved size calculation.
+
+Added file format to the success message in conversion mode.
+
+
 ## 3.1.1 (08.04.2022)
 
 Removed logging unsupported symbols in CI environment.

lib/convert.js

@@ -76,9 +76,10 @@ async function convert({ paths, lossless, avif, webp, force, output: outputDir }
         before: fs.statSync(filePath).size,
         after: fileBuffer.length,
       };
+      const isOptimized = fileSize.before > fileSize.after;
 
       totalSize.before += fileSize.before;
-      totalSize.after += fileSize.after;
+      totalSize.after += isOptimized ? fileSize.after : fileSize.before;
 
       checkResult({ fileBuffer, filePath, fileSize, outputFormat, force, outputDir });
     });
@@ -101,7 +102,7 @@ function checkResult({ fileBuffer, filePath, fileSize, outputFormat, force, outp
   const before = formatBytes(fileSize.before);
   const after = formatBytes(fileSize.after);
   const ratio = calcRatio(fileSize.before, fileSize.after);
-  const successMessage = `${before} → ${after}. Ratio: ${ratio}%`;
+  const successMessage = `${before} → ${outputFormat} ${after}. Ratio: ${ratio}%`;
 
   const isChanged = !fs.readFileSync(filePath).equals(fileBuffer);
   const isOptimised = ratio > 0;

lib/optimize.js

@@ -78,9 +78,10 @@ async function optimize({ paths, lossless: isLossless, output: outputDir }) {
         before: fs.statSync(filePath).size,
         after: fileBuffer.length,
       };
+      const isOptimized = fileSize.before > fileSize.after;
 
       totalSize.before += fileSize.before;
-      totalSize.after += fileSize.after;
+      totalSize.after += isOptimized ? fileSize.after : fileSize.before;
 
       checkResult(fileBuffer, filePath, fileSize, outputDir);
     });