From 787821f64bee2eed398842b7b1dc1515aab9757c Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Fri, 1 Mar 2019 19:28:25 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/core/BookConverter/ConvertDocX.js | 4 ++-- server/core/BookConverter/ConvertEpub.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/core/BookConverter/ConvertDocX.js b/server/core/BookConverter/ConvertDocX.js index c411a444..17387459 100644 --- a/server/core/BookConverter/ConvertDocX.js +++ b/server/core/BookConverter/ConvertDocX.js @@ -6,12 +6,12 @@ const ConvertBase = require('./ConvertBase'); class ConvertDocX extends ConvertBase { check(data, opts) { const {inputFiles} = opts; - +console.log(inputFiles); if (this.config.useExternalBookConverter && inputFiles.sourceFileType && inputFiles.sourceFileType.ext == 'zip') { //ищем файл '[Content_Types].xml' for (const file of inputFiles.files) { - if (file == '[Content_Types].xml') { + if (file.path == '[Content_Types].xml') { return true; } } diff --git a/server/core/BookConverter/ConvertEpub.js b/server/core/BookConverter/ConvertEpub.js index 75745f41..79b25b8e 100644 --- a/server/core/BookConverter/ConvertEpub.js +++ b/server/core/BookConverter/ConvertEpub.js @@ -11,8 +11,8 @@ class ConvertEpub extends ConvertBase { inputFiles.sourceFileType && inputFiles.sourceFileType.ext == 'zip') { //ищем файл 'mimetype' for (const file of inputFiles.files) { - if (file == 'mimetype') { - const mt = await fs.readFile(`${inputFiles.filesDir}/${file}`); + if (file.path == 'mimetype') { + const mt = await fs.readFile(`${inputFiles.filesDir}/${file.path}`); if (mt.toString().trim() == 'application/epub+zip') return true; break;