node-automator 1.4.1 → 1.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/commands/backup.js +6 -1
- package/commands/exec_from_file.js +6 -3
- package/package.json +1 -1
package/commands/backup.js
CHANGED
|
@@ -32,7 +32,8 @@ class BackupCommand extends BaseCommand {
|
|
|
32
32
|
backupFormat,
|
|
33
33
|
backupFilename,
|
|
34
34
|
backupRename,
|
|
35
|
-
backupEncoding
|
|
35
|
+
backupEncoding,
|
|
36
|
+
backupPrettify,
|
|
36
37
|
} = bakCfg;
|
|
37
38
|
const filepath = path.join(sourceFolder, filename);
|
|
38
39
|
let backupPath = path.join(backupFolder, backupFilename || filename);
|
|
@@ -52,6 +53,10 @@ class BackupCommand extends BaseCommand {
|
|
|
52
53
|
if (backupFormat) {
|
|
53
54
|
backupData = await stringify(backupData, backupFormat);
|
|
54
55
|
}
|
|
56
|
+
if (backupPrettify) {
|
|
57
|
+
backupData = await parse(backupData, backupPrettify.from);
|
|
58
|
+
backupData = await stringify(backupData, backupPrettify.to);
|
|
59
|
+
}
|
|
55
60
|
if (backupRename) {
|
|
56
61
|
backupPath = processRename(backupPath, backupRename, backupData);
|
|
57
62
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const { get_file_list, read_cfg, get_fst_file } = require("../utils/file_tool");
|
|
2
|
-
const { whisper, info, warn, success, vital, setLastExecFile } = require("../utils/log_tool");
|
|
2
|
+
const { whisper, info, warn, success, vital, setLastExecFile, getLastError } = require("../utils/log_tool");
|
|
3
3
|
const { parse } = require('../utils/parse_tool');
|
|
4
4
|
const { doRequest } = require('../utils/request_tool');
|
|
5
5
|
const { toArray } = require("../utils/transform_tool");
|
|
@@ -8,7 +8,6 @@ const { BaseCommand } = require("./base");
|
|
|
8
8
|
class ExecFromFileCommand extends BaseCommand {
|
|
9
9
|
async execute() {
|
|
10
10
|
let data = this.selfData;
|
|
11
|
-
let content = this.content;
|
|
12
11
|
let srcs = toArray(data.src);
|
|
13
12
|
for (let i = 0; i < srcs.length; i++) {
|
|
14
13
|
let src = srcs[i];
|
|
@@ -28,7 +27,11 @@ class ExecFromFileCommand extends BaseCommand {
|
|
|
28
27
|
setLastExecFile(src);
|
|
29
28
|
let cfg;
|
|
30
29
|
if (isRemote) {
|
|
31
|
-
|
|
30
|
+
let content = await doRequest({src, quiet: true});
|
|
31
|
+
if (getLastError()) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
cfg = await parse(content, "yml");
|
|
32
35
|
} else {
|
|
33
36
|
cfg = await read_cfg(src, data.type);
|
|
34
37
|
}
|