Merge branch 'release/0.9.10-1'

docs/omnireader.ru/README.md

@@ -38,6 +38,8 @@ sudo apt install rar
 sudo apt install libreoffice
 sudo apt install poppler-utils
 sudo apt install djvulibre-bin
+sudo apt install libtiff-tools
+sudo apt install graphicsmagick-imagemagick-compat
 ```
 
 ### nginx, server config

server/core/Reader/BookConverter/ConvertBase.js

@@ -15,7 +15,6 @@ class ConvertBase {
         this.calibrePath = `${config.dataDir}/calibre/ebook-convert`;
         this.sofficePath = '/usr/bin/soffice';
         this.pdfToHtmlPath = '/usr/bin/pdftohtml';
-        this.ddjvuPath = '/usr/bin/ddjvu';
     }
 
     async run(data, opts) {// eslint-disable-line no-unused-vars
@@ -31,9 +30,6 @@ class ConvertBase {
 
         if (!await fs.pathExists(this.pdfToHtmlPath))
             throw new Error('Внешний конвертер pdftohtml не найден');
-
-        if (!await fs.pathExists(this.ddjvuPath))
-            throw new Error('Внешний конвертер ddjvu не найден');
     }
 
     async execConverter(path, args, onData, abort) {

server/core/Reader/BookConverter/ConvertDjvu.js

@@ -1,9 +1,10 @@
 const fs = require('fs-extra');
 const path = require('path');
+const utils = require('../../utils');
 
-const ConvertPdf = require('./ConvertPdf');
+const ConvertHtml = require('./ConvertHtml');
 
-class ConvertRtf extends ConvertPdf {
+class ConvertDjvu extends ConvertHtml {
     check(data, opts) {
         const {inputFiles} = opts;
 
@@ -14,26 +15,83 @@ class ConvertRtf extends ConvertPdf {
     async run(data, opts) {
         if (!this.check(data, opts))
             return false;
-        await this.checkExternalConverterPresent();
 
-        const {inputFiles, callback, abort} = opts;
+        const {inputFiles, callback, abort, uploadFileName} = opts;
 
-        const outFile = `${inputFiles.filesDir}/${path.basename(inputFiles.sourceFile)}`;
-        const pdfFile = `${outFile}.pdf`;
+        const ddjvuPath = '/usr/bin/ddjvu';
+        if (!await fs.pathExists(ddjvuPath))
+            throw new Error('Внешний конвертер ddjvu не найден');
 
+        const tiffsplitPath = '/usr/bin/tiffsplit';
+        if (!await fs.pathExists(tiffsplitPath))
+            throw new Error('Внешний конвертер tiffsplitPath не найден');
+
+        const mogrifyPath = '/usr/bin/mogrify';
+        if (!await fs.pathExists(mogrifyPath))
+            throw new Error('Внешний конвертер mogrifyPath не найден');
+
+        const dir = `${inputFiles.filesDir}/`;
+        const inpFile = `${dir}${path.basename(inputFiles.sourceFile)}`;
+        const tifFile = `${inpFile}.tif`;
+
+        //конвертируем в tiff
         let perc = 0;
-        await this.execConverter(this.ddjvuPath, ['-format=pdf', '-quality=85', '-verbose', inputFiles.sourceFile, pdfFile], () => {
+        await this.execConverter(ddjvuPath, ['-format=tiff', '-quality=50', '-verbose', inputFiles.sourceFile, tifFile], () => {
+            perc = (perc < 100 ? perc + 1 : 40);
+            callback(perc);
+        }, abort);
+
+        const tifFileSize = (await fs.stat(tifFile)).size;
+        const limitSize = 3*this.config.maxUploadFileSize;
+        if (tifFileSize > limitSize) {
+            throw new Error(`Файл для конвертирования слишком большой|FORLOG| ${tifFileSize} > ${limitSize}`);
+        }
+
+        //разбиваем на файлы
+        await this.execConverter(tiffsplitPath, [tifFile, dir], null, abort);
+
+        await fs.remove(tifFile);
+
+        //конвертируем в jpg
+        await this.execConverter(mogrifyPath, ['-quality', '20', '-verbose', '-format', 'jpg', `${dir}*.tif`], () => {
             perc = (perc < 100 ? perc + 1 : 40);
             callback(perc);
         }, abort);
 
-        const pdfFileSize = (await fs.stat(pdfFile)).size;
-        if (pdfFileSize > 2*this.config.maxUploadFileSize) {
-            throw new Error(`Файл для конвертирования слишком большой|FORLOG| ${pdfFileSize} > ${2*this.config.maxUploadFileSize}`);
+        //читаем изображения
+        const loadImage = async(image) => {
+            image.data = (await fs.readFile(image.file)).toString('base64');
+            image.name = path.basename(image.file);
         }
 
-        return await super.run(null, Object.assign({}, opts, {pdfFile, skipCheck: true}));
+        let files = [];
+        await utils.findFiles(async(file) => {
+            if (path.extname(file) == '.jpg')
+                files.push({name: file, base: path.basename(file)});
+        }, dir);
+
+        files.sort((a, b) => a.base.localeCompare(b.base));
+
+        let images = [];
+        let loading = [];
+        files.forEach(f => {
+            const image = {file: f.name};
+            images.push(image);
+            loading.push(loadImage(image));
+        });
+
+        await Promise.all(loading);
+
+        //формируем текст
+        let title = '';
+        if (uploadFileName)
+            title = uploadFileName;
+        let text = `<title>${title}</title>`;
+        for (const image of images) {
+            text += `<fb2-image type="image/jpeg" name="${image.name}">${image.data}</fb2-image>`;
+        }
+        return await super.run(Buffer.from(text), {skipCheck: true, isText: true, cutTitle: true});
     }
 }
 
-module.exports = ConvertRtf;
+module.exports = ConvertDjvu;