From e25375fb7a95cdaaddd778ecc3623af47154ae75 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sat, 5 Dec 2020 00:31:53 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=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/Reader/BookConverter/ConvertPdf.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/server/core/Reader/BookConverter/ConvertPdf.js b/server/core/Reader/BookConverter/ConvertPdf.js index 265f3041..69639860 100644 --- a/server/core/Reader/BookConverter/ConvertPdf.js +++ b/server/core/Reader/BookConverter/ConvertPdf.js @@ -14,15 +14,14 @@ class ConvertPdf extends ConvertHtml { } async run(notUsed, opts) { - if (!opts.skipCheck) { - if (!this.check(notUsed, opts)) - return false; - } + if (!this.check(notUsed, opts)) + return false; + await this.checkExternalConverterPresent(); const {inputFiles, callback, abort, uploadFileName} = opts; - const inpFile = (opts.pdfFile ? opts.pdfFile : inputFiles.sourceFile); + const inpFile = inputFiles.sourceFile; const outFile = `${inputFiles.filesDir}/${utils.randomHexString(10)}.xml`; //конвертируем в xml @@ -189,12 +188,17 @@ class ConvertPdf extends ConvertHtml { indents[0] = 0; //формируем текст + const limitSize = 2*this.config.maxUploadFileSize; if (!title && uploadFileName) title = uploadFileName; let text = `${title}`; let concat = ''; let sp = ''; for (const line of lines) { + if (text.length > limitSize) { + throw new Error(`Файл для конвертирования слишком большой|FORLOG| text.length: ${text.length} > ${limitSize}`); + } + if (line.isImage) { text += `${line.data}`; continue;