Merge branch 'release/0.8.3-2'

0.8.3-1

server/core/Reader/BookConverter/ConvertBase.js

@@ -34,6 +34,8 @@ class ConvertBase {
     }
 
     async execConverter(path, args, onData, abort) {
+        onData = (onData ? onData : () => {});
+        
         let q = null;
         try {
             q = await queue.get(() => {onData();});
@@ -42,7 +44,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')

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], () => {
+        await this.execConverter(this.calibrePath, [docxFile, fb2File, '-vv'], () => {
-            perc = (perc < 100 ? perc + 5 : 50);
+            perc = (perc < 100 ? perc + 1 : 50);
             callback(perc);
         }, abort);
 

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], () => {
+        await this.execConverter(this.calibrePath, [epubFile, fb2File, '-vv'], () => {
-            perc = (perc < 100 ? perc + 5 : 50);
+            perc = (perc < 100 ? perc + 1 : 50);
             callback(perc);
         }, abort);
 

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], () => {
+        await this.execConverter(this.calibrePath, [mobiFile, fb2File, '-vv'], () => {
-            perc = (perc < 100 ? perc + 5 : 50);
+            perc = (perc < 100 ? perc + 1 : 50);
             callback(perc);
         }, abort);