Поправка багов

This commit is contained in:
Book Pauk
2020-12-05 00:31:53 +07:00
parent 41822999c8
commit e25375fb7a

View File

@@ -14,15 +14,14 @@ class ConvertPdf extends ConvertHtml {
} }
async run(notUsed, opts) { async run(notUsed, opts) {
if (!opts.skipCheck) {
if (!this.check(notUsed, opts)) if (!this.check(notUsed, opts))
return false; return false;
}
await this.checkExternalConverterPresent(); await this.checkExternalConverterPresent();
const {inputFiles, callback, abort, uploadFileName} = opts; 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`; const outFile = `${inputFiles.filesDir}/${utils.randomHexString(10)}.xml`;
//конвертируем в xml //конвертируем в xml
@@ -189,12 +188,17 @@ class ConvertPdf extends ConvertHtml {
indents[0] = 0; indents[0] = 0;
//формируем текст //формируем текст
const limitSize = 2*this.config.maxUploadFileSize;
if (!title && uploadFileName) if (!title && uploadFileName)
title = uploadFileName; title = uploadFileName;
let text = `<title>${title}</title>`; let text = `<title>${title}</title>`;
let concat = ''; let concat = '';
let sp = ''; let sp = '';
for (const line of lines) { for (const line of lines) {
if (text.length > limitSize) {
throw new Error(`Файл для конвертирования слишком большой|FORLOG| text.length: ${text.length} > ${limitSize}`);
}
if (line.isImage) { if (line.isImage) {
text += `<fb2-image type="${line.type}" name="${line.name}">${line.data}</fb2-image>`; text += `<fb2-image type="${line.type}" name="${line.name}">${line.data}</fb2-image>`;
continue; continue;