node-automator 1.4.20 → 1.4.22

package/commands/split_file.js

@@ -8,9 +8,9 @@ class SplitFileCommand extends BaseCommand {
         let { src, maxSize, numParts, dst } = this.selfData;
         src = get_fst_file(src);
         dst = get_full_path(dst, "FOLDER");
-        maxSize = getByteSize(maxSize);
         const names = await new Promise((resolve, reject) => {
             if (maxSize) {
+                maxSize = getByteSize(maxSize);
                 splitFile.splitFileBySize(src, maxSize, dst)
                     .then((names) => {
                         resolve(names);

package/package.json

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

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/transform_tool.js

@@ -32,8 +32,8 @@ function removeDuplicate(value, options) {
         value = value.map(v => {
             let raw = typeof v === "string" ? v : JSON.stringify(v);
             let repeat = seen[duplicate_map[raw]] || 0;
-            let prefix = options.remove_duplicate_prefix && format(options.remove_duplicate_prefix, {repeat}) || "";
-            let suffix = options.remove_duplicate_suffix && format(options.remove_duplicate_suffix, {repeat}) || "";
+            let prefix = options.remove_duplicate_prefix && format(options.remove_duplicate_prefix, { repeat }) || "";
+            let suffix = options.remove_duplicate_suffix && format(options.remove_duplicate_suffix, { repeat }) || "";
             return prefix + v + suffix;
         });
     }
@@ -274,8 +274,8 @@ function formatByValues(values, fmt, prefix) {
     });
 }
 
-const dayInWeeks = [ "日","一","二","三","四","五","六" ];
-const fullDayInWeeks = [ "星期日","星期一","星期二","星期三","星期四","星期五","星期六" ];
+const dayInWeeks = ["日", "一", "二", "三", "四", "五", "六"];
+const fullDayInWeeks = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
 /**
  * 格式化日期
  * @param {Date} date 
@@ -417,7 +417,7 @@ function alignNumber(from, to, options) {
  * @param { {alignment: Alignment, paddingChar: string} } options
  */
 function alignStr(from, toNum, options) {
-    options = Object.assign({alignment: Alignment.RIGHT, paddingChar: " "}, options);
+    options = Object.assign({ alignment: Alignment.RIGHT, paddingChar: " " }, options);
     let prefixNum = 0;
     let suffixNum = 0;
     from = from.toString().substr(0, toNum);
@@ -436,7 +436,7 @@ function alignStr(from, toNum, options) {
             suffixNum = Math.floor(totalOffset / 2);
             break;
         }
-        case Alignment.RIGHT: 
+        case Alignment.RIGHT:
         default: {
             prefixNum = totalOffset;
             break;
@@ -482,11 +482,27 @@ function formatByteSize(bytes) {
     return (bytes / KB).toFixed(2) + " KB";
 }
 
+function getByteSize(formatedStr) {
+    formatedStr = formatedStr.toString().trim();
+    let bytes = 0;
+    if (formatedStr.match(/gb?$/i)) {
+        bytes = Number(formatedStr.replace(/gb?$/i, "")) * GB;
+    } else if (formatedStr.match(/mb?$/i)) {
+        bytes = Number(formatedStr.replace(/mb?$/i, "")) * MB;
+    } else if (formatedStr.match(/kb?$/i)) {
+        bytes = Number(formatedStr.replace(/kb?$/i, "")) * KB;
+    } else {
+        bytes = Number(formatedStr.replace(/b?$/i, ""));
+    }
+    return bytes;
+}
+
+
 /**
  * 
  * @param {string} key 
  */
- function getDataByKeySimple(key, from) {
+function getDataByKeySimple(key, from) {
     const subkeys = key.split(".");
     let val = from;
     for (const subkey of subkeys) {
@@ -517,4 +533,5 @@ module.exports = {
     escapeString,
     removeDuplicate,
     removeDuplicateObject,
+    getByteSize,
 };