node-automator 1.4.7 → 1.4.8

package/commands/backup.js

@@ -7,8 +7,7 @@ const fs = require("fs");
 const path = require("path");
 const {
     success,
-    error,
-    warn
+    error
 } = require('../utils/log_tool');
 const {
     parse,
@@ -51,10 +50,6 @@ class BackupCommand extends BaseCommand {
                     backupData = backupData[key];
                 }
             }
-            if (backupData === undefined) {
-                warn(`未找到 ${filename} 的 ${sourceKeys} 字段`)
-                return;
-            }
             if (backupFormat) {
                 backupData = await stringify(backupData, backupFormat);
             }

package/commands/compress.js

@@ -10,7 +10,6 @@ class CompressCommand extends BaseCommand {
         const dst = get_full_path(data.dst, "FILE");
         const options = data.options || {};
         let image = await Jimp.read(src);
-        image.scale(options.scale || 1);
         image.quality(options.quality || 80);
         await image.writeAsync(dst);
     }

package/commands/mgr.js

@@ -118,7 +118,6 @@ const { DeobfuscateCommand } = require('./deobfuscate');
 const { AliOssCommand } = require('./ali_oss');
 const { BackupCommand } = require('./backup');
 const { CompressCommand } = require('./compress');
-const { Word2txtCommand } = require('./word2txt');
 
 const globalData = {
     "executed_cfg": [], // 执行过的配置文件
@@ -480,7 +479,6 @@ function init() {
     register("ali_oss", AliOssCommand, false);
     register("backup", BackupCommand, false);
     register("compress", CompressCommand, false);
-    register("word2txt", Word2txtCommand, false);
 }
 
 module.exports = {

package/commands/title.js

@@ -2,10 +2,13 @@ const { BaseCommand } = require("./base");
 class TitleCommand extends BaseCommand {
     async execute() {
       this.shareData.TITLE = this.content;
-      await this.forward("shell", {
-        cmd: ["title", this.content],
-        shell: true,
-      });
+      // 判断是否为 windows 系统
+      if (process.platform === "win32") {
+        await this.forward("shell", {
+          cmd: ["title", this.content],
+          shell: true,
+        });
+      }    
     }
 
     getRequireContent() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-automator",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "description": "Execute automation with yaml configuration(compatible with json)",
   "main": "index.js",
   "repository": {
@@ -41,7 +41,6 @@
     "log4js": "^6.3.0",
     "luaparse": "^0.3.1",
     "mail-watcher": "^0.6.1",
-    "mammoth": "^1.8.0",
     "markdown-table": "^2.0.0",
     "mysql": "^2.18.1",
     "node-localstorage": "^2.1.6",

package/utils/shell_tool.js

@@ -64,7 +64,6 @@ async function exec_shell(data) {
         let results = [];
         let errors = [];
         let encoding = data.encoding || "cp936";
-        let raw_output = encoding == "raw";
         !quiet && whisper(`cmd:[${cmd}] cwd:${data.cwd} inputs:${data.inputs}`);
         options.stdio = ["pipe", capture_stdout ? "pipe" : process.stdout, "pipe"];
         const child = child_process.spawn(cmd[0], cmd.slice(1), options);
@@ -72,7 +71,7 @@ async function exec_shell(data) {
             child.stdout.on("data", (chunk) => {
                 results.push(chunk);
                 if (instant_stdout) {
-                    warn(!raw_output ? iconv.decode(chunk, encoding) : chunk.toString());
+                    warn(iconv.decode(chunk, encoding));
                 }
             });
         }
@@ -99,7 +98,7 @@ async function exec_shell(data) {
         // child.on('close', code => {
         child.on('exit', code => {
             if (!data.ignore_code && code != 0) {
-                let errMsg = !raw_output ? iconv.decode(Buffer.concat(errors), encoding) : Buffer.concat(errors).toString();
+                let errMsg = iconv.decode(Buffer.concat(errors), encoding);
                 let isAcceptableErrors = errMsg && acceptableErrors.some(err => {
                     return errMsg.indexOf(err) >= 0;
                 });
@@ -108,7 +107,7 @@ async function exec_shell(data) {
                 }
             }
             if (results.length) {
-                let result = !raw_output ? iconv.decode(Buffer.concat(results), encoding) : Buffer.concat(results);
+                let result = iconv.decode(Buffer.concat(results), encoding);
                 if (data.trim) {
                     result = result.trim();
                 }

package/commands/word2txt.js

@@ -1,42 +0,0 @@
-const {
-    get_fst_file
-} = require('../utils/file_tool');
-const {
-    BaseCommand
-} = require("./base");
-const fs = require('fs');
-const mammoth = require('mammoth');
-
-class Word2txtCommand extends BaseCommand {
-    async execute() {
-        const data = this.selfData;
-        const wordFilePath = get_fst_file(data.src);
-        return new Promise((resolve, reject) => {
-            // 读取 Word 文件
-            fs.readFile(wordFilePath, (err, data) => {
-                if (err) {
-                    reject(err);
-                    return console.error("读取文件时出错:", err);
-                }
-
-                // 将 Word 文件转换为纯文本
-                mammoth.extractRawText({
-                        buffer: data
-                    })
-                    .then((result) => {
-                        const text = result.value; // 纯文本内容
-                        console.log("转换后的文本内容:", text);
-                        resolve(text);
-                    })
-                    .catch((err) => {
-                        console.error("转换过程中出错:", err);
-                        reject(err);
-                    });
-            });
-        })
-    }
-}
-
-module.exports = {
-    Word2txtCommand,
-};