From 90a0882c59d77b1994100174d82f5f110c2fd4f5 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Fri, 1 Mar 2019 15:10:01 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/core/BookConverter/index.js | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/server/core/BookConverter/index.js b/server/core/BookConverter/index.js index 6f680324..201dc119 100644 --- a/server/core/BookConverter/index.js +++ b/server/core/BookConverter/index.js @@ -26,13 +26,6 @@ class BookConverter { const selectedFileType = await this.detector.detectFile(inputFiles.selectedFile); const data = await fs.readFile(inputFiles.selectedFile); - let selectedFileType2 = null; - let data2 = null; - if (inputFiles.nesting) { - selectedFileType2 = await this.detector.detectFile(inputFiles.nesting.selectedFile); - data2 = await fs.readFile(inputFiles.nesting.selectedFile); - } - let result = false; for (const convert of this.convertFactory) { result = await convert.run(data, {inputFiles, url, callback, dataType: selectedFileType}); @@ -40,14 +33,10 @@ class BookConverter { await fs.writeFile(outputFile, result); break; } + } - if (inputFiles.nesting) { - result = await convert.run(data2, {inputFiles: inputFiles.nesting, url, callback, dataType: selectedFileType2}); - if (result) { - await fs.writeFile(outputFile, result); - break; - } - } + if (!result && inputFiles.nesting) { + result = await this.convertToFb2(inputFiles.nesting, outputFile, url, callback); } if (!result) { @@ -59,6 +48,7 @@ class BookConverter { } callback(100); + return result; } }