diff --git a/server/core/Reader/BookConverter/ConvertBase.js b/server/core/Reader/BookConverter/ConvertBase.js index 11d07900..b2a5f712 100644 --- a/server/core/Reader/BookConverter/ConvertBase.js +++ b/server/core/Reader/BookConverter/ConvertBase.js @@ -42,7 +42,15 @@ class ConvertBase { } try { - const result = await utils.spawnProcess(path, {args, onData, abort}); + const result = await utils.spawnProcess(path, { + killAfter: 600, + args, + onData: (data) => { + q.resetTimeout(); + onData(data); + }, + abort + }); if (result.code != 0) { let error = result.code; if (this.config.branch == 'development') diff --git a/server/core/Reader/BookConverter/ConvertDocX.js b/server/core/Reader/BookConverter/ConvertDocX.js index 02b112c5..8be94ebd 100644 --- a/server/core/Reader/BookConverter/ConvertDocX.js +++ b/server/core/Reader/BookConverter/ConvertDocX.js @@ -22,8 +22,8 @@ class ConvertDocX extends ConvertBase { async convert(docxFile, fb2File, callback, abort) { let perc = 0; - await this.execConverter(this.calibrePath, [docxFile, fb2File], () => { - perc = (perc < 100 ? perc + 5 : 50); + await this.execConverter(this.calibrePath, [docxFile, fb2File, '-vv'], () => { + perc = (perc < 100 ? perc + 1 : 50); callback(perc); }, abort); diff --git a/server/core/Reader/BookConverter/ConvertEpub.js b/server/core/Reader/BookConverter/ConvertEpub.js index f0f9ba71..45c36d18 100644 --- a/server/core/Reader/BookConverter/ConvertEpub.js +++ b/server/core/Reader/BookConverter/ConvertEpub.js @@ -37,8 +37,8 @@ class ConvertEpub extends ConvertBase { await fs.copy(inputFiles.sourceFile, epubFile); let perc = 0; - await this.execConverter(this.calibrePath, [epubFile, fb2File], () => { - perc = (perc < 100 ? perc + 5 : 50); + await this.execConverter(this.calibrePath, [epubFile, fb2File, '-vv'], () => { + perc = (perc < 100 ? perc + 1 : 50); callback(perc); }, abort); diff --git a/server/core/Reader/BookConverter/ConvertMobi.js b/server/core/Reader/BookConverter/ConvertMobi.js index ee8535ef..4bae0ca7 100644 --- a/server/core/Reader/BookConverter/ConvertMobi.js +++ b/server/core/Reader/BookConverter/ConvertMobi.js @@ -25,8 +25,8 @@ class ConvertMobi extends ConvertBase { await fs.copy(inputFiles.sourceFile, mobiFile); let perc = 0; - await this.execConverter(this.calibrePath, [mobiFile, fb2File], () => { - perc = (perc < 100 ? perc + 5 : 50); + await this.execConverter(this.calibrePath, [mobiFile, fb2File, '-vv'], () => { + perc = (perc < 100 ? perc + 1 : 50); callback(perc); }, abort);