node-automator 1.4.31 → 1.4.32

package/commands/merge_file.js

@@ -1,4 +1,5 @@
-const { get_file_list, get_full_path } = require("../utils/file_tool");
+const { get_file_list } = require("../utils/file_tool");
+const { get_full_path } = require('../utils/transform_tool');
 const { BaseCommand } = require("./base");
 
 class MergeFileCommand extends BaseCommand {

package/commands/mgr.js

@@ -1,5 +1,5 @@
 const { progress } = require("../utils/display_tool");
-const { eval_code } = require("./share_data");
+const { eval_code, getDataByKey } = require("./share_data");
 const { read_plain } = require("../utils/file_tool");
 const { pause } = require("../utils/interaction_tool");
 const {
@@ -139,10 +139,14 @@ const { EncryptCommand } = require('./encrypt');
 const { DecryptCommand } = require('./decrypt');
 const { TinifyCommand } = require('./tinify');
 const { WatchCommand } = require('./watch');
+const { FilesGitCommand } = require('./files_git');
+const { FontminCommand } = require('./fontmin');
+const { BorderCommand } = require('./border');
 
 const globalData = {
     executed_cfg: [], // 执行过的配置文件
     process_state: PROCESS_STATE.NONE, // 当前执行状态
+    currentTitle: "未知", // 当前执行的配置文件
 };
 
 /**
@@ -277,6 +281,9 @@ async function _execSingle(commandCfg, depth, progressData) {
         formatData(commandCfg);
         setLastCommand(rawCfg, commandCfg);
     }
+    if (commandCfg.title) {
+        globalData.currentTitle = commandCfg.title;
+    }
     if (commandCfg.side_effect && shareData.DRY_RUN) {
         warn(`[DRY_RUN] ${commandCfg.title || commandCfg.type}`);
         return;
@@ -330,17 +337,9 @@ async function _execSingle(commandCfg, depth, progressData) {
         if (data.content != null) {
             content = data.content;
         } else if (data.key) {
-            const keys = data.key.split(".");
-            content = command.shareData;
-            for (let i = 0; i < keys.length; i++) {
-                const key = keys[i];
-                content = content[key];
-                if (!content) {
-                    break;
-                }
-            }
+            content = getDataByKey(data.key);
         } else if (data.src) {
-            content = read_plain(data.src);
+            content = read_plain(data.src, command.getRequireContentOptions());
         } else if (data.code) {
             content = eval_code(data.code);
         }
@@ -529,10 +528,14 @@ function init() {
     register("decrypt", DecryptCommand, false);
     register("tinify", TinifyCommand, false);
     register("watch", WatchCommand, false);
+    register("files_git", FilesGitCommand, false);
+    register("fontmin", FontminCommand, false);
+    register("border", BorderCommand, false);
 }
 
 module.exports = {
     init,
     exec,
     execSingle,
+    globalData,
 };

package/commands/read_only_excel.js

@@ -13,9 +13,13 @@ class ReadOnlyExcelCommand extends BaseCommand {
             for (const sheetName in ret.Sheets) {
                 const sheetData = ret.Sheets[sheetName];
                 const sheetArray = [];
+                const ref = sheetData["!ref"];
+                if (!ref) {
+                    continue;
+                }
                 // "A1:Y71"
                 /** @type {string[]} */
-                const refs = sheetData["!ref"].split(":");
+                const refs = ref.split(":");
                 const colBeg = sc.fromStr(/[A-Z]+/.exec(refs[0])[0]);
                 const rowBeg = /[0-9]+/.exec(refs[0])[0];
                 const colEnd = sc.fromStr(/[A-Z]+/.exec(refs[1])[0]);

package/commands/share_data.js

@@ -1,6 +1,5 @@
 const path = require("node:path");
 const fs = require("node:fs");
-const os = require("node:os");
 const { argv } = require("yargs");
 const pinyin = require("pinyin").pinyin;
 const {
@@ -11,7 +10,8 @@ const {
     formatDate,
     formatTimeInMillisec,
     formatTimestampMillisec,
-    format,
+    format_bytes,
+    get_full_path,
 } = require("../utils/transform_tool");
 const { parse_sync, stringify_sync } = require("../utils/parse_tool");
 const { parseDirective } = require("../utils/parse_directive");
@@ -157,36 +157,6 @@ function formatData(data) {
     return data;
 }
 
-/**
- * 获取完整真实路径
- * @param {*} src
- */
-function get_full_path(src, createIfNotExist) {
-    const dstDir = path
-        .resolve(src.replace(/^~/, os.homedir()))
-        .replace(/\\/g, "/");
-    let targetDir;
-    switch (createIfNotExist) {
-        case "FILE": {
-            targetDir = path.dirname(dstDir);
-            break;
-        }
-        case "FOLDER": {
-            targetDir = dstDir;
-            break;
-        }
-    }
-    if (
-        targetDir &&
-        (!fs.existsSync(targetDir) || !fs.lstatSync(targetDir).isDirectory())
-    ) {
-        fs.mkdirSync(targetDir, {
-            recursive: true,
-        });
-    }
-    return dstDir;
-}
-
 function call_code(code) {
     return eval(`(${code})`);
 }
@@ -388,6 +358,10 @@ function processPipe(val, pipename, pipeargs) {
             val = val == null ? pipeargs[0] : val;
             break;
         }
+        case "or": {
+            val = val || pipeargs[0];
+            break;
+        }
         case "first": {
             val = val?.[0];
             break;
@@ -418,6 +392,10 @@ function processPipe(val, pipename, pipeargs) {
             val = formatDate(val, pipeargs?.[0]);
             break;
         }
+        case "format_bytes": {
+            val = format_bytes(val);
+            break;
+        }
         case "format_timestamp": {
             val = formatTimestampMillisec(val, pipeargs?.[0]);
             break;
@@ -567,7 +545,7 @@ function processPipe(val, pipename, pipeargs) {
                         return fs.statSync(val).ctimeMs;
                     }
                     case "path": {
-                        val = get_full_path(val);
+                        val = get_full_path(val, ...pipeargs);
                         break;
                     }
                     case "basename": {
@@ -792,6 +770,5 @@ module.exports = {
     LINE_EXPRESSION,
     formatData,
     getDataByKey,
-    get_full_path,
     eval_code,
 };

package/commands/split_file.js

@@ -1,4 +1,5 @@
-const { get_fst_file, get_full_path } = require("../utils/file_tool");
+const { get_fst_file } = require("../utils/file_tool");
+const { get_full_path } = require('../utils/transform_tool');
 const { getByteSize } = require("../utils/transform_tool");
 const { BaseCommand } = require("./base");
 

package/commands/stream.js

@@ -1,6 +1,7 @@
 const { BaseCommand } = require("./base");
 const fs = require("node:fs");
-const { get_fst_file, get_full_path } = require("../utils/file_tool");
+const { get_fst_file } = require("../utils/file_tool");
+const { get_full_path } = require('../utils/transform_tool');
 class StreamCommand extends BaseCommand {
     async execute() {
         if (this.selfData.type === "write") {

package/commands/tencent_cos.js

@@ -1,8 +1,7 @@
 const {
     get_file_list,
-    get_full_path,
-    format_bytes,
 } = require("../utils/file_tool");
+const { get_full_path } = require('../utils/transform_tool');
 const { success, getPrint, info, warn, whisper } = require("../utils/log_tool");
 const { BaseCommand } = require("./base");
 const path = require("node:path");
@@ -10,6 +9,7 @@ const { progress } = require("../utils/display_tool");
 const { createWriteStream, readFileSync } = require("node:fs");
 const { getCache, setCache } = require("../utils/cache_tool");
 const crypto = require("node:crypto");
+const { format_bytes } = require('../utils/transform_tool');
 
 class TencentCosCommand extends BaseCommand {
     async execute() {
@@ -245,12 +245,12 @@ class TencentCosCommand extends BaseCommand {
                         srcs = srcs.filter((src) => {
                             const cachedValue =
                                 cachedFiles[
-                                    path
-                                        .join(
-                                            dst_folder,
-                                            path.relative(base, src),
-                                        )
-                                        .replace(/\\/g, "/")
+                                path
+                                    .join(
+                                        dst_folder,
+                                        path.relative(base, src),
+                                    )
+                                    .replace(/\\/g, "/")
                                 ];
                             switch (strategy) {
                                 case "lazy": {
@@ -352,7 +352,7 @@ class TencentCosCommand extends BaseCommand {
                             });
                             cos.uploadFiles({
                                 files: files,
-                                onProgress: (_progressInfo) => {},
+                                onProgress: (_progressInfo) => { },
                                 onFileFinish: (err, _data) => {
                                     if (err) {
                                         setCache(

package/commands/tinify.js

@@ -1,9 +1,10 @@
 const { BaseCommand } = require("./base");
 const tinify = require("tinify");
 const Jimp = require("jimp");
-const { get_fst_file, get_full_path } = require('../utils/file_tool');
+const { get_fst_file } = require('../utils/file_tool');
 const { dirname } = require('node:path');
 const fs = require('node:fs');
+const { get_full_path, format_bytes } = require('../utils/transform_tool');
 
 class TinifyCommand extends BaseCommand {
     async execute() {
@@ -11,6 +12,9 @@ class TinifyCommand extends BaseCommand {
         tinify.key = data.api_key;
         const src = get_fst_file(data.src);
         const dstFile = get_full_path(data.dst, "FILE");
+        // 获取压缩前的文件大小
+        const srcStat = fs.statSync(src);
+        const srcSize = srcStat.size;
         fs.copyFileSync(src, dstFile);
         const dstDir = dirname(dstFile);
         if (!fs.existsSync(dstDir)) {
@@ -37,8 +41,25 @@ class TinifyCommand extends BaseCommand {
         }
         await tinifyData.toFile(dstFile);
         const compressionCount = tinify.compressionCount;
+        const dst = get_full_path(data.dst, "FILE");
+        const dstStat = fs.statSync(dst);
+        const dstSize = dstStat.size;
+        const sizeChanged = dstSize - srcSize;
+        const srcSizeFormated = format_bytes(srcSize);
+        const dstSizeFormated = format_bytes(dstSize);
+        const sizeRatioChanged = (1 - dstSize / srcSize);
+        const sizeRatioChangedFormated = `${(sizeRatioChanged * 100 * -1).toFixed(2)}%`;
+        const sizeChangedFormated = format_bytes(sizeChanged);
         return {
             compressionCount,
+            srcSize,
+            srcSizeFormated,
+            dstSize,
+            dstSizeFormated,
+            sizeRatioChanged,
+            sizeRatioChangedFormated,
+            sizeChanged,
+            sizeChangedFormated,
         };
     }
 

package/commands/unzip.js

@@ -1,14 +1,13 @@
 const {
     read_plain,
     get_fst_file,
-    get_full_path,
-    format_bytes,
 } = require("../utils/file_tool");
 const { BaseCommand } = require("./base");
 const fs = require("node:fs");
 const il = require("iconv-lite");
 const path = require("node:path");
 const display_tool = require("../utils/display_tool");
+const { format_bytes, get_full_path } = require('../utils/transform_tool');
 
 class UnzipCommand extends BaseCommand {
     async execute() {

package/commands/watch.js

@@ -1,6 +1,6 @@
 const { watch } = require('node:fs');
 const { BaseCommand } = require("./base");
-const { get_full_path } = require('./share_data');
+const { get_full_path } = require('../utils/transform_tool');
 const { throttle } = require('../utils/func_tool');
 
 class WatchCommand extends BaseCommand {

package/commands/write_cfg.js

@@ -1,11 +1,13 @@
-const { write_with_type } = require("../utils/file_tool");
+const { write_with_type, get_fst_file } = require("../utils/file_tool");
+const { get_full_path } = require('../utils/transform_tool');
 const { BaseCommand } = require("./base");
 
 class WriteCfgCommand extends BaseCommand {
     async execute() {
         const data = this.selfData;
         const content = this.content;
-        await write_with_type(content, data.dst, data.type, data.options);
+        const dst = get_fst_file(data.dst) || get_full_path(data.dst);
+        await write_with_type(content, dst, data.type, data.options);
     }
 
     getRequireContent() {

package/commands/write_clipboard.js

@@ -14,6 +14,7 @@ class WriteClipboard extends BaseCommand {
         } catch (_error) {
             warn("写入剪切板失败");
         }
+        return content;
     }
 
     getRequireContent() {

package/commands/write_excel.js

@@ -1,4 +1,5 @@
-const { get_fst_file, get_full_path } = require("../utils/file_tool");
+const { get_fst_file } = require("../utils/file_tool");
+const { get_full_path } = require('../utils/transform_tool');
 const { BaseCommand } = require("./base");
 
 class WriteExcelCommand extends BaseCommand {

package/commands/zip.js

@@ -3,9 +3,9 @@ const path = require("node:path");
 const {
     get_file_list,
     get_fst_file,
-    get_full_path,
     processRename,
 } = require("../utils/file_tool");
+const { get_full_path } = require('../utils/transform_tool');
 const fs = require("node:fs");
 const { progress } = require("../utils/display_tool");
 const { Alignment, alignStr } = require("../utils/transform_tool");

package/commands/zip_data.js

@@ -1,11 +1,9 @@
 const { BaseCommand } = require("./base");
 const _path = require("node:path");
 const {
-    get_file_list,
-    get_fst_file,
-    get_full_path,
     processRename,
 } = require("../utils/file_tool");
+const { get_full_path } = require('../utils/transform_tool');
 const _fs = require("node:fs");
 const { progress } = require("../utils/display_tool");
 const { Alignment, alignStr } = require("../utils/transform_tool");

package/commands/zip_folder.js

@@ -1,6 +1,7 @@
 const { BaseCommand } = require("./base");
 const path = require("node:path");
-const { get_fst_file, get_full_path } = require("../utils/file_tool");
+const { get_fst_file } = require("../utils/file_tool");
+const { get_full_path } = require('../utils/transform_tool');
 const { info } = require("../utils/log_tool");
 const { progress } = require("../utils/display_tool");
 const { eval_code } = require("./share_data");
@@ -13,16 +14,16 @@ class ZipFolderCommand extends BaseCommand {
         const isAccept = data.filter
             ? eval_code(data.filter)
             : (filename) => {
-                  // 排除以 . 开头的文件、目录
-                  if (
-                      filename
-                          .split(path.sep)
-                          .some((part) => part.startsWith("."))
-                  ) {
-                      return false;
-                  }
-                  return true;
-              };
+                // 排除以 . 开头的文件、目录
+                if (
+                    filename
+                        .split(path.sep)
+                        .some((part) => part.startsWith("."))
+                ) {
+                    return false;
+                }
+                return true;
+            };
         // creating archives
         var zip = new AdmZip();
         let i = 0;

package/index.js

@@ -9,10 +9,10 @@ require("dotenv").config({
 
 // 禁用其他打印
 console.yzplog = console.log;
-console.log = () => {};
-console.warn = () => {};
-console.info = () => {};
-console.error = () => {};
+console.log = () => { };
+console.warn = () => { };
+console.info = () => { };
+console.error = () => { };
 
 const mgr = require("./commands/mgr");
 const {
@@ -66,7 +66,7 @@ async function MainProcess() {
     let lastError = null;
     const cfgs = await getCfgs();
     // 缓存Key考虑cfgs,  argv
-    const hashSource = [cfgs, JSON.stringify(argv)].join("&&&");
+    const hashSource = [cfgs, JSON.stringify(argv), process.cwd()].join("&&&");
     const cfgHash = hash(hashSource).toString();
     const enableTimer = argv.ENABLE_TIMER;
     const timerInterval = argv.TIMER_INTERVAL || 1000;
@@ -85,14 +85,14 @@ async function MainProcess() {
                     )}] 任务已运行 ${formatTimeInMillisec(
                         elapsedTime,
                         "hh:mm:ss",
-                    )} ${clear_line_end}`,
+                    )} (当前:${mgr.globalData.currentTitle}) ${clear_line_end}`,
                     "",
                 );
             } else {
                 const _estimateLeft = Math.max(0, estimateTime - elapsedTime);
                 // info(`\r[${formatTimestampMillisec(Date.now())}] 任务已运行 ${formatTimeInMillisec(elapsedTime, "hh:mm:ss")}, 预计剩余 ${formatTimeInMillisec(estimateLeft, "hh:mm:ss")} ${clear_line_end}`, "");
                 progress(elapsedTime, estimateTime, {
-                    desc: "预计耗时",
+                    desc: `预计耗时 (当前:${mgr.globalData.currentTitle})`,
                     format_time: true,
                     color: _estimateLeft > 0 ? "reset" : "red",
                 });
@@ -154,13 +154,13 @@ async function MainProcess() {
         var [lastCommand, lastCommandFormated] = getLastCommand();
         error2(
             "File:\n" +
-                getLastExecFile() +
-                "\nRaw:\n" +
-                lastCommand +
-                "\nFormated:\n" +
-                JSON.stringify(lastCommandFormated, null, 4) +
-                "\n" +
-                lastError,
+            getLastExecFile() +
+            "\nRaw:\n" +
+            lastCommand +
+            "\nFormated:\n" +
+            JSON.stringify(lastCommandFormated, null, 4) +
+            "\n" +
+            lastError,
         );
     }
     if (shareData.ALERT_RESULT) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-automator",
-    "version": "1.4.31",
+    "version": "1.4.32",
     "description": "Execute automation with yaml configuration(compatible with json)",
     "main": "index.js",
     "repository": {
@@ -34,10 +34,12 @@
         "dotenv": "^16.1.4",
         "emailjs": "^4.0.2",
         "exceljs": "^4.3.0",
+        "fontmin": "^1.1.1",
         "ftp": "^0.3.10",
         "glob": "^7.1.6",
         "html-to-text": "^8.2.0",
         "iconv-lite": "^0.6.2",
+        "ignore-walk": "^8.0.0",
         "image-size": "^1.0.0",
         "imagemin": "^9.0.1",
         "imagemin-mozjpeg": "^10.0.0",

package/utils/file_tool.js

@@ -1,6 +1,7 @@
 const glob = require("glob");
 const path = require("node:path");
 const fs = require("node:fs");
+const os = require("node:os");
 const display_tool = require("./display_tool");
 const { info, whisper, warn, setLastError } = require("../utils/log_tool");
 const tmps = {
@@ -9,10 +10,12 @@ const tmps = {
 const iconv = require("iconv-lite");
 // const chardet = require("jschardet");
 const chardet = require("chardet");
-const { get_full_path } = require("../commands/share_data");
 const { parse, stringify } = require("./parse_tool");
 const { hash } = require("./hash_tool");
-const { formatDate } = require("./transform_tool");
+const { formatDate, format_bytes, get_full_path } = require("./transform_tool");
+
+
+
 /**
  *
  * @param {Array | string} src
@@ -58,38 +61,16 @@ function get_file_size(src) {
 function get_files_size(files) {
     return files.reduce((prev, file) => {
         const stat = fs.statSync(file);
+        if (stat.isDirectory()) {
+            // 获取所有子文件
+            const childFiles = get_file_list(file + "\\**\\*", undefined, true);
+            // 递归计算子文件大小
+            prev += get_files_size(childFiles);
+        }
         return (stat.size += prev);
     }, 0);
 }
 
-function format_bytes(size) {
-    if (size < 2 ** 10) {
-        return `${size}B`;
-    }
-    if (size < 2 ** 20) {
-        return `${+(size / 2 ** 10).toFixed(2)}KB`;
-    }
-    if (size < 2 ** 30) {
-        return `${+(size / 2 ** 20).toFixed(2)}MB`;
-    }
-    if (size < 2 ** 40) {
-        return `${+(size / 2 ** 30).toFixed(2)}GB`;
-    }
-    if (size < 2 ** 50) {
-        return `${+(size / 2 ** 40).toFixed(2)}TB`;
-    }
-    if (size < 2 ** 60) {
-        return `${+(size / 2 ** 50).toFixed(2)}PB`;
-    }
-    if (size < 2 ** 70) {
-        return `${+(size / 2 ** 60).toFixed(2)}EB`;
-    }
-    if (size < 2 ** 80) {
-        return `${+(size / 2 ** 70).toFixed(2)}ZB`;
-    }
-    return `${+(size / 2 ** 80).toFixed(2)}YB`;
-}
-
 function read_plain(src, options) {
     try {
         const fst_src = get_fst_file(src);
@@ -577,7 +558,6 @@ async function remove(src, options) {
 module.exports = {
     get_file_list,
     get_fst_file,
-    get_full_path,
     read_cfg,
     read_plain,
     write_plain,
@@ -590,6 +570,5 @@ module.exports = {
     move_local,
     get_file_size,
     get_files_size,
-    format_bytes,
     processRename,
 };

package/utils/request_tool.js

@@ -1,4 +1,4 @@
-const { get_full_path, remove } = require("./file_tool");
+const { get_full_path } = require('../utils/transform_tool');
 const transform_tool = require("./transform_tool");
 const { warn, info, log, setLastError } = require("./log_tool");
 const { progress } = require("./display_tool");

package/utils/scm_tool.js

@@ -3,7 +3,8 @@ const { vital, log, warn } = require("./log_tool");
 const { exec_shell } = require("./shell_tool");
 const path = require("node:path");
 const fs = require("node:fs");
-const { copy, get_fst_file, get_full_path } = require("./file_tool");
+const { copy, get_fst_file } = require("./file_tool");
+const { get_full_path } = require('../utils/transform_tool');
 
 async function svn_is_dirty(cwd) {
     return await exec_shell(