node-automator 1.3.0 → 1.3.2

package/commands/ali_oss.js

@@ -60,7 +60,7 @@ class AliOssCommand extends BaseCommand {
                     let dst = this.selfData.dst;
                     let src = get_full_path(this.selfData.src);
                     info("");
-                    info(`开始上传 ${src} 到 ${dst}`);
+                    info(`开始上传 ${path.basename(src)} 到 ${dst}`);
                     client.put(dst, src).then((result) => {
                         resolve(result);
                     })
@@ -82,18 +82,17 @@ class AliOssCommand extends BaseCommand {
                             let dst = path.join(dst_folder, path.relative(base, src)).replace(/\\/g, "/")
                             return client.put.bind(client, dst, src);
                         });
-                        queueAsync(tasks, concurrency, (done, total) => {
+                        queueAsync(tasks, concurrency, (done, total, index, indexDone) => {
                             progress(done, total, {
-                                desc: "上传中...",
+                                desc: path.relative(base, srcs[index]) + (indexDone ? "上传中..." : "上传成功!"),
                                 depth: 0,
-                                color: "gray",
                             });
                         }).then((result) => {
                             var retrySrcs = [];
                             for(var i = 0; i < result.length; i++) {
                                 if (result[i].err) {
                                     retrySrcs.push(srcs[i]);
-                                    warner(`上传文件 ${srcs[i]} 失败: ${result[i].err}`);
+                                    warn(`上传文件 ${path.relative(base, srcs[i])} 失败: ${result[i].err}`);
                                 }
                             }
                             if (retrySrcs.length > 0) {

package/commands/share_data.js

@@ -521,6 +521,9 @@ function processPipe(val, pipename, pipeargs) {
                 val = val.map( v => processPipe(v, pipename, pipeargs));
             } else {
                 switch(pipename) {
+                    case "ctime": {
+                        return fs.statSync(val).ctimeMs;
+                    }
                     case "path": {
                         val = get_full_path(val);
                         break;

package/index.js

@@ -11,6 +11,7 @@ require('dotenv').config({
 });
 
 // 禁用其他打印
+console.yzplog = console.log;
 console.log = () => {};
 console.warn = () => {};
 console.info = () => {};

package/package.json

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

package/utils/func_tool.js

@@ -67,9 +67,8 @@ function queueAsync(tasks, limit, onProgress) {
         if (!tasks.length) resolve(result);
         var index = 0;
         var numDone = 0;
-        onProgress && onProgress(numDone, tasks.length);
-        function checkDone() {
-            onProgress && onProgress(numDone, tasks.length);
+        function checkDone(doneIndex) {
+            onProgress && onProgress(numDone, tasks.length, doneIndex, true);
             if (numDone == tasks.length) {
                 resolve(result);
                 return;
@@ -79,19 +78,21 @@ function queueAsync(tasks, limit, onProgress) {
             }
         };
         function _run() {
-            const task = tasks[index++];
+            const currIndex = index++;
+            const task = tasks[currIndex];
+            onProgress && onProgress(numDone, tasks.length, currIndex, false);
             task().then(function (val) {
                 numDone++;
                 result.push({
                     val,
                 });
-                checkDone();
+                checkDone(currIndex);
             }).catch(function (err) {
                 numDone++;
                 result.push({
                     err,
                 });
-                checkDone();
+                checkDone(currIndex);
             });
         }
         for(var i = 0; i < tasks.length && i < limit; i++) {

package/utils/selection_tool.js

@@ -583,7 +583,7 @@ async function multiSelect(content, data) {
       onKeyPress(undefined, { name: "return" });
     }
   });
-  success(`已选择:${getPrint(selectedOptions, true)}`);
+  !data.quiet && success(`已选择:${getPrint(selectedOptions, true)}`);
   return selectedOptions;
 }