node-automator 1.4.13 → 1.4.15

package/commands/compress.js

@@ -1,18 +1,26 @@
-const { get_fst_file, get_full_path } = require('../utils/file_tool');
-const { log, getPrint } = require('../utils/log_tool');
+const path = require('path');
+const { get_fst_file, get_full_path, move } = require('../utils/file_tool');
 const { BaseCommand } = require("./base");
-const Jimp = require("jimp");
 
 class CompressCommand extends BaseCommand {
     async execute() {
+        const sharp = require("sharp");
         const data = this.selfData;
         const src = get_fst_file(data.src);
         const dst = get_full_path(data.dst, "FILE");
-        const options = data.options || {};
-        let image = await Jimp.read(src);
-        image.scale(options.scale || 1);
-        image.quality(options.quality || 80);
-        await image.writeAsync(dst);
+        const tmp = path.join(this.shareData.AUTOMATOR_SCRATCH, path.basename(src));
+        let format = data.format;
+        if (!format) {
+            format = dst.split(".").pop();
+        }
+        format = format.toLowerCase();
+        if (format === "jpg") {
+            format = "jpeg";
+        }
+        const options = data.options;
+        await sharp(src)[format](options)
+            .toFile(tmp);
+        await move(tmp, path.dirname(dst), undefined, { quiet: true });
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-automator",
-  "version": "1.4.13",
+  "version": "1.4.15",
   "description": "Execute automation with yaml configuration(compatible with json)",
   "main": "index.js",
   "repository": {
@@ -52,6 +52,7 @@
     "persist-path": "^1.0.2",
     "request": "^2.88.2",
     "request-progress": "^3.0.0",
+    "sharp": "^0.34.3",
     "spreadsheet-column": "^1.1.1",
     "strip-json-comments": "^3.1.1",
     "temp": "^0.9.4",

package/utils/file_tool.js

@@ -149,7 +149,7 @@ function write_plain(dst, data, options) {
 }
 
 async function write_with_type(data, dst, type, options) {
-    if (Buffer.isBuffer(data) || typeof data  === "string") {
+    if (Buffer.isBuffer(data) || typeof data === "string") {
         write_plain(dst, data);
     } else {
         if (!type) {
@@ -168,7 +168,7 @@ async function write_with_type(data, dst, type, options) {
         }
         switch (options?.mode) {
             case "merge": {
-                data = {...(await read_cfg(dst, type)), ...data};
+                data = { ...(await read_cfg(dst, type)), ...data };
                 break;
             }
             case "concat": {
@@ -267,8 +267,8 @@ async function copy(src, dst, base, options) {
         overwrite: true
     }, options);
     let filesize = get_files_size(srcs);
-    info("");
-    whisper(`复制 ${srcs[0]} 等 ${srcs.length} 个文件(夹) ${format_bytes(filesize)} ${options.overwrite ? "[覆盖现有文件]" : "[不覆盖现有文件]"} 到 ${dsts} options: ${JSON.stringify(options)}`, undefined, true);
+    !options.quiet && info("");
+    !options.quiet && whisper(`复制 ${srcs[0]} 等 ${srcs.length} 个文件(夹) ${format_bytes(filesize)} ${options.overwrite ? "[覆盖现有文件]" : "[不覆盖现有文件]"} 到 ${dsts} options: ${JSON.stringify(options)}`, undefined, true);
     let dir_num = 0;
     let actual_files = [];
     for (let srcIndex = 0; srcIndex < srcs.length; srcIndex++) {
@@ -278,7 +278,7 @@ async function copy(src, dst, base, options) {
             ++dir_num;
             continue;
         }
-        display_tool.progress(srcIndex + 1, srcs.length, {
+        !options.quiet && display_tool.progress(srcIndex + 1, srcs.length, {
             desc: `Copy ${show_src}`,
             depth: 0,
             color: "green",
@@ -322,9 +322,9 @@ async function copy(src, dst, base, options) {
             }
         }
     }
-    
-    info("");
-    whisper(`复制完成 (文件: ${actual_files.length}, 目录: ${dir_num}, 总计: ${srcs.length})`, undefined, true);
+
+    !options.quiet && info("");
+    !options.quiet && whisper(`复制完成 (文件: ${actual_files.length}, 目录: ${dir_num}, 总计: ${srcs.length})`, undefined, true);
 }
 
 async function move(src, dst, base, options) {
@@ -340,8 +340,8 @@ async function move(src, dst, base, options) {
         overwrite: true
     }, options);
     let filesize = get_files_size(srcs);
-    info("");
-    whisper(`移动 ${srcs[0]} 等 ${srcs.length} 个文件(夹) ${format_bytes(filesize)} ${options.overwrite ? "[覆盖现有文件]" : "[不覆盖现有文件]"} 到 ${dsts} options: ${JSON.stringify(options)}`, undefined, true);
+    !options.quiet && info("");
+    !options.quiet && whisper(`移动 ${srcs[0]} 等 ${srcs.length} 个文件(夹) ${format_bytes(filesize)} ${options.overwrite ? "[覆盖现有文件]" : "[不覆盖现有文件]"} 到 ${dsts} options: ${JSON.stringify(options)}`, undefined, true);
     let actual_files = [];
     let dir_num = 0;
     for (let srcIndex = 0; srcIndex < srcs.length; srcIndex++) {
@@ -351,7 +351,7 @@ async function move(src, dst, base, options) {
             ++dir_num;
             continue;
         }
-        display_tool.progress(srcIndex + 1, srcs.length, {
+        !options.quiet && display_tool.progress(srcIndex + 1, srcs.length, {
             desc: `Move ${show_src}`,
             depth: 0,
             color: "cyan",
@@ -397,9 +397,9 @@ async function move(src, dst, base, options) {
         // 再删除
         fs.unlinkSync(src);
     }
-    
-    info("");
-    whisper(`移动完成 (文件: ${actual_files.length}, 目录: ${dir_num}, 总计: ${srcs.length})`, undefined, true);
+
+    !options.quiet && info("");
+    !options.quiet && whisper(`移动完成 (文件: ${actual_files.length}, 目录: ${dir_num}, 总计: ${srcs.length})`, undefined, true);
 }
 
 async function move_local(src, dst, base, options) {
@@ -415,8 +415,8 @@ async function move_local(src, dst, base, options) {
         overwrite: true
     }, options);
     let filesize = get_files_size(srcs);
-    info("");
-    whisper(`移动 ${srcs[0]} 等 ${srcs.length} 个文件(夹) ${format_bytes(filesize)} ${options.overwrite ? "[覆盖现有文件]" : "[不覆盖现有文件]"} 到 ${dsts} options: ${JSON.stringify(options)}`, undefined, true);
+    !options.quiet && info("");
+    !options.quiet && whisper(`移动 ${srcs[0]} 等 ${srcs.length} 个文件(夹) ${format_bytes(filesize)} ${options.overwrite ? "[覆盖现有文件]" : "[不覆盖现有文件]"} 到 ${dsts} options: ${JSON.stringify(options)}`, undefined, true);
     let actual_files = [];
     let dir_num = 0;
     for (let srcIndex = 0; srcIndex < srcs.length; srcIndex++) {
@@ -425,7 +425,7 @@ async function move_local(src, dst, base, options) {
         if (fs.lstatSync(src).isDirectory()) {
             ++dir_num;
         }
-        display_tool.progress(srcIndex + 1, srcs.length, {
+        !options.quiet && display_tool.progress(srcIndex + 1, srcs.length, {
             desc: `Rename ${show_src}`,
             depth: 0,
             color: "cyan",
@@ -469,17 +469,17 @@ async function move_local(src, dst, base, options) {
             }
         }
     }
-    
-    info("");
-    whisper(`移动完成 (文件: ${actual_files.length}, 目录: ${dir_num}, 总计: ${srcs.length})`, undefined, true);
+
+    !options.quiet && info("");
+    !options.quiet && whisper(`移动完成 (文件: ${actual_files.length}, 目录: ${dir_num}, 总计: ${srcs.length})`, undefined, true);
 }
 
 async function remove(src, options) {
     srcs = get_file_list(src);
     options = Object.assign({ recursive: true }, options);
     let filesize = get_files_size(srcs);
-    info("");
-    whisper(`删除 ${srcs[0]} 等 ${srcs.length} 个文件(夹) ${format_bytes(filesize)} options: ${JSON.stringify(options)}`, undefined, true);
+    !options.quiet && info("");
+    !options.quiet && whisper(`删除 ${srcs[0]} 等 ${srcs.length} 个文件(夹) ${format_bytes(filesize)} options: ${JSON.stringify(options)}`, undefined, true);
     let actual_files = [];
     let dir_num = 0;
     for (let srcIndex = 0; srcIndex < srcs.length; srcIndex++) {
@@ -507,9 +507,9 @@ async function remove(src, options) {
             warn(err);
         }
     }
-    
-    info("");
-    whisper(`删除完成 (文件: ${actual_files.length}, 目录: ${dir_num}, 总计: ${srcs.length})`, undefined, true);
+
+    !options.quiet && info("");
+    !options.quiet && whisper(`删除完成 (文件: ${actual_files.length}, 目录: ${dir_num}, 总计: ${srcs.length})`, undefined, true);
 }
 
 module.exports = {