From 07c85280cdb3e5958171e7b2c59d21beba7dbb4a Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 28 Jan 2020 21:27:54 +0700
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B0=D0=B9=D0=BC=D0=B0=D1=83=D1=82?=
 =?UTF-8?q?=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BE=D0=BD=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D1=82=D0=B5=D1=80=D0=B0=20calibre,=20=D0=B4=D0=BE=D0=B1?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D1=84=D0=BB=D0=B0=D0=B3=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0=20-vv,=20=D1=81?=
 =?UTF-8?q?=D0=BE=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D1=81=D1=82=D0=B2=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B2=D1=8B=D1=87=D0=B8=D1=81=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B5=D1=81?=
 =?UTF-8?q?=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/Reader/BookConverter/ConvertBase.js | 10 +++++++++-
 server/core/Reader/BookConverter/ConvertDocX.js |  4 ++--
 server/core/Reader/BookConverter/ConvertEpub.js |  4 ++--
 server/core/Reader/BookConverter/ConvertMobi.js |  4 ++--
 4 files changed, 15 insertions(+), 7 deletions(-)

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);