node-automator 1.4.28 → 1.4.29

package/commands/compress.js

@@ -23,7 +23,7 @@ class CompressCommand extends BaseCommand {
             if (w && h) {
                 result.resize(w, h);
             }
-            if (scale) {
+            if (scale && scale != 1) {
                 result.scale(scale);
             }
             await result.writeAsync(dstFile);

package/commands/mgr.js

@@ -137,6 +137,7 @@ const { MergeFileCommand } = require("./merge_file");
 const { ZipFolderCommand } = require("./zip_folder");
 const { EncryptCommand } = require('./encrypt');
 const { DecryptCommand } = require('./decrypt');
+const { TinifyCommand } = require('./tinify');
 
 const globalData = {
     executed_cfg: [], // 执行过的配置文件
@@ -525,6 +526,7 @@ function init() {
     register("zip_folder", ZipFolderCommand, false);
     register("encrypt", EncryptCommand, false);
     register("decrypt", DecryptCommand, false);
+    register("tinify", TinifyCommand, false);
 }
 
 module.exports = {

package/commands/tinify.js

@@ -0,0 +1,45 @@
+const { BaseCommand } = require("./base");
+const tinify = require("tinify");
+const Jimp = require("jimp");
+const { get_fst_file, get_full_path } = require('../utils/file_tool');
+const { dirname } = require('node:path');
+const fs = require('node:fs');
+
+class TinifyCommand extends BaseCommand {
+    async execute() {
+        const data = this.selfData;
+        tinify.key = data.api_key;
+        const src = get_fst_file(data.src);
+        const dstFile = get_full_path(data.dst, "FILE");
+        fs.copyFileSync(src, dstFile);
+        const dstDir = dirname(dstFile);
+        if (!fs.existsSync(dstDir)) {
+            fs.mkdirSync(dstDir, { recursive: true });
+        }
+        let tinifyData = tinify.fromFile(src);
+        if (data.resize) {
+            const { w, h, scale } = data.resize;
+            if (w && h) {
+                tinifyData = tinifyData.resize({
+                    method: "fit",
+                    width: w,
+                    height: h,
+                });
+            }
+            if (scale && scale != 1) {
+                const result = await Jimp.read(dstFile);
+                const width = result.getWidth();
+                tinifyData = tinifyData.scale({
+                    method: "scale",
+                    width: width * scale,
+                });
+            }
+        }
+        await tinifyData.toFile(dstFile);
+    }
+
+}
+
+module.exports = {
+    TinifyCommand,
+};

package/index.js

@@ -94,6 +94,7 @@ async function MainProcess() {
                 progress(elapsedTime, estimateTime, {
                     desc: "预计耗时",
                     format_time: true,
+                    color: _estimateLeft > 0 ? "reset" : "red",
                 });
             }
         }, timerInterval);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-automator",
-    "version": "1.4.28",
+    "version": "1.4.29",
     "description": "Execute automation with yaml configuration(compatible with json)",
     "main": "index.js",
     "repository": {
@@ -65,6 +65,7 @@
         "spreadsheet-column": "^1.1.1",
         "strip-json-comments": "^3.1.1",
         "temp": "^0.9.4",
+        "tinify": "^1.8.2",
         "typescript-plus": "^3.1.5",
         "websocket": "^1.0.34",
         "xlsx": "^0.17.0",