node-automator 1.4.21 → 1.4.23

package/commands/mgr.js

@@ -122,6 +122,7 @@ const { Word2txtCommand } = require('./word2txt');
 const { ObfuscateCommand } = require('./obfuscate');
 const { SplitFileCommand } = require('./split_file');
 const { MergeFileCommand } = require('./merge_file');
+const { ZipFolderCommand } = require('./zip_folder');
 
 const globalData = {
     "executed_cfg": [], // 执行过的配置文件
@@ -487,6 +488,7 @@ function init() {
     register("obfuscate", ObfuscateCommand, false);
     register("split_file", SplitFileCommand, false);
     register("merge_file", MergeFileCommand, false);
+    register("zip_folder", ZipFolderCommand, false);
 }
 
 module.exports = {

package/commands/zip_folder.js

@@ -0,0 +1,56 @@
+const { BaseCommand } = require("./base");
+const path = require("path");
+const { get_fst_file, get_full_path } = require("../utils/file_tool");
+const { info } = require("../utils/log_tool");
+const { progress } = require("../utils/display_tool");
+const { eval_code } = require("./share_data");
+
+class ZipFolderCommand extends BaseCommand {
+  async execute() {
+    const AdmZip = require("adm-zip");
+    let data = this.selfData;
+    let folder = get_fst_file(data.src);
+    const isAccept = data.filter
+      ? eval_code(data.filter)
+      : (filename) => {
+          // 排除以 . 开头的文件、目录
+          if (filename.split(path.sep).some((part) => part.startsWith("."))) {
+            return false;
+          }
+          return true;
+        };
+    // creating archives
+    var zip = new AdmZip();
+    let i = 0;
+    zip.addLocalFolder(folder, "", (filename) => {
+      if (!isAccept(filename)) {
+        return false;
+      }
+      progress(i++, 0, {
+        desc: `${filename}`,
+        depth: 0,
+        align: true,
+      });
+      return true;
+    });
+    // or write everything to disk
+    if (data.dst) {
+      let dst = get_full_path(data.dst);
+      await new Promise((resolve) => {
+        zip.writeZip(dst, (err) => {
+          if (err) {
+            throw err;
+          }
+          resolve();
+        });
+      });
+    } else {
+      let buffer = zip.toBuffer();
+      return buffer;
+    }
+  }
+}
+
+module.exports = {
+  ZipFolderCommand,
+};

package/index.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 // 控制台文本颜色
 const path = require("path");
-require("colors");
 const {
     argv,
 } = require('yargs');

package/package.json

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

package/utils/display_tool.js

@@ -3,6 +3,7 @@ const { stdout_columns, clear_line_end, shareData } = require("../commands/share
 const { clearLine } = require("./interaction_tool");
 const { omit, omit_offset, write } = require("./log_tool");
 const { alignNumber, formatByteSize, alignStr, Alignment } = require("./transform_tool");
+require("colors");
 
 const color_cfg = [
     "cyan",

package/utils/interaction_tool.js

@@ -209,10 +209,9 @@ function showOptions(viewOptions, filteredViewOptions, selectedIndices, focusedI
         // 清空本行
         clearLine();
         let preview = omit_offset(viewOptionStr, 2);
-        if (searchChars) {
-            preview = preview.replaceAll(searchChars, searchChars["red"]);
-        }
-        write(`${indicator}${preview[optionColor]}`);
+        const previewParts = preview.split(searchChars);
+        preview = previewParts.map(v => v[optionColor]).join(searchChars["bold"]);
+        write(`${indicator}${preview}`);
         write('\n');
     }
     write(`${begIndex + numShow >= filteredViewOptions.length ? "" : "▼"['magenta']}${clear_line_end}\n`);

package/utils/log_tool.js

@@ -1,5 +1,6 @@
 const { stdout_columns } = require("../commands/share_data");
 const { json_compacted, formatTimestampMillisec } = require('./transform_tool');
+require("colors");
 
 const colors = [
 	"gray",