gabehf
/
Tdarr_Plugins
mirror of https://github.com/gabehf/Tdarr_Plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kill_thread' of https://github.com/HaveAGitGat/Tdarr_Plugins into kill_thread

Browse Source
make-only-subtitle-default
HaveAGitGat 2 years ago
parent 5f5d3c1b04 40ed93c89b
commit c2dc62afce
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File

25
FlowPlugins/FlowHelpers/1.0.0/cliUtils.js
Unescape View File

@ -248,7 +248,7 @@ var CLI = /** @class */ (function () {
}); });
}; };
this.runCli = function () { return __awaiter(_this, void 0, void 0, function () { this.runCli = function () { return __awaiter(_this, void 0, void 0, function () {
var childProcess, errorLogFull, cliExitCode; var childProcess, errorLogFull, thread, cliExitCode;
var _this = this; var _this = this;
return __generator(this, function (_a) { return __generator(this, function (_a) {
switch (_a.label) { switch (_a.label) {
@ -256,16 +256,12 @@ var CLI = /** @class */ (function () {
childProcess = require('child_process'); childProcess = require('child_process');
errorLogFull = []; errorLogFull = [];
this.config.jobLog("Running ".concat(this.config.cli, " ").concat(this.config.spawnArgs.join(' '))); this.config.jobLog("Running ".concat(this.config.cli, " ").concat(this.config.spawnArgs.join(' ')));
return [4 /*yield*/, new Promise(function (resolve) {
try {
var opts = _this.config.spawnOpts || {};
var spawnArgs = _this.config.spawnArgs.map(function (row) { return row.trim(); }).filter(function (row) { return row !== ''; });
var thread_1 = childProcess.spawn(_this.config.cli, spawnArgs, opts);
process.on('exit', function () { process.on('exit', function () {
if (thread) {
try { try {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log('Main thread exiting, cleaning up running CLI'); console.log('Main thread exiting, cleaning up running CLI');
_this.killThread(thread_1); _this.killThread(thread);
} }
catch (err) { catch (err) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
@ -273,17 +269,23 @@ var CLI = /** @class */ (function () {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log(err); console.log(err);
} }
}
}); });
thread_1.stdout.on('data', function (data) { return [4 /*yield*/, new Promise(function (resolve) {
try {
var opts = _this.config.spawnOpts || {};
var spawnArgs = _this.config.spawnArgs.map(function (row) { return row.trim(); }).filter(function (row) { return row !== ''; });
thread = childProcess.spawn(_this.config.cli, spawnArgs, opts);
thread.stdout.on('data', function (data) {
errorLogFull.push(data.toString()); errorLogFull.push(data.toString());
_this.parseOutput(data); _this.parseOutput(data);
}); });
thread_1.stderr.on('data', function (data) { thread.stderr.on('data', function (data) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
errorLogFull.push(data.toString()); errorLogFull.push(data.toString());
_this.parseOutput(data); _this.parseOutput(data);
}); });
thread_1.on('error', function () { thread.on('error', function () {
// catches execution error (bad file) // catches execution error (bad file)
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log(1, "Error executing binary: ".concat(_this.config.cli)); console.log(1, "Error executing binary: ".concat(_this.config.cli));
@ -291,7 +293,7 @@ var CLI = /** @class */ (function () {
}); });
// thread.stdout.pipe(process.stdout); // thread.stdout.pipe(process.stdout);
// thread.stderr.pipe(process.stderr); // thread.stderr.pipe(process.stderr);
thread_1.on('close', function (code) { thread.on('close', function (code) {
if (code !== 0) { if (code !== 0) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.log(code, 'CLI error'); console.log(code, 'CLI error');
@ -308,6 +310,7 @@ var CLI = /** @class */ (function () {
})]; })];
case 1: case 1:
cliExitCode = _a.sent(); cliExitCode = _a.sent();
thread = undefined;
if (!this.config.logFullCliOutput) { if (!this.config.logFullCliOutput) {
this.config.jobLog(errorLogFull.slice(-1000).join('')); this.config.jobLog(errorLogFull.slice(-1000).join(''));
} }

Write Preview
Loading…
Cancel
Save