node-automator 1.4.0 → 1.4.2

package/commands/backup.js

@@ -11,7 +11,8 @@ const {
 } = require('../utils/log_tool');
 const {
     parse,
-    stringify
+    stringify,
+    processRename
 } = require('../utils/file_tool');
 
 class BackupCommand extends BaseCommand {
@@ -30,7 +31,9 @@ class BackupCommand extends BaseCommand {
                 sourceType,
                 backupFormat,
                 backupFilename,
-                backupEncoding
+                backupRename,
+                backupEncoding,
+                backupPrettify,
             } = bakCfg;
             const filepath = path.join(sourceFolder, filename);
             let backupPath = path.join(backupFolder, backupFilename || filename);
@@ -50,6 +53,13 @@ class BackupCommand extends BaseCommand {
             if (backupFormat) {
                 backupData = await stringify(backupData, backupFormat);
             }
+            if (backupPrettify) {
+                backupData = await parse(backupData, backupPrettify.from);
+                backupData = await stringify(backupData, backupPrettify.to);
+            }
+            if (backupRename) {
+                backupPath = processRename(backupPath, backupRename, backupData);
+            }
             const backupDir = path.dirname(backupPath);
             // 创建目录
             if (!fs.existsSync(backupDir)) {
@@ -89,7 +99,7 @@ class BackupCommand extends BaseCommand {
                     });
                     if (bakCfg) {
                         backup(bakCfg, filename).then(() => {
-                                !quiet && success(`${filename} 备份成功`);
+                                !(quiet || bakCfg.quiet) && success(`${filename} 备份成功`);
                             })
                             .catch(err => {
                                 error(`${filename} 备份异常 ${err}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-automator",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Execute automation with yaml configuration(compatible with json)",
   "main": "index.js",
   "repository": {

package/utils/file_tool.js

@@ -16,6 +16,8 @@ const iconv = require('iconv-lite');
 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');
 /**
  * 
  * @param {Array | string} src 
@@ -213,7 +215,7 @@ async function read_cfg(src, type, options) {
     return parse(content, type, options);
 }
 
-function processRename(fullpath, params) {
+function processRename(fullpath, params, content) {
     if (!params) return fullpath;
     let dirname = path.dirname(fullpath);
     switch (typeof params) {
@@ -244,6 +246,8 @@ function processRename(fullpath, params) {
             if (params.dir_suffix) dirname = dirname + params.dir_suffix;
             if (params.base_prefix) basename = params.base_prefix + basename;
             if (params.base_suffix) basename = basename + params.base_suffix;
+            if (params.hash_suffix) basename = basename + "." + hash(content).substring(0, 8);
+            if (params.time_suffix) basename = basename + "." + formatDate(new Date(), "YYYYMMDDhhmmss");
             return path.join(dirname, basename + extname);
         }
     }
@@ -289,7 +293,7 @@ async function copy(src, dst, base, options) {
             } else {
                 dstFile = path.join(dst, path.relative(base, src));
             }
-            dstFile = processRename(dstFile, options.rename);
+            dstFile = processRename(dstFile, options.rename, fs.readFileSync(src));
             let dstDir = path.dirname(dstFile);
             if (!fs.existsSync(dstDir) || !fs.lstatSync(dstDir).isDirectory()) {
                 try {