Merge branch 'release/0.5.4'

Версия 0.5.4
Улучшение парсинга pdf и html
2019-03-04 22:57:38 +07:00 · 2019-03-04 22:57:10 +07:00 · 2019-03-04 22:56:15 +07:00 · 2019-03-04 22:42:54 +07:00 · 2019-03-04 22:28:11 +07:00 · 2019-03-04 21:26:07 +07:00
40 changed files with 2782 additions and 930 deletions
--- a/build/linux.js
+++ b/build/linux.js
@@ -5,8 +5,7 @@ const stream = require('stream');
 const pipeline = util.promisify(stream.pipeline);

 const got = require('got');
-const decompress = require('decompress');
-const decompressTargz = require('decompress-targz');
+const FileDecompressor = require('../server/core/FileDecompressor');

 const distDir = path.resolve(__dirname, '../dist');
 const publicDir = `${distDir}/tmp/public`;
@@ -15,6 +14,8 @@ const outDir = `${distDir}/linux`;
 const tempDownloadDir = `${distDir}/tmp/download`;

 async function main() {
+    const decomp = new FileDecompressor();
+
    await fs.emptyDir(outDir);
    // перемещаем public на место
    if (await fs.pathExists(publicDir))
@@ -32,11 +33,7 @@ async function main() {
        console.log(`done downloading ${sqliteRemoteUrl}`);

        //распаковываем
-        await decompress(`${tempDownloadDir}/sqlite.tar.gz`, `${tempDownloadDir}`, {
-            plugins: [
-                decompressTargz()
-            ]
-        });
+        console.log(await decomp.unpackTarZZ(`${tempDownloadDir}/sqlite.tar.gz`, tempDownloadDir));
        console.log('files decompressed');
    }
    // копируем в дистрибутив
@@ -53,11 +50,7 @@ async function main() {
        console.log(`done downloading ${ipfsRemoteUrl}`);

        //распаковываем
-        await decompress(`${tempDownloadDir}/ipfs.tar.gz`, `${tempDownloadDir}`, {
-            plugins: [
-                decompressTargz()
-            ]
-        });
+        console.log(await decomp.unpackTarZZ(`${tempDownloadDir}/ipfs.tar.gz`, tempDownloadDir));
        console.log('files decompressed');
    }

--- a/build/win.js
+++ b/build/win.js
@@ -5,8 +5,7 @@ const stream = require('stream');
 const pipeline = util.promisify(stream.pipeline);

 const got = require('got');
-const decompress = require('decompress');
-const decompressTargz = require('decompress-targz');
+const FileDecompressor = require('../server/core/FileDecompressor');

 const distDir = path.resolve(__dirname, '../dist');
 const publicDir = `${distDir}/tmp/public`;
@@ -15,6 +14,8 @@ const outDir = `${distDir}/win`;
 const tempDownloadDir = `${distDir}/tmp/download`;

 async function main() {
+    const decomp = new FileDecompressor();
+
    await fs.emptyDir(outDir);
    // перемещаем public на место
    if (await fs.pathExists(publicDir))
@@ -32,11 +33,7 @@ async function main() {
        console.log(`done downloading ${sqliteRemoteUrl}`);

        //распаковываем
-        await decompress(`${tempDownloadDir}/sqlite.tar.gz`, `${tempDownloadDir}`, {
-            plugins: [
-                decompressTargz()
-            ]
-        });
+        console.log(await decomp.unpackTarZZ(`${tempDownloadDir}/sqlite.tar.gz`, tempDownloadDir));
        console.log('files decompressed');
    }
    // копируем в дистрибутив
@@ -53,7 +50,7 @@ async function main() {
        console.log(`done downloading ${ipfsRemoteUrl}`);

        //распаковываем
-        await decompress(`${tempDownloadDir}/ipfs.zip`, `${tempDownloadDir}`);
+        console.log(await decomp.unpack(`${tempDownloadDir}/ipfs.zip`, tempDownloadDir));
        console.log('files decompressed');
    }
    // копируем в дистрибутив
--- a/client/api/misc.js
+++ b/client/api/misc.js
@@ -6,7 +6,9 @@ const api = axios.create({

 class Misc {
    async loadConfig() {
-        const response = await api.post('/config', {params: ['name', 'version', 'mode', 'maxUploadFileSize', 'branch']});
+        const response = await api.post('/config', {params: [
+            'name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'branch',
+        ]});
        return response.data;
    }
 }
--- a/client/api/reader.js
+++ b/client/api/reader.js
@@ -11,7 +11,7 @@ const workerApi = axios.create({

 class Reader {
    async loadBook(url, callback) {
-        const refreshPause = 200;
+        const refreshPause = 300;
        if (!callback) callback = () => {};

        let response = await api.post('/load-book', {type: 'url', url});
@@ -44,13 +44,14 @@ class Reader {
                await sleep(refreshPause);

            i++;
-            if (i > 30*1000/refreshPause) {//30 сек ждем телодвижений воркера
+            if (i > 120*1000/refreshPause) {//2 мин ждем телодвижений воркера
                throw new Error('Слишком долгое время ожидания');
            }
            //проверка воркера
            const prevProgress = response.data.progress;
+            const prevState = response.data.state;
            response = await workerApi.post('/get-state', {workerId});
-            i = (prevProgress != response.data.progress ? 1 : i);
+            i = (prevProgress != response.data.progress || prevState != response.data.state ? 1 : i);
        }
    }

--- a/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue
+++ b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue
@@ -19,7 +19,7 @@

        <p>В качестве URL можно задавать html-страничку с книгой, либо прямую ссылку 
        на файл из онлайн-библиотеки (например, скопировав адрес ссылки или кнопки "скачать fb2").</p>
-        <p>Поддерживаемые форматы: <strong>html, txt, fb2, fb2.zip</strong></p>
+        <p>Поддерживаемые форматы: <b>fb2, fb2.zip, html, txt</b> и другие</p>

        <div v-html="automationHtml"></div>
        <p>Связаться с разработчиком: <a href="mailto:bookpauk@gmail.com">bookpauk@gmail.com</a></p>
--- a/client/components/Reader/HistoryPage/HistoryPage.vue
+++ b/client/components/Reader/HistoryPage/HistoryPage.vue
@@ -15,8 +15,14 @@
                    border
                    :default-sort = "{prop: 'touchDateTime', order: 'descending'}"
                    :header-cell-style = "headerCellStyle"
+                    :row-key = "rowKey"
                    >

+                    <el-table-column
+                        type="index"
+                        width="35px"
+                        >
+                    </el-table-column>
                    <el-table-column
                        prop="touchDateTime"
                        min-width="90px"
@@ -43,6 +49,7 @@
                                placeholder="Найти"/-->
                                <div class="el-input el-input--mini">
                                    <input class="el-input__inner"
+                                        ref="input"
                                        placeholder="Найти"
                                        style="margin: 0; padding: 0; vertical-align: bottom; margin-top: 20px; padding: 0 10px 0 10px"
                                        :value="search" @input="search = $event.target.value"
@@ -118,9 +125,16 @@ class HistoryPage extends Vue {
    created() {
    }

-    mounted() {
+    init() {
        this.updateTableData();
        this.mostRecentBook = bookManager.mostRecentBook();
+        this.$nextTick(() => {
+            this.$refs.input.focus();
+        });
+    }
+
+    rowKey(row) {
+        return row.key;
    }

    updateTableData() {
@@ -172,13 +186,15 @@ class HistoryPage extends Vue {
        }

        const search = this.search;
-        this.tableData = result.filter(item => {
+        result = result.filter(item => {
            return !search ||
                item.touchTime.includes(search) ||
                item.touchDate.includes(search) ||
                item.desc.title.toLowerCase().includes(search.toLowerCase()) ||
                item.desc.author.toLowerCase().includes(search.toLowerCase())
        });
+
+        this.tableData = result;
    }

    headerCellStyle(cell) {
@@ -210,7 +226,8 @@ class HistoryPage extends Vue {
        this.updateTableData();

        const newRecent = bookManager.mostRecentBook();
-        if (this.mostRecentBook != newRecent)
+
+        if (!(this.mostRecentBook && newRecent && this.mostRecentBook.key == newRecent.key))
            this.$emit('load-book', newRecent);

        this.mostRecentBook = newRecent;
--- a/client/components/Reader/LoaderPage/LoaderPage.vue
+++ b/client/components/Reader/LoaderPage/LoaderPage.vue
@@ -3,8 +3,10 @@
        <div class="part">
            <span class="greeting bold-font">{{ title }}</span>
            <span class="greeting">Добро пожаловать!</span>
-            <span class="greeting">Поддерживаются форматы: fb2, fb2.zip, html, txt</span>
+            <span class="greeting">Поддерживаются форматы: <b>fb2, html, txt</b> и сжатие: <b>zip, bz2, gz</b></span>
+            <span v-if="isExternalConverter" class="greeting">...а также: <b>rtf, doc, docx, pdf, epub, mobi</b></span>
        </div>
+
        <div class="part center">
            <el-input ref="input" placeholder="URL книги" v-model="bookUrl">
                <el-button slot="append" icon="el-icon-check" @click="submitUrl"></el-button>
@@ -15,8 +17,9 @@
                Загрузить файл с диска
            </el-button>
            <div class="space"></div>
-            <span v-if="config.mode == 'omnireader'" class="bottom-span clickable" @click="openComments">Комментарии</span>
+            <span v-if="mode == 'omnireader'" class="bottom-span clickable" @click="openComments">Комментарии</span>
        </div>
+
        <div class="part bottom">
            <span class="bottom-span clickable" @click="openHelp">Справка</span>
            <span class="bottom-span clickable" @click="openDonate">Помочь проекту</span>
@@ -38,7 +41,6 @@ class LoaderPage extends Vue {

    created() {
        this.commit = this.$store.commit;
-        this.config = this.$store.state.config;
    }

    mounted() {
@@ -50,14 +52,22 @@ class LoaderPage extends Vue {
    }

    get title() {
-        if (this.config.mode == 'omnireader')
+        if (this.$store.state.config.mode == 'omnireader')
            return 'Omni Reader - браузерная онлайн-читалка.';
        return 'Универсальная читалка книг и ресурсов интернета.';

    }

+    get mode() {
+        return this.$store.state.config.mode;
+    }
+
    get version() {
-        return `v${this.config.version}`;
+        return `v${this.$store.state.config.version}`;
+    }
+
+    get isExternalConverter() {
+        return this.$store.state.config.useExternalBookConverter;
    }

    submitUrl() {
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -69,7 +69,7 @@
                @stop-text-search="stopTextSearch">
            </SearchPage>
            <CopyTextPage v-if="copyTextActive" ref="copyTextPage" @copy-text-toggle="copyTextToggle"></CopyTextPage>            
-            <HistoryPage v-if="historyActive" ref="historyPage" @load-book="loadBook" @history-toggle="historyToggle"></HistoryPage>
+            <HistoryPage v-show="historyActive" ref="historyPage" @load-book="loadBook" @history-toggle="historyToggle"></HistoryPage>
            <SettingsPage v-if="settingsActive" ref="settingsPage" @settings-toggle="settingsToggle"></SettingsPage>
            <HelpPage v-if="helpActive" ref="helpPage" @help-toggle="helpToggle"></HelpPage>
            <ClickMapPage v-show="clickMapActive" ref="clickMapPage"></ClickMapPage>
@@ -340,8 +340,8 @@ class Reader extends Vue {
            this.setPositionActive = true;

            this.$nextTick(() => {
-                this.$refs.setPositionPage.sliderMax = this.mostRecentBook().textLength - 1;
-                this.$refs.setPositionPage.sliderValue = this.mostRecentBook().bookPos;
+                const recent = this.mostRecentBook();
+                this.$refs.setPositionPage.init(recent.bookPos, recent.textLength - 1);
            });
        } else {
            this.setPositionActive = false;
@@ -415,6 +415,7 @@ class Reader extends Vue {
        this.historyActive = !this.historyActive;
        if (this.historyActive) {
            this.closeAllTextPages();
+            this.$refs.historyPage.init();
            this.historyActive = true;
        } else {
            this.historyActive = false;
@@ -655,7 +656,7 @@ class Reader extends Vue {

                    // если есть в локальном кэше
                    if (bookParsed) {
-                        await bookManager.setRecentBook(Object.assign({bookPos, bookPosSeen, bookPosPercent}, bookManager.metaOnly(bookParsed)));
+                        await bookManager.setRecentBook(Object.assign({bookPos, bookPosSeen, bookPosPercent}, bookParsed));
                        this.mostRecentBook();
                        this.addAction(bookPos);
                        this.loaderActive = false;
@@ -698,7 +699,7 @@ class Reader extends Vue {
                });

                // добавляем в историю
-                await bookManager.setRecentBook(Object.assign({bookPos, bookPosSeen, bookPosPercent}, bookManager.metaOnly(addedBook)));
+                await bookManager.setRecentBook(Object.assign({bookPos, bookPosSeen, bookPosPercent}, addedBook));
                this.mostRecentBook();
                this.addAction(bookPos);
                this.updateRoute(true);
@@ -831,6 +832,8 @@ class Reader extends Vue {
                            break;
                        case 'KeyX':
                            this.historyToggle();
+                            event.preventDefault();
+                            event.stopPropagation();
                            break;
                        case 'KeyS':
                            this.settingsToggle();
--- a/client/components/Reader/SetPositionPage/SetPositionPage.vue
+++ b/client/components/Reader/SetPositionPage/SetPositionPage.vue
@@ -18,7 +18,6 @@
 //-----------------------------------------------------------------------------
 import Vue from 'vue';
 import Component from 'vue-class-component';
-import _ from 'lodash';

 import Window from '../../share/Window.vue';

@@ -28,7 +27,8 @@ export default @Component({
    },
    watch: {
        sliderValue: function(newValue) {
-            this.$emit('book-pos-changed', {bookPos: newValue});
+            if (this.initialized)
+                this.$emit('book-pos-changed', {bookPos: newValue});
        },
    },
 })
@@ -39,6 +39,13 @@ class SetPositionPage extends Vue {
    created() {
        this.commit = this.$store.commit;
        this.reader = this.$store.state.reader;
+        this.initialized = false;
+    }
+
+    init(sliderValue, sliderMax) {
+        this.sliderMax = sliderMax;
+        this.sliderValue = sliderValue;
+        this.initialized = true;
    }

    formatTooltip(val) {
--- a/client/components/Reader/SettingsPage/SettingsPage.vue
+++ b/client/components/Reader/SettingsPage/SettingsPage.vue
@@ -185,7 +185,7 @@
                                <el-checkbox v-model="wordWrap">Перенос по слогам</el-checkbox>
                            </el-form-item>
                            <el-form-item label="Обработка">
-                                <el-checkbox v-model="cutEmptyParagraphs">Убирать пустые параграфы</el-checkbox>
+                                <el-checkbox v-model="cutEmptyParagraphs">Убирать пустые строки</el-checkbox>
                            </el-form-item>
                            <el-form-item label="">
                                <el-col :span="12">
@@ -207,12 +207,17 @@
                                        <template slot="content">
                                            Выносить все изображения в центр экрана
                                        </template>
-                                        <el-checkbox v-model="showInlineImagesInCenter" @change="needReload">Инлайн в центр</el-checkbox>
+                                        <el-checkbox v-model="showInlineImagesInCenter" @change="needReload" :disabled="!showImages">Инлайн в центр</el-checkbox>
                                    </el-tooltip>
                                </el-col>
                            </el-form-item>
                            <el-form-item label="">
-                                    Размер изображения
+                                <el-checkbox v-model="imageFitWidth" :disabled="!showImages">Ширина не более размера экрана</el-checkbox>
+                            </el-form-item>
+                            <el-form-item label="">
+                                    <el-col :span="12">
+                                        Высота не более
+                                    </el-col>
                                    <el-tooltip :open-delay="500" effect="light" placement="top">
                                        <template slot="content">
                                            Определяет высоту изображения количеством строк.<br>
@@ -220,7 +225,7 @@
                                            уменьшено с сохранением пропорций так, чтобы<br>
                                            помещаться в указанное количество строк.
                                        </template>
-                                        <el-input-number v-model="imageHeightLines" :min="1" :max="100"></el-input-number>
+                                        <el-input-number v-model="imageHeightLines" :min="1" :max="100" :disabled="!showImages"></el-input-number>
                                    </el-tooltip>
                            </el-form-item>
                        </el-form>
@@ -437,11 +442,12 @@ class SettingsPage extends Vue {
          '#000000',
          '#202020',
          '#ebe2c9',
+          '#cfdc99',
+          '#478355',
+          '#a6caf0',
          '#909080',
          '#808080',
          '#c8c8c8',
-          '#478355',
-          '#a6caf0',
        ];
    }

--- a/client/components/Reader/TextPage/DrawHelper.js
+++ b/client/components/Reader/TextPage/DrawHelper.js
@@ -26,9 +26,9 @@ export default class DrawHelper {
        const font = this.fontByStyle({});
        const justify = (this.textAlignJustify ? 'text-align: justify; text-align-last: justify;' : '');

-        let out = `<div style="width: ${this.w}px; height: ${this.h}px;` + 
+        let out = `<div style="width: ${this.w}px; height: ${this.h + (isScrolling ? this.lineHeight : 0)}px;` + 
            ` position: absolute; top: ${this.fontSize*this.textShift}px; color: ${this.textColor}; font: ${font}; ${justify}` +
-            ` line-height: ${this.lineHeight}px;">`;
+            ` line-height: ${this.lineHeight}px; white-space: nowrap; overflow: hidden;">`;

        let imageDrawn = new Set();
        let len = lines.length;
@@ -91,32 +91,27 @@ export default class DrawHelper {
                } else
                    text = part.text;

-                if (text.trim() == '')
+                if (text && text.trim() == '')
                    text = `<span style="white-space: pre">${text}</span>`;

                lineText += `${tOpen}${text}${tClose}`;

                center = center || part.style.center;
-                space = (part.style.space > 0 ? part.style.space : space);
+                space = (part.style.space > space ? part.style.space : space);

                //избражения
-                //image: {local: Boolean, inline: Boolean, id: String, imageLine: Number, lineCount: Number, paraIndex: Number},
+                //image: {local: Boolean, inline: Boolean, id: String, imageLine: Number, lineCount: Number, paraIndex: Number, w: Number, h: Number},
                const img = part.image;
                if (img && img.id && !img.inline && !imageDrawn.has(img.paraIndex)) {
                    const bin = this.parsed.binary[img.id];
                    if (bin) {
-                        let imgH = img.lineCount*this.lineHeight;
-                        imgH = (imgH <= bin.h ? imgH : bin.h);
-                        let imgW = bin.w;
-
                        let resize = '';                        
-                        if (bin.h > imgH) {
-                            resize = `height: ${imgH}px`;
-                            imgW = imgW*imgH/bin.h;
+                        if (bin.h > img.h) {
+                            resize = `height: ${img.h}px`;
                        }

-                        const left = (this.w - imgW)/2;
-                        const top = ((img.lineCount*this.lineHeight - imgH)/2) + (i - img.imageLine)*this.lineHeight;
+                        const left = (this.w - img.w)/2;
+                        const top = ((img.lineCount*this.lineHeight - img.h)/2) + (i - img.imageLine)*this.lineHeight;
                        if (img.local) {
                            lineText += `<img src="data:${bin.type};base64,${bin.data}" style="position: absolute; left: ${left}px; top: ${top}px; ${resize}"/>`;
                        } else {
--- a/client/components/Reader/TextPage/TextPage.vue
+++ b/client/components/Reader/TextPage/TextPage.vue
@@ -221,6 +221,7 @@ class TextPage extends Vue {
            this.parsed.showImages = this.showImages;
            this.parsed.showInlineImagesInCenter = this.showInlineImagesInCenter;
            this.parsed.imageHeightLines = this.imageHeightLines;
+            this.parsed.imageFitWidth = this.imageFitWidth;
        }

        //statusBar
--- a/client/components/Reader/share/BookParser.js
+++ b/client/components/Reader/share/BookParser.js
@@ -45,6 +45,9 @@ export default class BookParser {
        let italic = false;
        let space = 0;
        let inPara = false;
+        let isFirstBody = true;
+        let isFirstSection = true;
+        let isFirstTitlePara = false;

        this.binary = {};
        let binaryId = '';
@@ -185,7 +188,7 @@ export default class BookParser {
                if (attrs.href && attrs.href.value) {
                    const href = attrs.href.value;
                    if (href[0] == '#') {//local
-                        if (inPara && !this.showInlineImagesInCenter)
+                        if (inPara && !this.showInlineImagesInCenter && !center)
                            growParagraph(`<image-inline href="${href}"></image-inline>`, 0);
                        else
                            newParagraph(`<image href="${href}">${' '.repeat(maxImageLineCount)}</image>`, maxImageLineCount);
@@ -199,14 +202,23 @@ export default class BookParser {
            }

            if (path.indexOf('/fictionbook/body') == 0) {
+                if (tag == 'body') {
+                    if (!isFirstBody)
+                        newParagraph(' ', 1);
+                    isFirstBody = false;
+                }
+
                if (tag == 'title') {
                    newParagraph(' ', 1);
+                    isFirstTitlePara = true;
                    bold = true;
                    center = true;
                }

                if (tag == 'section') {
-                    newParagraph(' ', 1);
+                    if (!isFirstSection)
+                        newParagraph(' ', 1);
+                    isFirstSection = false;
                }

                if (tag == 'emphasis' || tag == 'strong') {
@@ -214,13 +226,17 @@ export default class BookParser {
                }

                if ((tag == 'p' || tag == 'empty-line' || tag == 'v')) {
-                    newParagraph(' ', 1);
-                    if (tag == 'p')
+                    if (!(tag == 'p' && isFirstTitlePara))
+                        newParagraph(' ', 1);
+                    if (tag == 'p') {
                        inPara = true;
+                        isFirstTitlePara = false;
+                    }
                }

                if (tag == 'subtitle') {
                    newParagraph(' ', 1);
+                    isFirstTitlePara = true;
                    bold = true;
                }

@@ -248,6 +264,7 @@ export default class BookParser {
            
                if (path.indexOf('/fictionbook/body') == 0) {
                    if (tag == 'title') {
+                        isFirstTitlePara = false;
                        bold = false;
                        center = false;
                    }
@@ -261,6 +278,7 @@ export default class BookParser {
                    }

                    if (tag == 'subtitle') {
+                        isFirstTitlePara = false;
                        bold = false;
                    }

@@ -293,13 +311,13 @@ export default class BookParser {
            text = text.replace(/>/g, '&gt;');
            text = text.replace(/</g, '&lt;');

-            if (text != ' ' && text.trim() == '')
-                text = text.trim();
+            if (text && text.trim() == '')
+                text = (text.indexOf(' ') >= 0 ? ' ' : '');

-            if (text == '')
+            if (!text)
                return;

-            text = text.replace(/[\t\n\r]/g, ' ');
+            text = text.replace(/[\t\n\r\xa0]/g, ' ');

            switch (path) {
                case '/fictionbook/description/title-info/author/first-name':
@@ -348,13 +366,7 @@ export default class BookParser {
            }

            if (path.indexOf('/fictionbook/body/section') == 0) {
-                switch (tag) {
-                    case 'p':
-                        growParagraph(`${tOpen}${text}${tClose}`, text.length);
-                        break;
-                    default:
-                        growParagraph(`${tOpen}${text}${tClose}`, text.length);
-                }
+                growParagraph(`${tOpen}${text}${tClose}`, text.length);
            }

            if (binaryId) {
@@ -597,7 +609,8 @@ export default class BookParser {
            para.parsed.cutEmptyParagraphs === this.cutEmptyParagraphs &&
            para.parsed.addEmptyParagraphs === this.addEmptyParagraphs &&
            para.parsed.showImages === this.showImages &&
-            para.parsed.imageHeightLines === this.imageHeightLines
+            para.parsed.imageHeightLines === this.imageHeightLines &&
+            para.parsed.imageFitWidth === this.imageFitWidth
            )
            return para.parsed;

@@ -611,6 +624,7 @@ export default class BookParser {
            addEmptyParagraphs: this.addEmptyParagraphs,
            showImages: this.showImages,
            imageHeightLines: this.imageHeightLines,
+            imageFitWidth: this.imageFitWidth,
            visible: !(
                (this.cutEmptyParagraphs && para.cut) ||
                (para.addIndex > this.addEmptyParagraphs)
@@ -626,7 +640,7 @@ export default class BookParser {
            last: Boolean,
            parts: array of {
                style: {bold: Boolean, italic: Boolean, center: Boolean},
-                image: {local: Boolean, inline: Boolean, id: String, imageLine: Number, lineCount: Number, paraIndex: Number},
+                image: {local: Boolean, inline: Boolean, id: String, imageLine: Number, lineCount: Number, paraIndex: Number, w: Number, h: Number},
                text: String,
            }
        }*/
@@ -641,7 +655,6 @@ export default class BookParser {
        let style = {};
        let ofs = 0;//смещение от начала параграфа para.offset
        let imgW = 0;
-
        // тут начинается самый замес, перенос по слогам и стилизация, а также изображения
        for (const part of parts) {
            style = part.style;
@@ -651,11 +664,24 @@ export default class BookParser {
                parsed.visible = this.showImages;
                let bin = this.binary[part.image.id];
                if (!bin)
-                    bin = {h: 0, w: 0};
+                    bin = {h: 1, w: 1};

                let lineCount = this.imageHeightLines;
-                const c = Math.ceil(bin.h/this.lineHeight);
+                let c = Math.ceil(bin.h/this.lineHeight);
+
+                const maxH = lineCount*this.lineHeight;
+                let maxH2 = maxH;
+                if (this.imageFitWidth && bin.w > this.w) {
+                    maxH2 = bin.h*this.w/bin.w;
+                    c = Math.ceil(maxH2/this.lineHeight);
+                }
                lineCount = (c < lineCount ? c : lineCount);
+
+                let imageHeight = (maxH2 < maxH ? maxH2 : maxH);
+                imageHeight = (imageHeight <= bin.h ? imageHeight : bin.h);
+
+                let imageWidth = (bin.h > imageHeight ? bin.w*imageHeight/bin.h : bin.w);
+
                let i = 0;
                for (; i < lineCount - 1; i++) {
                    line.end = para.offset + ofs;
@@ -667,7 +693,9 @@ export default class BookParser {
                        id: part.image.id,
                        imageLine: i,
                        lineCount,
-                        paraIndex
+                        paraIndex,
+                        w: imageWidth,
+                        h: imageHeight,
                    }});
                    lines.push(line);
                    line = {begin: line.end + 1, parts: []};
@@ -677,7 +705,9 @@ export default class BookParser {
                line.first = (j == 0);
                line.last = true;
                line.parts.push({style, text: ' ',
-                    image: {local: part.image.local, inline: false, id: part.image.id, imageLine: i, lineCount, paraIndex}});
+                    image: {local: part.image.local, inline: false, id: part.image.id,
+                        imageLine: i, lineCount, paraIndex, w: imageWidth, h: imageHeight}
+                });
                
                continue;
            }
--- a/client/components/Reader/share/bookManager.js
+++ b/client/components/Reader/share/bookManager.js
@@ -17,14 +17,44 @@ const bmRecentStore = localForage.createInstance({
    name: 'bmRecentStore'
 });

+const bmCacheStore = localForage.createInstance({
+    name: 'bmCacheStore'
+});
+
 class BookManager {
    async init(settings) {
        this.settings = settings;
-        this.books = {};
-        this.recent = {};
+
+        //bmCacheStore нужен только для ускорения загрузки читалки
+        this.booksCached = await bmCacheStore.getItem('books');
+        if (!this.booksCached)
+            this.booksCached = {};
+        this.recent = await bmCacheStore.getItem('recent');
+        this.recentLast = await bmCacheStore.getItem('recent-last');
+        if (this.recentLast)
+            this.recent[this.recentLast.key] = this.recentLast;
+
+        this.books = Object.assign({}, this.booksCached);
+
        this.recentChanged1 = true;
        this.recentChanged2 = true;

+        if (!this.books || !this.recent) {
+            this.books = {};
+            this.recent = {};
+            await this.loadMeta(true);
+        } else {
+            this.loadMeta(false);
+        }
+    }
+
+    //долгая загрузка из хранилища,
+    //хранение в отдельных записях дает относительно
+    //нормальное поведение при нескольких вкладках с читалкой в браузере
+    async loadMeta(immediate) {
+        if (!immediate)
+            await utils.sleep(2000);
+
        let len = await bmMetaStore.length();
        for (let i = 0; i < len; i++) {
            const key = await bmMetaStore.key(i);
@@ -33,7 +63,13 @@ class BookManager {
            if (keySplit.length == 2 && keySplit[0] == 'bmMeta') {
                let meta = await bmMetaStore.getItem(key);

+                const oldBook = this.books[meta.key];
                this.books[meta.key] = meta;
+
+                if (oldBook && oldBook.data && oldBook.parsed) {
+                    this.books[meta.key].data = oldBook.data;
+                    this.books[meta.key].parsed = oldBook.parsed;
+                }
            }
        }

@@ -45,6 +81,14 @@ class BookManager {
        }

        await this.cleanBooks();
+        await this.cleanRecentBooks();
+
+        this.booksCached = {};
+        for (const key in this.books) {
+            this.booksCached[key] = this.metaOnly(this.books[key]);
+        }
+        await bmCacheStore.setItem('books', this.booksCached);
+        await bmCacheStore.setItem('recent', this.recent);
    }

    async cleanBooks() {
@@ -80,9 +124,11 @@ class BookManager {
        const result = await this.parseBook(meta, newBook.data, callback);

        this.books[meta.key] = result;
+        this.booksCached[meta.key] = this.metaOnly(result);

        await bmMetaStore.setItem(`bmMeta-${meta.key}`, this.metaOnly(result));
        await bmDataStore.setItem(`bmData-${meta.key}`, result.data);
+        await bmCacheStore.setItem('books', this.booksCached);

        return result;
    }
@@ -127,11 +173,15 @@ class BookManager {
        await bmDataStore.removeItem(`bmData-${meta.key}`);

        delete this.books[meta.key];
+        delete this.booksCached[meta.key];
+
+        await bmCacheStore.setItem('books', this.booksCached);
    }

    async parseBook(meta, data, callback) {
        if (!this.books) 
            await this.init();
+
        const parsed = new BookParser(this.settings);

        const parsedMeta = await parsed.parse(data, callback);
@@ -159,7 +209,7 @@ class BookManager {
    async setRecentBook(value, noTouch) {
        if (!this.recent) 
            await this.init();
-        const result = Object.assign({}, value);
+        const result = this.metaOnly(value);
        if (!noTouch)
            Object.assign(result, {touchTime: Date.now()});

@@ -169,7 +219,13 @@ class BookManager {
        this.recent[result.key] = result;

        await bmRecentStore.setItem(result.key, result);
-        await this.cleanRecentBooks();
+
+        //кэшируем, аккуратно
+        if (!(this.recentLast && this.recentLast.key == result.key)) {
+            await bmCacheStore.setItem('recent', this.recent);
+        }
+        this.recentLast = result;
+        await bmCacheStore.setItem('recent-last', this.recentLast);

        this.recentChanged1 = true;
        this.recentChanged2 = true;
@@ -188,6 +244,8 @@ class BookManager {

        await bmRecentStore.removeItem(value.key);
        delete this.recent[value.key];
+        await bmCacheStore.setItem('recent', this.recent);
+
        this.recentChanged1 = true;
        this.recentChanged2 = true;
    }
--- a/client/store/modules/reader.js
+++ b/client/store/modules/reader.js
@@ -162,8 +162,9 @@ const settingDefaults = {
        addEmptyParagraphs: 0,
        blinkCachedLoad: true,
        showImages: true,
-        showInlineImagesInCenter: false,
+        showInlineImagesInCenter: true,
        imageHeightLines: 100,
+        imageFitWidth: true,

        fontShifts: {},
 };
--- a/docs/omnireader/readme.txt
+++ b/docs/omnireader/readme.txt
@@ -1,8 +1,7 @@
 sudo bash

 mkdir /home/liberama
-chown www-data /home/liberama
-chgrp www-data /home/liberama
+chown www-data.www-data /home/liberama

 ### oldreader
 # ubuntu 18
@@ -15,6 +14,18 @@ chgrp www-data /home/oldreader
 sudo -u www-data cp -r ./old/* /home/oldreader
 ###

+### external converter
+# calibre releases https://download.calibre-ebook.com/
+# download, unpack to data/calibre
+# 3.39.1
+wget "https://download.calibre-ebook.com/3.39.1/calibre-3.39.1-x86_64.txz"
+sudo -u www-data mkdir -p /home/liberama/data/calibre
+sudo -u www-data tar xvf calibre-3.39.1-x86_64.txz -C /home/liberama/data/calibre
+
+apt install libreoffice
+apt install poppler-utils
+###
+
 apt install nginx

 cp omnireader /etc/nginx/sites-available/omnireader
@@ -22,5 +33,7 @@ ln -s /etc/nginx/sites-available/omnireader /etc/nginx/sites-enabled/omnireader
 rm /etc/nginx/sites-enabled/default
 service nginx reload

+chown -R www-data.www-data /var/www
+
 exit

--- a/docs/omnireader/run_server.sh
+++ b/docs/omnireader/run_server.sh
@@ -1 +1 @@
-sudo -u www-data /home/liberama/liberama
+sudo -H -u www-data sh -c "cd /var/www; /home/liberama/liberama"
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "Liberama",
-  "version": "0.3.2",
+  "version": "0.5.2",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1597,9 +1597,9 @@
      }
    },
    "base64-js": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
-      "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
    },
    "bcrypt-pbkdf": {
      "version": "1.0.2",
@@ -1622,12 +1622,23 @@
      "dev": true
    },
    "bl": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
-      "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz",
+      "integrity": "sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==",
      "requires": {
-        "readable-stream": "^2.3.5",
-        "safe-buffer": "^5.1.1"
+        "readable-stream": "^3.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+          "integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
      }
    },
    "bluebird": {
@@ -1809,39 +1820,14 @@
      }
    },
    "buffer": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz",
-      "integrity": "sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+      "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
      "requires": {
-        "base64-js": "0.0.8",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4"
      }
    },
-    "buffer-alloc": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
-      "requires": {
-        "buffer-alloc-unsafe": "^1.1.0",
-        "buffer-fill": "^1.0.0"
-      }
-    },
-    "buffer-alloc-unsafe": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
-    },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
-    },
-    "buffer-fill": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
-    },
    "buffer-from": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -2354,14 +2340,6 @@
        "delayed-stream": "~1.0.0"
      }
    },
-    "commander": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
-      "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
-      "requires": {
-        "graceful-readlink": ">= 1.0.0"
-      }
-    },
    "commondir": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -3080,45 +3058,6 @@
      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
      "dev": true
    },
-    "decompress": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz",
-      "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=",
-      "requires": {
-        "decompress-tar": "^4.0.0",
-        "decompress-tarbz2": "^4.0.0",
-        "decompress-targz": "^4.0.0",
-        "decompress-unzip": "^4.0.1",
-        "graceful-fs": "^4.1.10",
-        "make-dir": "^1.0.0",
-        "pify": "^2.3.0",
-        "strip-dirs": "^2.0.0"
-      }
-    },
-    "decompress-bzip2": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/decompress-bzip2/-/decompress-bzip2-4.0.0.tgz",
-      "integrity": "sha1-0SVMlJ4F6vYol1QoawY/3Hz/AT8=",
-      "requires": {
-        "file-type": "^4.3.0",
-        "seek-bzip": "^1.0.5"
-      },
-      "dependencies": {
-        "file-type": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
-          "integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU="
-        }
-      }
-    },
-    "decompress-gz": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/decompress-gz/-/decompress-gz-0.0.1.tgz",
-      "integrity": "sha512-YMdCWdxHvPplsTbV1tvr2oFJOtAFNxqVMFnKWEmePBXl+LKG5z5bFrowzc12Jzd7O29nnzI/D1M95Asx0Qa1fg==",
-      "requires": {
-        "file-type": "^5.2.0"
-      }
-    },
    "decompress-response": {
      "version": "3.3.0",
      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
@@ -3127,63 +3066,6 @@
        "mimic-response": "^1.0.0"
      }
    },
-    "decompress-tar": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
-      "integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
-      "requires": {
-        "file-type": "^5.2.0",
-        "is-stream": "^1.1.0",
-        "tar-stream": "^1.5.2"
-      }
-    },
-    "decompress-tarbz2": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
-      "integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
-      "requires": {
-        "decompress-tar": "^4.1.0",
-        "file-type": "^6.1.0",
-        "is-stream": "^1.1.0",
-        "seek-bzip": "^1.0.5",
-        "unbzip2-stream": "^1.0.9"
-      },
-      "dependencies": {
-        "file-type": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
-          "integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg=="
-        }
-      }
-    },
-    "decompress-targz": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
-      "integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
-      "requires": {
-        "decompress-tar": "^4.1.1",
-        "file-type": "^5.2.0",
-        "is-stream": "^1.1.0"
-      }
-    },
-    "decompress-unzip": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
-      "integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
-      "requires": {
-        "file-type": "^3.8.0",
-        "get-stream": "^2.2.0",
-        "pify": "^2.3.0",
-        "yauzl": "^2.4.2"
-      },
-      "dependencies": {
-        "file-type": {
-          "version": "3.9.0",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
-          "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
-        }
-      }
-    },
    "deep-extend": {
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -3291,11 +3173,6 @@
      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
      "dev": true
    },
-    "detect-file-type": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/detect-file-type/-/detect-file-type-0.2.0.tgz",
-      "integrity": "sha512-RO/pUyKObaN3KZFVAxTzq6zUIweCu45deaUj2ZpbA1wCrmHeHYHpCXT6ZMLtlMtYSgEbpGuCxzQz8a9IuwOfNw=="
-    },
    "detect-indent": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
@@ -4177,6 +4054,43 @@
        }
      }
    },
+    "extract-zip": {
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
+      "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
+      "requires": {
+        "concat-stream": "1.6.2",
+        "debug": "2.6.9",
+        "mkdirp": "0.5.1",
+        "yauzl": "2.4.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "fd-slicer": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+          "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+          "requires": {
+            "pend": "~1.2.0"
+          }
+        },
+        "yauzl": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
+          "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
+          "requires": {
+            "fd-slicer": "~1.0.1"
+          }
+        }
+      }
+    },
    "extsprintf": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -4218,14 +4132,6 @@
      "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
      "dev": true
    },
-    "fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
-      "requires": {
-        "pend": "~1.2.0"
-      }
-    },
    "fg-loadcss": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/fg-loadcss/-/fg-loadcss-2.1.0.tgz",
@@ -4266,11 +4172,6 @@
        "schema-utils": "^1.0.0"
      }
    },
-    "file-type": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
-      "integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY="
-    },
    "fill-range": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -5062,15 +4963,6 @@
      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
      "dev": true
    },
-    "get-stream": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
-      "integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
-      "requires": {
-        "object-assign": "^4.0.1",
-        "pinkie-promise": "^2.0.0"
-      }
-    },
    "get-value": {
      "version": "2.0.6",
      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
@@ -5225,11 +5117,6 @@
      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
    },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
-    },
    "har-schema": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -5972,11 +5859,6 @@
        "is-extglob": "^2.1.1"
      }
    },
-    "is-natural-number": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
-      "integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg="
-    },
    "is-number": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -6036,7 +5918,8 @@
    "is-stream": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
    },
    "is-svg": {
      "version": "3.0.0",
@@ -6341,6 +6224,7 @@
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "dev": true,
      "requires": {
        "pify": "^3.0.0"
      },
@@ -6348,7 +6232,8 @@
        "pify": {
          "version": "3.0.0",
          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
        }
      }
    },
@@ -7418,20 +7303,17 @@
      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
    },
-    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-    },
    "pinkie": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
    },
    "pinkie-promise": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
      "requires": {
        "pinkie": "^2.0.0"
      }
@@ -10052,14 +9934,6 @@
        "ajv-keywords": "^3.1.0"
      }
    },
-    "seek-bzip": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz",
-      "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=",
-      "requires": {
-        "commander": "~2.8.1"
-      }
-    },
    "semver": {
      "version": "5.6.0",
      "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
@@ -10568,14 +10442,6 @@
        "ansi-regex": "^2.0.0"
      }
    },
-    "strip-dirs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
-      "integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
-      "requires": {
-        "is-natural-number": "^4.0.1"
-      }
-    },
    "strip-eof": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
@@ -10775,18 +10641,50 @@
        "yallist": "^3.0.2"
      }
    },
-    "tar-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
-      "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
+    "tar-fs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz",
+      "integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==",
      "requires": {
-        "bl": "^1.0.0",
-        "buffer-alloc": "^1.2.0",
-        "end-of-stream": "^1.0.0",
+        "chownr": "^1.1.1",
+        "mkdirp": "^0.5.1",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "tar-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.0.1.tgz",
+      "integrity": "sha512-I6OJF7wE62BC6zNPdHDtseK0D0187PBjbKSLYY4ffvVkBM6tyBn2O9plDvVM2229/mozfEL/X3++qSvYYQE2xw==",
+      "requires": {
+        "bl": "^3.0.0",
+        "end-of-stream": "^1.4.1",
        "fs-constants": "^1.0.0",
-        "readable-stream": "^2.3.0",
-        "to-buffer": "^1.1.1",
-        "xtend": "^4.0.0"
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
+          "integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
      }
    },
    "terser": {
@@ -11041,11 +10939,6 @@
      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
      "dev": true
    },
-    "to-buffer": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-      "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
-    },
    "to-fast-properties": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
@@ -11206,12 +11099,12 @@
      "dev": true
    },
    "unbzip2-stream": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.1.tgz",
-      "integrity": "sha512-fIZnvdjblYs7Cru/xC6tCPVhz7JkYcVQQkePwMLyQELzYTds2Xn8QefPVnvdVhhZqubxNA1cASXEH5wcK0Bucw==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz",
+      "integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==",
      "requires": {
-        "buffer": "^3.0.1",
-        "through": "^2.3.6"
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
      }
    },
    "union-value": {
@@ -12008,15 +11901,6 @@
        "camelcase": "^5.0.0",
        "decamelize": "^1.2.0"
      }
-    },
-    "yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
-      "requires": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
    }
  }
 }
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "Liberama",
-  "version": "0.4.2",
+  "version": "0.5.4",
  "engines": {
    "node": ">=10.0.0"
  },
@@ -29,7 +29,6 @@
    "clean-webpack-plugin": "^1.0.0",
    "copy-webpack-plugin": "^4.6.0",
    "css-loader": "^1.0.0",
-    "decompress-targz": "^4.1.1",
    "disable-output-webpack-plugin": "^1.0.1",
    "element-theme-chalk": "^2.4.11",
    "eslint": "^5.11.1",
@@ -59,12 +58,9 @@
    "axios": "^0.18.0",
    "chardet": "^0.7.0",
    "compression": "^1.7.3",
-    "decompress": "^4.2.0",
-    "decompress-bzip2": "^4.0.0",
-    "decompress-gz": "0.0.1",
-    "detect-file-type": "^0.2.0",
    "element-ui": "^2.4.11",
    "express": "^4.16.4",
+    "extract-zip": "^1.6.7",
    "fg-loadcss": "^2.1.0",
    "fs-extra": "^7.0.1",
    "got": "^9.5.1",
@@ -77,6 +73,8 @@
    "path-browserify": "^1.0.0",
    "sql-template-strings": "^2.2.2",
    "sqlite": "^3.0.0",
+    "tar-fs": "^2.0.0",
+    "unbzip2-stream": "^1.3.3",
    "vue": "^2.5.21",
    "vue-router": "^3.0.2",
    "vuex": "^3.0.1",
--- a/server/config/base.js
+++ b/server/config/base.js
@@ -21,6 +21,8 @@ module.exports = {
    maxTempPublicDirSize: 512*1024*1024,//512Мб
    maxUploadPublicDirSize: 200*1024*1024,//100Мб

+    useExternalBookConverter: false,
+
    servers: [
        {
            serverName: '1',
--- a/server/config/configSaver.js
+++ b/server/config/configSaver.js
@@ -5,7 +5,8 @@ const propsToSave = [
    'maxUploadFileSize',
    'maxTempPublicDirSize',
    'maxUploadPublicDirSize',
-
+    'useExternalBookConverter',
+    
    'servers',
 ];

--- a/server/core/BookConverter/ConvertBase.js
+++ b/server/core/BookConverter/ConvertBase.js
@@ -0,0 +1,142 @@
+const fs = require('fs-extra');
+const iconv = require('iconv-lite');
+const chardet = require('chardet');
+
+const textUtils = require('./textUtils');
+const utils = require('../utils');
+
+let execConverterCounter = 0;
+
+class ConvertBase {
+    constructor(config) {
+        this.config = config;
+
+        this.calibrePath = `${config.dataDir}/calibre/ebook-convert`;
+        this.sofficePath = '/usr/bin/soffice';
+        this.pdfToHtmlPath = '/usr/bin/pdftohtml';
+    }
+
+    async run(data, opts) {// eslint-disable-line no-unused-vars
+        //override
+    }
+
+    async checkExternalConverterPresent() {
+        if (!await fs.pathExists(this.calibrePath))
+            throw new Error('Внешний конвертер calibre не найден');
+
+        if (!await fs.pathExists(this.sofficePath))
+            throw new Error('Внешний конвертер LibreOffice не найден');
+
+        if (!await fs.pathExists(this.pdfToHtmlPath))
+            throw new Error('Внешний конвертер pdftohtml не найден');
+    }
+
+    async execConverter(path, args, onData) {
+        execConverterCounter++;
+        try {
+            if (execConverterCounter > 10)
+                throw new Error('Слишком большая очередь конвертирования. Пожалуйста, попробуйте позже.');
+
+            const result = await utils.spawnProcess(path, {args, onData});
+            if (result.code != 0) {
+                let error = result.code;
+                if (this.config.branch == 'development')
+                    error = `exec: ${path}, stdout: ${result.stdout}, stderr: ${result.stderr}`;
+                throw new Error(`Внешний конвертер завершился с ошибкой: ${error}`);
+            }
+        } catch(e) {
+            if (e.status == 'killed') {
+                throw new Error('Слишком долгое ожидание конвертера');
+            } else if (e.status == 'error') {
+                throw new Error(e.error);
+            } else {
+                throw new Error(e);
+            }
+        } finally {
+            execConverterCounter--;
+        }
+    }
+
+    decode(data) {
+        let selected = textUtils.getEncoding(data);
+
+        if (selected == 'ISO-8859-5') {
+            const charsetAll = chardet.detectAll(data.slice(0, 20000));
+            for (const charset of charsetAll) {
+                if (charset.name.indexOf('ISO-8859') < 0) {
+                    selected = charset.name;
+                    break;
+                }
+            }
+        }
+
+        if (selected.toLowerCase() != 'utf-8')
+            return iconv.decode(data, selected);
+        else
+            return data;
+    }
+
+    repSpaces(text) {
+        return text.replace(/&nbsp;|[\t\n\r]/g, ' ');
+    }
+
+    formatFb2(fb2) {
+        let out = '<?xml version="1.0" encoding="utf-8"?>';
+        out += '<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink">';
+        out += this.formatFb2Node(fb2);
+        out += '</FictionBook>';
+        return out;
+    }
+
+    formatFb2Node(node, name) {
+        let out = '';
+
+        if (Array.isArray(node)) {
+            for (const n of node) {
+                out += this.formatFb2Node(n);
+            }
+        } else if (typeof node == 'string') {
+            if (name)
+                out += `<${name}>${this.repSpaces(node)}</${name}>`;
+            else
+                out += this.repSpaces(node);
+        } else {
+            if (node._n)
+                name = node._n;
+
+            let attrs = '';
+            if (node._attrs) {
+                for (let attrName in node._attrs) {
+                    attrs += ` ${attrName}="${node._attrs[attrName]}"`;
+                }
+            }
+
+            let tOpen = '';
+            let tBody = '';
+            let tClose = '';
+            if (name)
+                tOpen += `<${name}${attrs}>`;
+            if (node.hasOwnProperty('_t'))
+                tBody += this.repSpaces(node._t);
+
+            for (let nodeName in node) {
+                if (nodeName && nodeName[0] == '_' && nodeName != '_a')
+                    continue;
+
+                const n = node[nodeName];
+                tBody += this.formatFb2Node(n, nodeName);
+            }
+            
+            if (name)
+                tClose += `</${name}>`;
+
+            if (attrs == '' && name == 'p' && tBody.trim() == '')
+                out += '<empty-line/>'
+            else
+                out += `${tOpen}${tBody}${tClose}`;
+        }
+        return out;
+    }
+}
+
+module.exports = ConvertBase;
--- a/server/core/BookConverter/ConvertDoc.js
+++ b/server/core/BookConverter/ConvertDoc.js
@@ -0,0 +1,33 @@
+const fs = require('fs-extra');
+const path = require('path');
+
+const ConvertDocX = require('./ConvertDocX');
+
+class ConvertDoc extends ConvertDocX {
+    check(data, opts) {
+        const {inputFiles} = opts;
+
+        return this.config.useExternalBookConverter && 
+            inputFiles.sourceFileType && inputFiles.sourceFileType.ext == 'msi';
+    }
+
+    async run(data, opts) {
+        if (!this.check(data, opts))
+            return false;
+        await this.checkExternalConverterPresent();
+
+        const {inputFiles, callback} = opts;
+
+        const outFile = `${inputFiles.filesDir}/${path.basename(inputFiles.sourceFile)}`;
+        const docFile = `${outFile}.doc`;
+        const docxFile = `${outFile}.docx`;
+        const fb2File = `${outFile}.fb2`;
+
+        await fs.copy(inputFiles.sourceFile, docFile);
+        await this.execConverter(this.sofficePath, ['--headless', '--convert-to', 'docx', '--outdir', inputFiles.filesDir, docFile]);
+
+        return await super.convert(docxFile, fb2File, callback);
+    }
+}
+
+module.exports = ConvertDoc;
--- a/server/core/BookConverter/ConvertDocX.js
+++ b/server/core/BookConverter/ConvertDocX.js
@@ -0,0 +1,49 @@
+const fs = require('fs-extra');
+const path = require('path');
+
+const ConvertBase = require('./ConvertBase');
+
+class ConvertDocX extends ConvertBase {
+    check(data, opts) {
+        const {inputFiles} = opts;
+        if (this.config.useExternalBookConverter && 
+            inputFiles.sourceFileType && inputFiles.sourceFileType.ext == 'zip') {
+            //ищем файл '[Content_Types].xml'
+            for (const file of inputFiles.files) {
+                if (file.path == '[Content_Types].xml') {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    async convert(docxFile, fb2File, callback) {
+        let perc = 0;
+        await this.execConverter(this.calibrePath, [docxFile, fb2File], () => {
+            perc = (perc < 100 ? perc + 5 : 50);
+            callback(perc);
+        });
+
+        return await fs.readFile(fb2File);
+    }
+
+    async run(data, opts) {
+        if (!this.check(data, opts))
+            return false;
+        await this.checkExternalConverterPresent();
+
+        const {inputFiles, callback} = opts;
+
+        const outFile = `${inputFiles.filesDir}/${path.basename(inputFiles.sourceFile)}`;
+        const docxFile = `${outFile}.docx`;
+        const fb2File = `${outFile}.fb2`;
+
+        await fs.copy(inputFiles.sourceFile, docxFile);
+
+        return await this.convert(docxFile, fb2File, callback);
+    }
+}
+
+module.exports = ConvertDocX;
--- a/server/core/BookConverter/ConvertEpub.js
+++ b/server/core/BookConverter/ConvertEpub.js
@@ -0,0 +1,49 @@
+const fs = require('fs-extra');
+const path = require('path');
+
+const ConvertBase = require('./ConvertBase');
+
+class ConvertEpub extends ConvertBase {
+    async check(data, opts) {
+        const {inputFiles} = opts;
+
+        if (this.config.useExternalBookConverter && 
+            inputFiles.sourceFileType && inputFiles.sourceFileType.ext == 'zip') {
+            //ищем файл 'mimetype'
+            for (const file of inputFiles.files) {
+                if (file.path == 'mimetype') {
+                    const mt = await fs.readFile(`${inputFiles.filesDir}/${file.path}`);
+                    if (mt.toString().trim() == 'application/epub+zip')
+                        return true;
+                    break;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    async run(data, opts) {
+        if (!await this.check(data, opts))
+            return false;
+        await this.checkExternalConverterPresent();
+
+        const {inputFiles, callback} = opts;
+
+        const outFile = `${inputFiles.filesDir}/${path.basename(inputFiles.sourceFile)}`;
+        const epubFile = `${outFile}.epub`;
+        const fb2File = `${outFile}.fb2`;
+
+        await fs.copy(inputFiles.sourceFile, epubFile);
+
+        let perc = 0;
+        await this.execConverter(this.calibrePath, [epubFile, fb2File], () => {
+            perc = (perc < 100 ? perc + 5 : 50);
+            callback(perc);
+        });
+
+        return await fs.readFile(fb2File);
+    }
+}
+
+module.exports = ConvertEpub;
--- a/server/core/BookConverter/ConvertFb2.js
+++ b/server/core/BookConverter/ConvertFb2.js
@@ -0,0 +1,41 @@
+const ConvertBase = require('./ConvertBase');
+const iconv = require('iconv-lite');
+
+class ConvertFb2 extends ConvertBase {
+    check(data, opts) {
+        const {dataType} = opts;
+
+        return (dataType && dataType.ext == 'xml' && data.toString().indexOf('<FictionBook') >= 0);
+    }
+
+    async run(data, opts) {
+        if (!this.check(data, opts))
+            return false;
+
+        return this.checkEncoding(data);
+    }
+
+    checkEncoding(data) {
+        let result = data;
+
+        const left = data.indexOf('<?xml version="1.0"');
+        if (left >= 0) {
+            const right = data.indexOf('?>', left);
+            if (right >= 0) {
+                const head = data.slice(left, right + 2).toString();
+                const m = head.match(/encoding="(.*)"/);
+                if (m) {
+                    let encoding = m[1].toLowerCase();
+                    if (encoding != 'utf-8') {
+                        result = iconv.decode(data, encoding);
+                        result = Buffer.from(result.toString().replace(m[0], 'encoding="utf-8"'));
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+}
+
+module.exports = ConvertFb2;
--- a/server/core/BookConverter/ConvertHtml.js
+++ b/server/core/BookConverter/ConvertHtml.js
@@ -0,0 +1,255 @@
+const ConvertBase = require('./ConvertBase');
+const sax = require('./sax');
+const textUtils = require('./textUtils');
+
+class ConvertHtml extends ConvertBase {
+    check(data, opts) {
+        const {dataType} = opts;
+
+        if (dataType && (dataType.ext == 'html' || dataType.ext == 'xml')) 
+            return {isText: false};
+
+        //может это чистый текст?
+        if (textUtils.checkIfText(data)) {
+            return {isText: true};
+        }
+
+        return false;
+    }
+
+    async run(data, opts) {
+        let isText = false;
+        if (!opts.skipCheck) {
+            const checkResult = this.check(data, opts);
+            if (!checkResult)
+                return false;
+
+            isText = checkResult.isText;
+        } else {
+            isText = opts.isText;
+        }
+        const {cutTitle} = opts;
+
+        let titleInfo = {};
+        let desc = {_n: 'description', 'title-info': titleInfo};
+        let pars = [];
+        let body = {_n: 'body', section: {_a: []}};
+        let binary = [];
+        let fb2 = [desc, body, binary];
+
+        let title = '';
+        let inTitle = false;
+        let inImage = false;
+        let image = {};
+        let bold = false;
+        let italic = false;
+
+        let spaceCounter = [];
+
+        const repCrLfTab = (text) => text.replace(/[\n\r]/g, '').replace(/\t/g, '    ');
+
+        const newParagraph = () => {
+            pars.push({_n: 'p', _t: ''});
+        };
+
+        const growParagraph = (text) => {
+            if (!pars.length)
+                newParagraph();
+
+            const l = pars.length;
+            pars[l - 1]._t += text;
+
+            //посчитаем отступы у текста, чтобы выделить потом параграфы
+            const lines = text.split('\n');
+            for (let line of lines) {
+                if (line.trim() == '')
+                    continue;
+                line = repCrLfTab(line);
+
+                let l = 0;
+                while (l < line.length && line[l] == ' ') {
+                    l++;
+                }
+                if (!spaceCounter[l])
+                    spaceCounter[l] = 0;
+                spaceCounter[l]++;
+            }
+        };
+
+        const newPara = new Set(['tr', '/table', 'hr', 'br', 'br/', 'li', 'dt', 'dd', 'p', 'title', '/title', 'h1', 'h2', 'h3', '/h1', '/h2', '/h3']);
+
+        const onTextNode = (text, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (!cutCounter && !(cutTitle && inTitle)) {
+                let tOpen = (bold ? '<strong>' : '');
+                tOpen += (italic ? '<emphasis>' : '');
+                let tClose = (italic ? '</emphasis>' : '');
+                tClose += (bold ? '</strong>' : '');
+
+                growParagraph(`${tOpen}${text}${tClose}`);
+            }
+
+            if (inTitle && !title)
+                title = text;
+
+            if (inImage) {
+                image._t = text;
+                binary.push(image);
+
+                pars.push({_n: 'image', _attrs: {'l:href': '#' + image._attrs.id}, _t: ''});
+                newParagraph();
+            }
+
+        };
+
+        const onStartNode = (tag, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (!cutCounter) {
+                if (newPara.has(tag))
+                    newParagraph();
+
+                switch (tag) {
+                    case 'i':
+                    case 'em':
+                        italic = true;
+                        break;
+                    case 'b':
+                    case 'strong':
+                    case 'h1':
+                    case 'h2':
+                    case 'h3':
+                        bold = true;
+                        break;
+                }
+            }
+
+            if (tag == 'title')
+                inTitle = true;
+
+            if (tag == 'fb2-image') {
+                inImage = true;
+                const attrs = sax.getAttrsSync(tail);
+                image = {_n: 'binary', _attrs: {id: attrs.name.value, 'content-type': attrs.type.value}, _t: ''};
+            }
+        };
+
+        const onEndNode = (tag, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (!cutCounter) {
+                if (newPara.has('/' + tag))
+                    newParagraph();
+
+                switch (tag) {
+                    case 'i':
+                    case 'em':
+                        italic = false;
+                        break;
+                    case 'b':
+                    case 'strong':
+                    case 'h1':
+                    case 'h2':
+                    case 'h3':
+                        bold = false;
+                        break;
+                }
+            }
+
+            if (tag == 'title')
+                inTitle = false;
+
+            if (tag == 'fb2-image')
+                inImage = false;
+        };
+
+        let buf = this.decode(data).toString();
+
+        sax.parseSync(buf, {
+            onStartNode, onEndNode, onTextNode,
+            innerCut: new Set(['head', 'script', 'style', 'binary', 'fb2-image'])
+        });
+
+        titleInfo['book-title'] = title;
+
+        //подозрение на чистый текст, надо разбить на параграфы
+        if (isText || pars.length < buf.length/2000) {
+            let total = 0;
+            let count = 1;
+            for (let i = 0; i < spaceCounter.length; i++) {
+                const sc = (spaceCounter[i] ? spaceCounter[i] : 0);
+                if (sc) count++;
+                total += sc;
+            }
+
+            let d = 0;
+            const mid = total/count;
+            for (let i = 0; i < spaceCounter.length; i++) {
+                const sc = (spaceCounter[i] ? spaceCounter[i] : 0);
+                if (sc > mid) d++;
+            }
+
+            let i = 0;
+            //если разброс не слишком большой, выделяем параграфы
+            if (d < 10 && spaceCounter.length) {
+                total /= 20;
+                i = spaceCounter.length - 1;
+                while (i > 0 && (!spaceCounter[i] || spaceCounter[i] < total)) i--;
+            }
+
+            const parIndent = (i > 0 ? i : 0);
+
+            let newPars = [];
+            const newPar = () => {
+                newPars.push({_n: 'p', _t: ''});
+            };
+
+            const growPar = (text) => {
+                if (!newPars.length)
+                    newPar();
+
+                const l = newPars.length;
+                newPars[l - 1]._t += text;
+            }
+
+            i = 0;
+            for (const par of pars) {
+                if (par._n != 'p') {
+                    newPars.push(par);
+                    continue;
+                }
+
+                if (i > 0)
+                    newPar();
+                i++;
+
+                let j = 0;
+                const lines = par._t.split('\n');
+                for (let line of lines) {
+                    line = repCrLfTab(line);
+
+                    let l = 0;
+                    while (l < line.length && line[l] == ' ') {
+                        l++;
+                    }
+
+                    if (l >= parIndent) {
+                        if (j > 0)
+                            newPar();
+                        j++;
+                    }
+                    growPar(line.trim() + ' ');
+                }
+            }
+
+            body.section._a[0] = newPars;
+        } else {
+            body.section._a[0] = pars;
+        }
+
+        //убираем лишнее
+        pars = body.section._a[0];
+        for (let i = 0; i < pars.length; i++)
+            pars[i]._t = this.repSpaces(pars[i]._t).trim();
+
+        return this.formatFb2(fb2);
+    }
+
+}
+
+module.exports = ConvertHtml;
--- a/server/core/BookConverter/ConvertMobi.js
+++ b/server/core/BookConverter/ConvertMobi.js
@@ -0,0 +1,37 @@
+const fs = require('fs-extra');
+const path = require('path');
+
+const ConvertBase = require('./ConvertBase');
+
+class ConvertMobi extends ConvertBase {
+    async check(data, opts) {
+        const {inputFiles} = opts;
+
+        return (this.config.useExternalBookConverter && 
+            inputFiles.sourceFileType && inputFiles.sourceFileType.ext == 'mobi');
+    }
+
+    async run(data, opts) {
+        if (!await this.check(data, opts))
+            return false;
+        await this.checkExternalConverterPresent();
+
+        const {inputFiles, callback} = opts;
+
+        const outFile = `${inputFiles.filesDir}/${path.basename(inputFiles.sourceFile)}`;
+        const mobiFile = `${outFile}.mobi`;
+        const fb2File = `${outFile}.fb2`;
+
+        await fs.copy(inputFiles.sourceFile, mobiFile);
+
+        let perc = 0;
+        await this.execConverter(this.calibrePath, [mobiFile, fb2File], () => {
+            perc = (perc < 100 ? perc + 5 : 50);
+            callback(perc);
+        });
+
+        return await fs.readFile(fb2File);
+    }
+}
+
+module.exports = ConvertMobi;
--- a/server/core/BookConverter/ConvertPdf.js
+++ b/server/core/BookConverter/ConvertPdf.js
@@ -0,0 +1,216 @@
+const fs = require('fs-extra');
+const path = require('path');
+
+const sax = require('./sax');
+const utils = require('../utils');
+const ConvertHtml = require('./ConvertHtml');
+
+class ConvertPdf extends ConvertHtml {
+    check(data, opts) {
+        const {inputFiles} = opts;
+
+        return this.config.useExternalBookConverter && 
+            inputFiles.sourceFileType && inputFiles.sourceFileType.ext == 'pdf';
+    }
+
+    async run(notUsed, opts) {
+        if (!this.check(notUsed, opts))
+            return false;
+        await this.checkExternalConverterPresent();
+
+        const {inputFiles, callback} = opts;
+
+        const outFile = `${inputFiles.filesDir}/${utils.randomHexString(10)}.xml`;
+
+        //конвертируем в xml
+        let perc = 0;
+        await this.execConverter(this.pdfToHtmlPath, ['-c', '-s', '-xml', inputFiles.sourceFile, outFile], () => {
+            perc = (perc < 80 ? perc + 10 : 40);
+            callback(perc);
+        });
+        callback(80);
+
+        const data = await fs.readFile(outFile);
+        callback(90);
+
+        //парсим xml
+        let lines = [];
+        let images = [];
+        let loading = [];
+        let inText = false;
+        let bold = false;
+        let italic = false;
+        let title = '';
+        let prevTop = 0;
+        let i = -1;
+
+        const loadImage = async(image) => {
+            const src = path.parse(image.src);
+            let type = 'unknown';
+            switch (src.ext) {
+                case '.jpg': type = 'image/jpeg'; break;
+                case '.png': type = 'image/png'; break;
+            }
+            if (type != 'unknown') {
+                image.data = (await fs.readFile(image.src)).toString('base64');
+                image.type = type;
+                image.name = src.base;
+            }
+        }
+
+        const putImage = (curTop) => {
+            if (!isNaN(curTop) && images.length) {
+                while (images.length && images[0].top < curTop) {
+                    i++;
+                    lines[i] = images[0];
+                    images.shift();
+                }
+            }
+        }
+
+        const onTextNode = (text, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (!cutCounter && inText) {
+                let tOpen = (bold ? '<b>' : '');
+                tOpen += (italic ? '<i>' : '');
+                let tClose = (italic ? '</i>' : '');
+                tClose += (bold ? '</b>' : '');
+
+                lines[i].text += `${tOpen}${text}${tClose} `;
+                if (i < 2)
+                    title += text + ' ';
+            }
+        };
+
+        const onStartNode = (tag, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (!cutCounter) {
+                if (inText) {
+                    switch (tag) {
+                        case 'i':
+                            italic = true;
+                            break;
+                        case 'b':
+                            bold = true;
+                            break;
+                    }
+                }
+
+                if (tag == 'text' && !inText) {
+                    let attrs = sax.getAttrsSync(tail);
+                    const line = {
+                        text: '',
+                        top: parseInt((attrs.top && attrs.top.value ? attrs.top.value : null), 10),
+                        left: parseInt((attrs.left && attrs.left.value ? attrs.left.value : null), 10),
+                        width: parseInt((attrs.width && attrs.width.value ? attrs.width.value : null), 10),
+                        height: parseInt((attrs.height && attrs.height.value ? attrs.height.value : null), 10),
+                    };
+
+                    if (line.width != 0 || line.height != 0) {
+                        inText = true;
+                        if (isNaN(line.top) || isNaN(prevTop) || (Math.abs(prevTop - line.top) > 3)) {
+                            putImage(line.top);
+                            i++;
+                            lines[i] = line;
+                        }
+                        prevTop = line.top;
+                    }
+                }
+
+                if (tag == 'image') {
+                    const attrs = sax.getAttrsSync(tail);
+                    const src = (attrs.src && attrs.src.value ? attrs.src.value : '');
+                    if (src) {
+                        const image = {
+                            isImage: true,
+                            src,
+                            data: '',
+                            type: '',
+                            top: parseInt((attrs.top && attrs.top.value ? attrs.top.value : null), 10) || 0,
+                        };
+                        loading.push(loadImage(image));
+                        images.push(image);
+                        images.sort((a, b) => a.top - b.top)
+                    }
+                }
+
+                if (tag == 'page') {
+                    putImage(100000);
+                }
+            }
+        };
+
+        const onEndNode = (tag, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (inText) {
+                switch (tag) {
+                    case 'i':
+                        italic = false;
+                        break;
+                    case 'b':
+                        bold = false;
+                        break;
+                }
+            }
+
+            if (tag == 'text')
+                inText = false;
+        };
+
+        let buf = this.decode(data).toString();
+        sax.parseSync(buf, {
+            onStartNode, onEndNode, onTextNode
+        });
+
+        putImage(100000);
+
+        await Promise.all(loading);
+
+        //найдем параграфы и отступы
+        const indents = [];
+        for (const line of lines) {
+            if (line.isImage)
+                continue;
+            if (!isNaN(line.left)) {
+                indents[line.left] = 1;
+            }
+        }
+
+        let j = 0;
+        for (let i = 0; i < indents.length; i++) {
+            if (indents[i]) {
+                j++;
+                indents[i] = j;
+            }
+        }
+        indents[0] = 0;
+
+        //формируем текст
+        let text = `<title>${title}</title>`;
+        let concat = '';
+        let sp = '';
+        for (const line of lines) {
+            if (line.isImage) {
+                text += `<fb2-image type="${line.type}" name="${line.name}">${line.data}</fb2-image>`;
+                continue;
+            }
+
+            if (concat == '') {
+                const left = line.left || 0;
+                sp = ' '.repeat(indents[left]);
+            }
+
+            let t = line.text.trim();
+            if (t.substr(-1) == '-') {
+                t = t.substr(0, t.length - 1);
+                concat += t;
+            } else {
+                text += sp + concat + t + "\n";
+                concat = '';
+            }
+        }
+        if (concat)
+            text += sp + concat + "\n";
+
+        return await super.run(Buffer.from(text), {skipCheck: true, isText: true, cutTitle: true});
+    }
+}
+
+module.exports = ConvertPdf;
--- a/server/core/BookConverter/ConvertRtf.js
+++ b/server/core/BookConverter/ConvertRtf.js
@@ -0,0 +1,33 @@
+const fs = require('fs-extra');
+const path = require('path');
+
+const ConvertDocX = require('./ConvertDocX');
+
+class ConvertRtf extends ConvertDocX {
+    check(data, opts) {
+        const {inputFiles} = opts;
+
+        return this.config.useExternalBookConverter && 
+            inputFiles.sourceFileType && inputFiles.sourceFileType.ext == 'rtf';
+    }
+
+    async run(data, opts) {
+        if (!this.check(data, opts))
+            return false;
+        await this.checkExternalConverterPresent();
+
+        const {inputFiles, callback} = opts;
+
+        const outFile = `${inputFiles.filesDir}/${path.basename(inputFiles.sourceFile)}`;
+        const rtfFile = `${outFile}.rtf`;
+        const docxFile = `${outFile}.docx`;
+        const fb2File = `${outFile}.fb2`;
+
+        await fs.copy(inputFiles.sourceFile, rtfFile);
+        await this.execConverter(this.sofficePath, ['--headless', '--convert-to', 'docx', '--outdir', inputFiles.filesDir, rtfFile]);
+
+        return await super.convert(docxFile, fb2File, callback);
+    }
+}
+
+module.exports = ConvertRtf;
--- a/server/core/BookConverter/ConvertSamlib.js
+++ b/server/core/BookConverter/ConvertSamlib.js
@@ -0,0 +1,276 @@
+const _ = require('lodash');
+const URL = require('url').URL;
+
+const sax = require('./sax');
+const ConvertBase = require('./ConvertBase');
+
+class ConvertSamlib extends ConvertBase {
+    check(data, opts) {
+        const {url, dataType} = opts;
+
+        const parsedUrl = new URL(url);
+        if (dataType && dataType.ext == 'html' &&
+            (parsedUrl.hostname == 'samlib.ru' ||
+            parsedUrl.hostname == 'budclub.ru' ||
+            parsedUrl.hostname == 'zhurnal.lib.ru')) {
+            return {hostname: parsedUrl.hostname};
+        }
+
+        return false;
+    }
+
+    async run(data, opts) {
+        const checkResult = this.check(data, opts);
+        if (!checkResult)
+            return false;
+
+        const {hostname} = checkResult;
+        let titleInfo = {};
+        let desc = {_n: 'description', 'title-info': titleInfo};
+        let pars = [];
+        let body = {_n: 'body', section: {_a: pars}};
+        let fb2 = [desc, body];
+
+        let inSubtitle = false;
+        let inJustify = true;
+        let inImage = false;
+        let isFirstPara = false;
+        let path = '';
+        let tag = '';// eslint-disable-line no-unused-vars
+
+        let inText = false;
+        let textFound = false;
+        let node = {_a: pars};
+
+        let inPara = false;
+        let italic = false;
+        let bold = false;
+
+        const openTag = (name, attrs) => {
+            if (name == 'p')
+                inPara = true;
+            let n = {_n: name, _attrs: attrs, _a: [], _p: node};
+            node._a.push(n);
+            node = n;
+        };
+
+        const closeTag = (name) => {
+            if (name == 'p')
+                inPara = false;
+            if (node._p) {
+                const exact = (node._n == name);
+                node = node._p;
+                if (!exact)
+                    closeTag(name);
+            }
+        };
+
+        const growParagraph = (text) => {
+            if (!node._p) {
+                if (text.trim() != '')
+                    openTag('p');
+                else
+                    return;
+            }
+            if (node._n == 'p' && node._a.length == 0)
+                text = text.trimLeft();
+            node._a.push({_t: text});
+        };
+
+        const onStartNode = (elemName, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (elemName == '')
+                return;
+            if (!inText) {
+                path += '/' + elemName;
+                tag = elemName;
+            } else {
+                switch (elemName) {
+                    case 'li':
+                    case 'p':
+                    case 'dd':
+                    case 'br':
+                        if (!(inSubtitle && isFirstPara)) {
+                            if (inPara)
+                                closeTag('p');
+                            openTag('p');
+                        }
+                        isFirstPara = false;
+                        break;
+                    case 'h1':
+                    case 'h2':
+                    case 'h3':
+                        if (inPara)
+                            closeTag('p');
+                        openTag('p');
+                        bold = true;
+                        break;
+                    case 'i':
+                    case 'em':
+                        italic = true;
+                        break;
+                    case 'b':
+                    case 'strong':
+                        bold = true;
+                        break;
+                    case 'div':
+                        if (inPara)
+                            closeTag('p');
+                        if (tail.indexOf('align="center"') >= 0) {
+                            openTag('subtitle');
+                            inSubtitle = true;
+                            isFirstPara = true;
+                        }
+
+                        if (tail.indexOf('align="justify"') >= 0) {
+                            openTag('p');
+                            inJustify = true;
+                        }
+
+                        break;
+                    case 'img': {
+                        if (inPara)
+                            closeTag('p');
+                        const attrs = sax.getAttrsSync(tail);
+                        if (attrs.src && attrs.src.value) {
+                            let href = attrs.src.value;
+                            if (href[0] == '/')
+                                href = `http://${hostname}${href}`;
+                            openTag('image', {'l:href': href});
+                            inImage = true;
+                        }
+                        break;
+                    }
+                }
+            }
+        };
+
+        const onEndNode = (elemName, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+            if (!inText) {
+                const oldPath = path;
+                let t = '';
+                do  {
+                    let i = path.lastIndexOf('/');
+                    t = path.substr(i + 1);
+                    path = path.substr(0, i);
+                } while (t != elemName && path);
+
+                if (t != elemName) {
+                    path = oldPath;
+                }
+
+                let i = path.lastIndexOf('/');
+                tag = path.substr(i + 1);
+            } else {
+                switch (elemName) {
+                    case 'li':
+                    case 'p':
+                    case 'dd':
+                        closeTag('p');
+                        break;
+                    case 'h1':
+                    case 'h2':
+                    case 'h3':
+                        closeTag('p');
+                        bold = false;
+                        break;
+                    case 'i':
+                    case 'em':
+                        italic = false;
+                        break;
+                    case 'b':
+                    case 'strong':
+                        bold = false;
+                        break;
+                    case 'div':
+                        if (inSubtitle) {
+                            closeTag('subtitle');
+                            inSubtitle = false;
+                            isFirstPara = false;
+                        }
+
+                        if (inJustify) {
+                            closeTag('p');
+                            inJustify = false;
+                        }
+                        break;
+                    case 'img':
+                        if (inImage)
+                            closeTag('image');
+                        inImage = false;
+                        break;
+                }
+            }
+        };
+
+        const onComment = (text) => {// eslint-disable-line no-unused-vars
+            if (text == '--------- Собственно произведение -------------') {
+                inText = true;
+                textFound = true;
+            }
+            if (text == '-----------------------------------------------')
+                inText = false;
+        };
+
+        const onTextNode = (text) => {// eslint-disable-line no-unused-vars
+            if (text && text.trim() == '')
+                text = (text.indexOf(' ') >= 0 ? ' ' : '');
+
+            if (!text)
+                return;
+
+            switch (path) {
+                case '/html/body/center/h2':
+                    titleInfo['book-title'] = text;
+                    return;
+                case '/html/body/div/h3':
+                    if (!titleInfo.author)
+                        titleInfo.author = {};
+                    text = text.replace(':', '').trim().split(' ');
+                    if (text[0])
+                        titleInfo.author['last-name'] = text[0];
+                    if (text[1])
+                        titleInfo.author['first-name'] = text[1];
+                    if (text[2])
+                        titleInfo.author['middle-name'] = text[2];
+                    return;
+            }
+
+            let tOpen = (bold ? '<strong>' : '');
+            tOpen += (italic ? '<emphasis>' : '');
+            let tClose = (italic ? '</emphasis>' : '');
+            tClose += (bold ? '</strong>' : '');
+
+            if (inText)
+                growParagraph(`${tOpen}${text}${tClose}`);
+        };
+
+        sax.parseSync(this.decode(data).toString().replace(/&nbsp;/g, ' '), {
+            onStartNode, onEndNode, onTextNode, onComment,
+            innerCut: new Set(['head', 'script', 'style'])
+        });
+
+        //текст не найден на странице, обработать корректно не получилось
+        if (!textFound)
+            return false;
+
+        const title = (titleInfo['book-title'] ? titleInfo['book-title'] : '');
+        let author = '';
+        if (titleInfo.author) {
+            author = _.compact([
+                (titleInfo.author['last-name'] ? titleInfo.author['last-name'] : ''),
+                (titleInfo.author['first-name'] ? titleInfo.author['first-name'] : ''),
+                (titleInfo.author['middle-name'] ? titleInfo.author['middle-name'] : ''),
+            ]).join(' ');
+        }
+
+        pars.unshift({_n: 'title', _a: [
+            {_n: 'p', _t: author}, {_n: 'p', _t: ''},
+            {_n: 'p', _t: title}, {_n: 'p', _t: ''},
+        ]})
+
+        return this.formatFb2(fb2);
+    }
+
+}
+
+module.exports = ConvertSamlib;
--- a/server/core/BookConverter/index.js
+++ b/server/core/BookConverter/index.js
@@ -1,497 +1,57 @@
 const fs = require('fs-extra');
-const URL = require('url').URL;
-const iconv = require('iconv-lite');
-const chardet = require('chardet');
-const _ = require('lodash');
-const sax = require('./sax');
-const textUtils = require('./textUtils');
-
 const FileDetector = require('../FileDetector');

-const repSpaces = (text) => text.replace(/&nbsp;|[\t\n\r]/g, ' ');
-const repSpaces2 = (text) => text.replace(/[\n\r]/g, '');
+//порядок важен
+const convertClassFactory = [
+    require('./ConvertEpub'),
+    require('./ConvertPdf'),
+    require('./ConvertRtf'),
+    require('./ConvertDocX'),
+    require('./ConvertDoc'),
+    require('./ConvertMobi'),
+    require('./ConvertFb2'),
+    require('./ConvertSamlib'),
+    require('./ConvertHtml'),
+];

 class BookConverter {
-    constructor() {
+    constructor(config) {
        this.detector = new FileDetector();
+
+        this.convertFactory = [];
+        for (const convertClass of convertClassFactory) {
+            this.convertFactory.push(new convertClass(config));
+        }
    }

-    async convertToFb2(inputFile, outputFile, url, callback) {
-        const fileType = await this.detector.detectFile(inputFile);
-        
-        const data = await fs.readFile(inputFile);
-        callback(100);
+    async convertToFb2(inputFiles, outputFile, url, callback) {
+        const selectedFileType = await this.detector.detectFile(inputFiles.selectedFile);
+        const data = await fs.readFile(inputFiles.selectedFile);

-        if (fileType && (fileType.ext == 'html' || fileType.ext == 'xml')) {
-            if (data.toString().indexOf('<FictionBook') >= 0) {
-                await fs.writeFile(outputFile, this.checkEncoding(data));
-                return;
+        let result = false;
+        for (const convert of this.convertFactory) {
+            result = await convert.run(data, {inputFiles, url, callback, dataType: selectedFileType});
+            if (result) {
+                await fs.writeFile(outputFile, result);
+                break;
            }
+        }

-            const parsedUrl = new URL(url);
-            if (parsedUrl.hostname == 'samlib.ru' ||
-                parsedUrl.hostname == 'budclub.ru' ||
-                parsedUrl.hostname == 'zhurnal.lib.ru') {
-                await fs.writeFile(outputFile, this.convertSamlib(data, parsedUrl.hostname));
-                return;
-            }
+        if (!result && inputFiles.nesting) {
+            result = await this.convertToFb2(inputFiles.nesting, outputFile, url, callback);
+        }

-            await fs.writeFile(outputFile, this.convertHtml(data));
-            return;
-        } else {
-            if (fileType)
-                throw new Error(`Этот формат файла не поддерживается: ${fileType.mime}`);
+        if (!result) {
+            if (selectedFileType)
+                throw new Error(`Этот формат файла не поддерживается: ${selectedFileType.mime}`);
            else {
-                //может это чистый текст?
-                if (textUtils.checkIfText(data)) {
-                    await fs.writeFile(outputFile, this.convertHtml(data, true));
-                    return;
-                }
-
                throw new Error(`Не удалось определить формат файла: ${url}`);
            }
        }
-    }
-
-    decode(data) {
-        let selected = textUtils.getEncoding(data);
-
-        if (selected == 'ISO-8859-5') {
-            const charsetAll = chardet.detectAll(data.slice(0, 20000));
-            for (const charset of charsetAll) {
-                if (charset.name.indexOf('ISO-8859') < 0) {
-                    selected = charset.name;
-                    break;
-                }
-            }
-        }
-
-        return iconv.decode(data, selected);
-    }
-
-    checkEncoding(data) {
-        let result = data;
-
-        const left = data.indexOf('<?xml version="1.0"');
-        if (left >= 0) {
-            const right = data.indexOf('?>', left);
-            if (right >= 0) {
-                const head = data.slice(left, right + 2).toString();
-                const m = head.match(/encoding="(.*)"/);
-                if (m) {
-                    let encoding = m[1].toLowerCase();
-                    if (encoding != 'utf-8') {
-                        result = iconv.decode(data, encoding);
-                        result = Buffer.from(result.toString().replace(m[0], 'encoding="utf-8"'));
-                    }
-                }
-            }
-        }

+        callback(100);
        return result;
    }
-
-    convertHtml(data, isText) {
-        let titleInfo = {};
-        let desc = {_n: 'description', 'title-info': titleInfo};
-        let pars = [];
-        let body = {_n: 'body', section: {_a: []}};
-        let fb2 = [desc, body];
-
-        let title = '';
-        let inTitle = false;
-
-        let spaceCounter = [];
-
-        const newParagraph = () => {
-            pars.push({_n: 'p', _t: ''});
-        };
-
-        const growParagraph = (text) => {
-            const l = pars.length;
-            if (l) {
-                if (pars[l - 1]._t == '')
-                    text = text.trimLeft();
-                pars[l - 1]._t += text;
-            }
-
-            //посчитаем отступы у текста, чтобы выделить потом параграфы
-            const lines = text.split('\n');
-            for (const line of lines) {
-                const sp = line.split(' ');
-                let l = 0;
-                while (l < sp.length && sp[l].trim() == '') {
-                    l++;
-                }
-                if (!spaceCounter[l])
-                    spaceCounter[l] = 0;
-                spaceCounter[l]++;
-            }
-        };
-
-        newParagraph();
-        const newPara = new Set(['tr', 'br', 'br/', 'dd', 'p', 'title', '/title', 'h1', 'h2', 'h3', '/h1', '/h2', '/h3']);
-
-        const onTextNode = (text, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
-            if (!cutCounter) {
-                growParagraph(text);
-            }
-
-            if (inTitle && !title)
-                title = text;
-        };
-
-        const onStartNode = (tag, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
-            if (!cutCounter) {
-                if (newPara.has(tag))
-                    newParagraph();
-            }
-
-            if (tag == 'title')
-                inTitle = true;
-        };
-
-        const onEndNode = (tag, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
-            if (tag == 'title')
-                inTitle = false;
-        };
-
-        let buf = this.decode(data).toString();
-
-        sax.parseSync(buf, {
-            onStartNode, onEndNode, onTextNode,
-            innerCut: new Set(['head', 'script', 'style'])
-        });
-
-        titleInfo['book-title'] = title;
-
-        //подозрение на чистый текст, надо разбить на параграфы
-        if (isText || pars.length < buf.length/2000) {
-            let total = 0;
-            for (let i = 0; i < spaceCounter.length; i++) {
-                total += (spaceCounter[i] ? spaceCounter[i] : 0);
-            }
-            total /= 10;
-            let i = spaceCounter.length - 1;
-            while (i > 0 && (!spaceCounter[i] || spaceCounter[i] < total)) i--;
-
-            const parIndent = (i > 0 ? i : 0);
-
-            let newPars = [];
-            const newPar = () => {
-                newPars.push({_n: 'p', _t: ''});
-            };
-
-            const growPar = (text) => {
-                const l = newPars.length;
-                if (l) {
-                    newPars[l - 1]._t += text;
-                }
-            }
-
-            for (const par of pars) {
-                newPar();
-
-                const lines = par._t.split('\n');
-                for (const line of lines) {
-                    const sp = line.split(' ');
-                    let l = 0;
-                    while (l < sp.length && sp[l].trim() == '') {
-                        l++;
-                    }
-                    if (l >= parIndent)
-                        newPar();
-                    growPar(line.trim() + ' ');
-                }
-            }
-
-            body.section._a[0] = newPars;
-        } else {
-            body.section._a[0] = pars;
-        }
-
-        //убираем лишнее
-        for (let i = 0; i < pars.length; i++)
-            pars[i]._t = repSpaces(pars[i]._t).trim();
-
-        return this.formatFb2(fb2);
-    }
-
-    convertSamlib(data, hostname) {
-        let titleInfo = {};
-        let desc = {_n: 'description', 'title-info': titleInfo};
-        let pars = [];
-        let body = {_n: 'body', section: {_a: pars}};
-        let fb2 = [desc, body];
-
-        let inSubtitle = false;
-        let inJustify = true;
-        let inImage = false;
-        let path = '';
-        let tag = '';// eslint-disable-line no-unused-vars
-
-        let inText = false;
-        let textFound = false;
-        let node = {_a: pars};
-
-        let inPara = false;
-        let italic = false;
-        let bold = false;
-
-        const openTag = (name, attrs) => {
-            if (name == 'p')
-                inPara = true;
-            let n = {_n: name, _attrs: attrs, _a: [], _p: node};
-            node._a.push(n);
-            node = n;
-        };
-
-        const closeTag = (name) => {
-            if (name == 'p')
-                inPara = false;
-            if (node._p) {
-                const exact = (node._n == name);
-                node = node._p;
-                if (!exact)
-                    closeTag(name);
-            }
-        };
-
-        const growParagraph = (text) => {
-            if (node._n == 'p' && node._a.length == 0)
-                text = text.trimLeft();
-            node._a.push({_t: text});
-        };
-
-        openTag('p');
-
-        const onStartNode = (elemName, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
-            if (elemName == '')
-                return;
-            if (!inText) {
-                path += '/' + elemName;
-                tag = elemName;
-            } else {
-                if (inPara && elemName != 'i' && elemName != 'b' && elemName != 'em' && elemName != 'strong' && elemName != 'img')
-                    closeTag('p');
-
-                switch (elemName) {
-                    case 'li':
-                    case 'p':
-                    case 'dd':
-                    case 'h1':
-                    case 'h2':
-                    case 'h3':
-                    case 'br':
-                        openTag('p');
-                        break;
-                    case 'i':
-                    case 'em':
-                        italic = true;
-                        break;
-                    case 'b':
-                    case 'strong':
-                        bold = true;
-                        break;
-                    case 'div':
-                        if (tail.indexOf('align="center"') >= 0) {
-                            openTag('subtitle');
-                            inSubtitle = true;
-                        }
-
-                        if (tail.indexOf('align="justify"') >= 0) {
-                            openTag('p');
-                            inJustify = true;
-                        }
-
-                        break;
-                    case 'img': {
-                        const attrs = sax.getAttrsSync(tail);
-                        if (attrs.src && attrs.src.value) {
-                            let href = attrs.src.value;
-                            if (href[0] == '/')
-                                href = `http://${hostname}${href}`;
-                            openTag('image', {href});
-                            inImage = true;
-                        }
-                        break;
-                    }
-                }
-            }
-        };
-
-        const onEndNode = (elemName, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
-            if (!inText) {
-                const oldPath = path;
-                let t = '';
-                do  {
-                    let i = path.lastIndexOf('/');
-                    t = path.substr(i + 1);
-                    path = path.substr(0, i);
-                } while (t != elemName && path);
-
-                if (t != elemName) {
-                    path = oldPath;
-                }
-
-                let i = path.lastIndexOf('/');
-                tag = path.substr(i + 1);
-            } else {
-                switch (elemName) {
-                    case 'li':
-                    case 'p':
-                    case 'dd':
-                    case 'h1':
-                    case 'h2':
-                    case 'h3':
-                        closeTag('p');
-                        break;
-                    case 'i':
-                    case 'em':
-                        italic = false;
-                        break;
-                    case 'b':
-                    case 'strong':
-                        bold = false;
-                        break;
-                    case 'div':
-                        if (inSubtitle) {
-                            closeTag('subtitle');
-                            inSubtitle = false;
-                        }
-
-                        if (inJustify) {
-                            closeTag('p');
-                            inJustify = false;
-                        }
-                        break;
-                    case 'img':
-                        if (inImage)
-                            closeTag('image');
-                        inImage = false;
-                        break;
-                }
-            }
-        };
-
-        const onComment = (text) => {// eslint-disable-line no-unused-vars
-            if (text == '--------- Собственно произведение -------------') {
-                inText = true;
-                textFound = true;
-            }
-            if (text == '-----------------------------------------------')
-                inText = false;
-        };
-
-        const onTextNode = (text) => {// eslint-disable-line no-unused-vars
-            if (text != ' ' && text.trim() == '')
-                text = text.trim();
-
-            if (text == '')
-                return;
-
-            switch (path) {
-                case '/html/body/center/h2':
-                    titleInfo['book-title'] = text;
-                    return;
-                case '/html/body/div/h3':
-                    if (!titleInfo.author)
-                        titleInfo.author = {};
-                    text = text.replace(':', '').trim().split(' ');
-                    if (text[0])
-                        titleInfo.author['last-name'] = text[0];
-                    if (text[1])
-                        titleInfo.author['first-name'] = text[1];
-                    if (text[2])
-                        titleInfo.author['middle-name'] = text[2];
-                    return;
-            }
-
-            let tOpen = (bold ? '<strong>' : '');
-            tOpen += (italic ? '<emphasis>' : '');
-            let tClose = (italic ? '</emphasis>' : '');
-            tClose += (bold ? '</strong>' : '');
-
-            if (inText)
-                growParagraph(`${tOpen}${text}${tClose}`);
-        };
-
-        sax.parseSync(repSpaces(repSpaces2(this.decode(data).toString())), {
-            onStartNode, onEndNode, onTextNode, onComment,
-            innerCut: new Set(['head', 'script', 'style'])
-        });
-
-        //текст не найден на странице, обрабатываем как html
-        if (!textFound)
-            return this.convertHtml(data);
-
-        const title = (titleInfo['book-title'] ? titleInfo['book-title'] : '');
-        let author = '';
-        if (titleInfo.author) {
-            author = _.compact([
-                (titleInfo.author['last-name'] ? titleInfo.author['last-name'] : ''),
-                (titleInfo.author['first-name'] ? titleInfo.author['first-name'] : ''),
-                (titleInfo.author['middle-name'] ? titleInfo.author['middle-name'] : ''),
-            ]).join(' ');
-        }
-
-        pars.unshift({_n: 'title', _a: [
-            {_n: 'p', _t: author}, {_n: 'p', _t: ''},
-            {_n: 'p', _t: title}, {_n: 'p', _t: ''},
-        ]})
-
-        return this.formatFb2(fb2);
-    }
-
-    formatFb2(fb2) {
-        let out = '<?xml version="1.0" encoding="utf-8"?>';
-        out += '<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink">';
-        out += this.formatFb2Node(fb2);
-        out += '</FictionBook>';
-        return out;
-    }
-
-    formatFb2Node(node, name) {
-        let out = '';
-
-        if (Array.isArray(node)) {
-            for (const n of node) {
-                out += this.formatFb2Node(n);
-            }
-        } else if (typeof node == 'string') {
-            if (name)
-                out += `<${name}>${repSpaces(node)}</${name}>`;
-            else
-                out += repSpaces(node);
-        } else {
-            if (node._n)
-                name = node._n;
-
-            let attrs = '';
-            if (node._attrs) {
-                for (let attrName in node._attrs) {
-                    attrs += ` ${attrName}="${node._attrs[attrName]}"`;
-                }
-            }
-
-            if (name)
-                out += `<${name}${attrs}>`;
-            if (node.hasOwnProperty('_t'))
-                out += repSpaces(node._t);
-
-            for (let nodeName in node) {
-                if (nodeName && nodeName[0] == '_' && nodeName != '_a')
-                    continue;
-
-                const n = node[nodeName];
-                out += this.formatFb2Node(n, nodeName);
-            }
-            
-            if (name)
-                out += `</${name}>`;
-        }
-        return out;
-    }
 }

 module.exports = BookConverter;
--- a/server/core/BookConverter/textUtils.js
+++ b/server/core/BookConverter/textUtils.js
@@ -1,4 +1,4 @@
-function getEncoding(buf) {
+function getEncoding(buf, returnAll) {
    const lowerCase = 3;
    const upperCase = 1;

@@ -8,6 +8,7 @@ function getEncoding(buf) {
        'd': 'cp866',
        'i': 'ISO-8859-5',
        'm': 'maccyrillic',
+        'u': 'utf-8',
    };

    let charsets = {
@@ -15,38 +16,47 @@ function getEncoding(buf) {
        'w': 0,
        'd': 0,
        'i': 0,
-        'm': 0
+        'm': 0,
+        'u': 0,
    };

    const len = buf.length;
    const blockSize = (len > 5*3000 ? 3000 : len);
    let counter = 0;
    let i = 0;
+    let totalChecked = 0;
    while (i < len) {
        const char = buf[i];
+        const nextChar = (i < len - 1 ? buf[i + 1] : 0);
+        totalChecked++;
        i++;
        //non-russian characters
        if (char < 128 || char > 256)
            continue;
-        //CP866
-        if ((char > 159 && char < 176) || (char > 223 && char < 242)) charsets['d'] += lowerCase;
-        if ((char > 127 && char < 160)) charsets['d'] += upperCase;
+        //UTF-8
+        if ((char == 208 || char == 209) && nextChar >= 128 && nextChar <= 190)
+            charsets['u'] += lowerCase;
+        else {
+            //CP866
+            if ((char > 159 && char < 176) || (char > 223 && char < 242)) charsets['d'] += lowerCase;
+            if ((char > 127 && char < 160)) charsets['d'] += upperCase;

-        //KOI8-R
-        if ((char > 191 && char < 223)) charsets['k'] += lowerCase;
-        if ((char > 222 && char < 256)) charsets['k'] += upperCase;
+            //KOI8-R
+            if ((char > 191 && char < 223)) charsets['k'] += lowerCase;
+            if ((char > 222 && char < 256)) charsets['k'] += upperCase;

-        //WIN-1251
-        if (char > 223 && char < 256) charsets['w'] += lowerCase;
-        if (char > 191 && char < 224) charsets['w'] += upperCase;
+            //WIN-1251
+            if (char > 223 && char < 256) charsets['w'] += lowerCase;
+            if (char > 191 && char < 224) charsets['w'] += upperCase;

-        //MAC
-        if (char > 221 && char < 255) charsets['m'] += lowerCase;
-        if (char > 127 && char < 160) charsets['m'] += upperCase;
+            //MAC
+            if (char > 221 && char < 255) charsets['m'] += lowerCase;
+            if (char > 127 && char < 160) charsets['m'] += upperCase;

-        //ISO-8859-5
-        if (char > 207 && char < 240) charsets['i'] += lowerCase;
-        if (char > 175 && char < 208) charsets['i'] += upperCase;
+            //ISO-8859-5
+            if (char > 207 && char < 240) charsets['i'] += lowerCase;
+            if (char > 175 && char < 208) charsets['i'] += upperCase;
+        }

        counter++;

@@ -57,18 +67,24 @@ function getEncoding(buf) {
    }

    let sorted = Object.keys(charsets).map(function(key) {
-        return { codePage: codePage[key], c: charsets[key] };
+        return { codePage: codePage[key], c: charsets[key], totalChecked };
    });

    sorted.sort((a, b) => b.c - a.c);

-    if (sorted[0].c > 0)
+    if (returnAll)
+        return sorted;
+    else if (sorted[0].c > 0)
        return sorted[0].codePage;
    else
        return 'ISO-8859-5';
 }

 function checkIfText(buf) {
+    const enc = getEncoding(buf, true);
+    if (enc[0].c > enc[0].totalChecked*0.9)
+        return true;
+
    let spaceCount = 0;
    let crCount = 0;
    let lfCount = 0;
--- a/server/core/FileDecompressor.js
+++ b/server/core/FileDecompressor.js
@@ -2,11 +2,11 @@ const fs = require('fs-extra');
 const zlib = require('zlib');
 const crypto = require('crypto');
 const path = require('path');
-const utils = require('./utils');
-const decompress = require('decompress');
-const decompressGz = require('decompress-gz');
-const decompressBzip2 = require('decompress-bzip2');
+const extractZip = require('extract-zip');
+const unbzip2Stream = require('unbzip2-stream');
+const tar = require('tar-fs')

+const utils = require('./utils');
 const FileDetector = require('./FileDetector');

 class FileDecompressor {
@@ -14,54 +14,188 @@ class FileDecompressor {
        this.detector = new FileDetector();
    }

-    async decompressFile(filename, outputDir) {
+    async decompressNested(filename, outputDir) {
+        await fs.ensureDir(outputDir);
+        
        const fileType = await this.detector.detectFile(filename);

-        if (!fileType || !(fileType.ext == 'zip' || fileType.ext == 'bz2' || fileType.ext == 'gz'))
-            return filename;
+        let result = {
+            sourceFile: filename,
+            sourceFileType: fileType,
+            selectedFile: filename,
+            filesDir: outputDir,
+            files: []
+        };

-        //дурной decompress, поэтому в 2 этапа
-        //этап 1
-        let files = [];
-        try {
-            files = await decompress(filename, outputDir);
-        } catch (e) {
-            //
+        if (!fileType || !(fileType.ext == 'zip' || fileType.ext == 'bz2' || fileType.ext == 'gz' || fileType.ext == 'tar')) {
+            return result;
        }

-        //этап 2
-        if (files.length == 0) {
-            try {
-                files = await decompress(filename, outputDir, {
-                    inputFile: filename,
-                    plugins: [
-                        decompressGz(),
-                        decompressBzip2({path: path.basename(filename)}),
-                    ]
-                });
-            } catch (e) {
-                //
-            }
-        }
-        
-        let result = filename;
+        result.files = await this.decompressTarZZ(fileType.ext, filename, outputDir);
+
+        let sel = filename;
        let max = 0;
-        if (files.length) {
+        if (result.files.length) {
            //ищем файл с максимальным размером
-            for (let file of files) {
-                if (file.data.length > max) {
-                    result = `${outputDir}/${file.path}`;
-                    max = file.data.length;
+            for (let file of result.files) {
+                if (file.size > max) {
+                    sel = `${outputDir}/${file.path}`;
+                    max = file.size;
                }
            }
        }
-        //дурной decompress
-        if (result != filename)
-            await fs.chmod(result, 0o664);
+        result.selectedFile = sel;
+
+        if (sel != filename) {
+            result.nesting = await this.decompressNested(sel, `${outputDir}/${utils.randomHexString(10)}`);
+        }

        return result;
    }

+    async unpack(filename, outputDir) {
+        const fileType = await this.detector.detectFile(filename);
+        if (!fileType)
+            throw new Error('Не удалось определить формат файла');
+
+        return await this.decompress(fileType.ext, filename, outputDir);
+    }
+
+    async unpackTarZZ(filename, outputDir) {
+        const fileType = await this.detector.detectFile(filename);
+        if (!fileType)
+            throw new Error('Не удалось определить формат файла');
+
+        return await this.decompressTarZZ(fileType.ext, filename, outputDir);
+    }
+
+    async decompressTarZZ(fileExt, filename, outputDir) {
+        const files = await this.decompress(fileExt, filename, outputDir);
+        if (fileExt == 'tar' || files.length != 1)
+            return files;
+
+        const tarFilename = `${outputDir}/${files[0].path}`;
+        const fileType = await this.detector.detectFile(tarFilename);
+        if (!fileType || fileType.ext != 'tar')
+            return files;
+
+        const newTarFilename = `${outputDir}/${utils.randomHexString(30)}`;
+        await fs.rename(tarFilename, newTarFilename);
+        
+        const tarFiles = await this.decompress('tar', newTarFilename, outputDir);
+        await fs.remove(newTarFilename);
+
+        return tarFiles;
+    }
+
+    async decompress(fileExt, filename, outputDir) {
+        let files = [];
+
+        switch (fileExt) {
+            case 'zip':
+                files = await this.unZip(filename, outputDir);
+                break;
+            case 'bz2':
+                files = await this.unBz2(filename, outputDir);
+                break;
+            case 'gz':
+                files = await this.unGz(filename, outputDir);
+                break;
+            case 'tar':
+                files = await this.unTar(filename, outputDir);
+                break;
+            default:
+                throw new Error(`FileDecompressor: неизвестный формат файла '${fileExt}'`);
+        }
+
+        return files;
+    }
+
+    async unZip(filename, outputDir) {
+        return new Promise((resolve, reject) => {
+            const files = [];
+            extractZip(filename, {
+                dir: outputDir,
+                onEntry: (entry) => {
+                    files.push({path: entry.fileName, size: entry.uncompressedSize});
+                }
+            }, (err) => {
+                if (err)
+                    reject(err);
+                resolve(files);
+            });
+        });
+    }
+
+    unBz2(filename, outputDir) {
+        return this.decompressByStream(unbzip2Stream(), filename, outputDir);
+    }
+
+    unGz(filename, outputDir) {
+        return this.decompressByStream(zlib.createGunzip(), filename, outputDir);
+    }
+
+    unTar(filename, outputDir) {
+        return new Promise((resolve, reject) => {
+            const files = [];
+
+            const tarExtract = tar.extract(outputDir, {
+                map: (header) => {
+                    files.push({path: header.name, size: header.size});
+                    return header;
+                }
+            });
+
+            tarExtract.on('finish', () => {
+                resolve(files);
+            });
+
+            tarExtract.on('error', (err) => {
+                reject(err);
+            });
+
+            const inputStream = fs.createReadStream(filename);
+            inputStream.on('error', (err) => {
+                reject(err);
+            });
+
+            inputStream.pipe(tarExtract);
+        });
+    }
+
+    decompressByStream(stream, filename, outputDir) {
+        return new Promise(async(resolve, reject) => {
+            const file = {path: path.parse(filename).name};
+            let outFilename = `${outputDir}/${file.path}`;
+            if (await fs.pathExists(outFilename)) {
+                file.path = `${utils.randomHexString(10)}-${file.path}`;
+                outFilename = `${outputDir}/${file.path}`;
+            }
+        
+            const inputStream = fs.createReadStream(filename);
+            const outputStream = fs.createWriteStream(outFilename);
+
+            outputStream.on('finish', async() => {
+                try {
+                    file.size = (await fs.stat(outFilename)).size;
+                } catch (e) {
+                    reject(e);
+                }
+                resolve([file]);
+            });
+
+            inputStream.on('error', (err) => {
+                reject(err);
+            });
+
+            outputStream.on('error', (err) => {
+                reject(err);
+            });
+        
+            inputStream.pipe(stream).pipe(outputStream);
+        });
+   }
+
    async gzipBuffer(buf) {
        return new Promise((resolve, reject) => {
            zlib.gzip(buf, {level: 1}, (err, result) => {
--- a/server/core/FileDetector.js
+++ b/server/core/FileDetector.js
@@ -1,57 +0,0 @@
-const detect = require('detect-file-type');
-
-//html
-detect.addSignature(
-  {
-    "type": "html",
-    "ext": "html",
-    "mime": "text/html",
-    "rules": [
-      { "type": "or", "rules":
-      [
-        { "type": "contains", "bytes": "3c68746d6c" },
-        { "type": "contains", "bytes": "3c00680074006d006c00" },
-
-        { "type": "contains", "bytes": "3c21646f6374797065" },
-        { "type": "contains", "bytes": "3c626f6479" },
-        { "type": "contains", "bytes": "3c68656164" },
-        { "type": "contains", "bytes": "3c696672616d65" },
-        { "type": "contains", "bytes": "3c696d67" },
-        { "type": "contains", "bytes": "3c6f626a656374" },
-        { "type": "contains", "bytes": "3c736372697074" },
-        { "type": "contains", "bytes": "3c7461626c65" },
-        { "type": "contains", "bytes": "3c7469746c65" },
-      ]
-      }
-    ]
-  }
-);
-
-//xml 3c 3f 78 6d 6c 20 76 65 72 73 69 6f 6e 3d 22 31 2e 30 22
-detect.addSignature(
-  {
-    "type": "xml",
-    "ext": "xml",
-    "mime": "application/xml",
-    "rules": [
-      { "type": "or", "rules":
-      [
-        { "type": "contains", "bytes": "3c3f786d6c2076657273696f6e3d22312e3022" },
-      ]
-      }
-    ]
-  }
-);
-
-class FileDetector {
-    detectFile(filename) {
-        return new Promise((resolve, reject) => {
-            detect.fromFile(filename, (err, result) => {
-                if (err) reject(err);
-                resolve(result);
-            });
-        });
-    }
-}
-
-module.exports = FileDetector;
--- a/server/core/FileDetector/index.js
+++ b/server/core/FileDetector/index.js
@@ -0,0 +1,274 @@
+const fs = require('fs');
+const signatures = require('./signatures.json');
+
+class FileDetector {
+    detectFile(filename) {
+        return new Promise((resolve, reject) => {
+            this.fromFile(filename, 2000, (err, result) => {
+                if (err) reject(err);
+                resolve(result);
+            });
+        });
+    }
+
+    //все, что ниже, взято здесь: https://github.com/dimapaloskin/detect-file-type
+    fromFile(filePath, bufferLength, callback) {
+        if (typeof bufferLength === 'function') {
+            callback = bufferLength;
+            bufferLength = undefined;
+        }
+
+        this.getFileSize(filePath, (err, fileSize) => {
+            if (err) {
+                return callback(err);
+            }
+
+            fs.open(filePath, 'r', (err, fd) => {
+                if (err) {
+                    return callback(err);
+                }
+
+                let bufferSize = bufferLength;
+                if (!bufferSize) {
+                    bufferSize = 500;
+                }
+
+                if (fileSize < bufferSize) {
+                    bufferSize = fileSize;
+                }
+
+                const buffer = Buffer.alloc(bufferSize);
+
+                fs.read(fd, buffer, 0, bufferSize, 0, (err) => {
+                    fs.close(fd);
+
+                    if (err) {
+                      return callback(err);
+                    }
+
+                    this.fromBuffer(buffer, callback);
+                });
+            });
+        });
+    }
+
+    fromBuffer(buffer, callback) {
+        let result = null;
+
+        const invalidSignaturesList = this.validateSigantures();
+        if (invalidSignaturesList.length) {
+            return callback(invalidSignaturesList);
+        }
+
+        signatures.every((signature) => {
+            if (this.detect(buffer, signature.rules)) {
+                result = {
+                    ext: signature.ext,
+                    mime: signature.mime
+                };
+
+                if (signature.iana)
+                    result.iana = signature.iana;
+
+                return false;
+            }
+            return true;
+        });
+
+        callback(null, result);
+    }
+
+    detect(buffer, receivedRules, type) {
+        if (!type) {
+            type = 'and';
+        }
+
+        const rules = [...receivedRules];
+
+        let isDetected = true;
+        rules.every((rule) => {
+            if (rule.type === 'equal') {
+                const slicedHex = buffer.slice(rule.start || 0, rule.end || buffer.length).toString('hex');
+                isDetected = (slicedHex === rule.bytes);
+                return this.isReturnFalse(isDetected, type);
+            }
+
+            if (rule.type === 'notEqual') {
+                const slicedHex = buffer.slice(rule.start || 0, rule.end || buffer.length).toString('hex');
+                isDetected = !(slicedHex === rule.bytes);
+                return this.isReturnFalse(isDetected, type);
+            }
+
+            if (rule.type === 'contains') {
+                const slicedHex = buffer.slice(rule.start || 0, rule.end || buffer.length).toString('hex');
+                if (typeof rule.bytes === 'string') {
+                    rule.bytes = [rule.bytes];
+                }
+
+                rule.bytes.every((bytes) => {
+                    isDetected = (slicedHex.indexOf(bytes) !== -1);
+                    return isDetected;
+                });
+
+                return this.isReturnFalse(isDetected, type);
+            }
+
+            if (rule.type === 'notContains') {
+                const slicedHex = buffer.slice(rule.start || 0, rule.end || buffer.length).toString('hex');
+                if (typeof rule.bytes === 'string') {
+                    rule.bytes = [rule.bytes];
+                }
+
+                rule.bytes.every((bytes) => {
+                    isDetected = (slicedHex.indexOf(bytes) === -1);
+                    return isDetected;
+                });
+
+                return this.isReturnFalse(isDetected, type);
+            }
+
+            if (rule.type === 'or') {
+                isDetected = this.detect(buffer, rule.rules, 'or');
+                return this.isReturnFalse(isDetected, type);
+            }
+
+            if (rule.type === 'and') {
+                isDetected = this.detect(buffer, rule.rules, 'and');
+                return this.isReturnFalse(isDetected, type);
+            }
+
+            return true;
+        });
+
+        return isDetected;
+    }
+
+    isReturnFalse(isDetected, type) {
+        if (!isDetected && type === 'and') {
+            return false;
+        }
+
+        if (isDetected && type === 'or') {
+            return false;
+        }
+
+        return true;
+    }
+
+    validateRuleType(rule) {
+        const types = ['or', 'and', 'contains', 'notContains', 'equal', 'notEqual'];
+        return  (types.indexOf(rule.type) !== -1);
+    }
+
+    validateSigantures() {
+        let invalidSignatures = signatures.map((signature) => {
+            return this.validateSignature(signature);
+        });
+
+        invalidSignatures = this.cleanArray(invalidSignatures);
+
+        if (invalidSignatures.length) {
+            return invalidSignatures;
+        }
+
+        return true;
+    }
+
+    validateSignature(signature) {
+        if (!('type' in signature)) {
+            return {
+                message: 'signature does not contain "type" field',
+                signature
+            };
+        }
+
+        if (!('ext' in signature)) {
+            return {
+                message: 'signature does not contain "ext" field',
+                signature
+            };
+        }
+
+        if (!('mime' in signature)) {
+            return {
+                message: 'signature does not contain "mime" field',
+                signature
+            };
+        }
+
+        if (!('rules' in signature)) {
+            return {
+                message: 'signature does not contain "rules" field',
+                signature
+            };
+        }
+
+        const invalidRules = this.validateRules(signature.rules);
+
+        if (invalidRules && invalidRules.length) {
+            return {
+                message: 'signature has invalid rule',
+                signature,
+                rules: invalidRules
+            }
+        }
+    }
+
+    validateRules(rules) {
+        let invalidRules = rules.map((rule) => {
+            let isRuleTypeValid = this.validateRuleType(rule);
+
+            if (!isRuleTypeValid) {
+                return {
+                    message: 'rule type does not supported',
+                    rule
+                };
+            }
+
+            if ((rule.type === 'or' || rule.type === 'and') && !('rules' in rule)) {
+                return {
+                    message: 'rule should contains "rules" field',
+                    rule
+                };
+            }
+
+            if (rule.type === 'or' || rule.type === 'and') {
+                return this.validateRules(rule.rules);
+            }
+
+            return false;
+        });
+
+        invalidRules = this.cleanArray(invalidRules);
+
+        if (invalidRules.length) {
+            return invalidRules;
+        }
+    }
+
+    cleanArray(actual) {
+        let newArray = new Array();
+        for (let i = 0; i < actual.length; i++) {
+            if (actual[i]) {
+                newArray.push(actual[i]);
+            }
+        }
+        return newArray;
+    }
+
+    addSignature(signature) {
+        signatures.push(signature);
+    }
+
+    getFileSize(filePath, callback) {
+        fs.stat(filePath, (err, stat) => {
+            if (err) {
+                return callback(err);
+            }
+
+            return callback(null, stat.size);
+        });
+    }
+}
+
+module.exports = FileDetector;
--- a/server/core/FileDetector/signatures.json
+++ b/server/core/FileDetector/signatures.json
@@ -0,0 +1,725 @@
+[
+  {
+    "type": "jpg",
+    "ext": "jpg",
+    "mime": "image/jpeg",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 2, "bytes": "ffd8"  }
+    ]
+  },
+
+  {
+    "type": "png",
+    "ext": "png",
+    "mime": "image/png",
+    "rules": [
+      { "type": "equal", "start": 0,"end": 4, "bytes": "89504e47" }
+    ]
+  },
+
+  {
+    "type": "gif",
+    "ext": "gif",
+    "mime": "image/gif",
+    "rules": [
+      { "type": "equal", "start": 0,"end": 3, "bytes": "474946" }
+    ]
+  },
+
+  {
+    "type": "bmp",
+    "ext": "bmp",
+    "mime": "image/bmp",
+    "rules": [
+      { "type": "equal", "start": 0,"end": 2, "bytes": "424d" }
+    ]
+  },
+  {
+    "type": "webp",
+    "ext": "webp",
+    "mime": "image/webp",
+    "rules": [
+      { "type": "equal", "start": 8,"end": 12, "bytes": "57454250" }
+    ]
+  },
+
+  {
+    "type": "tif",
+    "ext": "tif",
+    "mime": "image/tiff",
+    "rules": [
+      { "type": "and", "rules":
+        [
+          { "type": "or", "rules":
+            [
+              { "type": "equal", "start": 0, "end": 4, "bytes": "49492a00" },
+              { "type": "equal", "start": 0, "end": 4,  "bytes": "4d4d002a" }
+            ]
+          },
+          { "type": "notEqual", "start": 8, "end": 10, "bytes": "4352" }
+        ]
+      }
+    ]
+  },
+
+  {
+    "type": "cr2",
+    "ext": "cr2",
+    "mime": "image/x-canon-cr2",
+    "rules": [
+      { "type": "and", "rules":
+        [
+          { "type": "or", "rules":
+            [
+              { "type": "equal", "start": 0, "end": 4, "bytes": "49492a00" },
+              { "type": "equal", "start": 0, "end": 4,  "bytes": "4d4d002a" }
+            ]
+          },
+          { "type": "equal", "start": 8, "end": 10, "bytes": "4352" }
+        ]
+      }
+    ]
+  },
+
+  {
+    "type": "jxr",
+    "ext": "jxr",
+    "mime": "image/vnd.ms-photo",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 3, "bytes": "4949bc" }
+    ]
+  },
+
+  {
+    "type": "psd",
+    "ext": "psd",
+    "mime": "image/vnd.adobe.photoshop",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "38425053" }
+    ]
+  },
+
+  {
+    "type": "flif",
+    "ext": "flif",
+    "mime": "image/flif",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "464c4946" }
+    ]
+  },
+
+  {
+    "type": "zip",
+    "ext": "zip",
+    "mime": "application/zip",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 2, "bytes": "504b" },
+      { "type": "or", "rules":
+        [
+          { "type": "equal", "start": 2, "end": 3, "bytes": "03" },
+          { "type": "equal", "start": 2, "end": 3, "bytes": "05" },
+          { "type": "equal", "start": 2, "end": 3, "bytes": "07" }
+        ]
+      },
+      { "type": "or", "rules":
+        [
+          { "type": "equal", "start": 3, "end": 4, "bytes": "04" },
+          { "type": "equal", "start": 3, "end": 4, "bytes": "06" },
+          { "type": "equal", "start": 3, "end": 4, "bytes": "08" }
+        ]
+      },
+      { "type": "notEqual", "start": 30, "end": 50, "bytes": "4d4554412d494e462f6d6f7a696c6c612e727361" }
+    ]
+  },
+
+  {
+    "type": "xpi",
+    "ext": "xpi",
+    "mime": "application/x-xpinstall",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "504b0304" },
+      { "type": "equal", "start": 30, "end": 50, "bytes": "4d4554412d494e462f6d6f7a696c6c612e727361" }
+    ]
+  },
+
+  {
+    "type": "tar",
+    "ext": "tar",
+    "mime": "application/x-tar",
+    "rules": [
+      { "type": "equal", "start": 257, "end": 262, "bytes": "7573746172" }
+    ]
+  },
+  {
+    "type": "rar",
+    "ext": "rar",
+    "mime": "application/x-rar-compressed",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 6, "bytes": "526172211a07" },
+      { "type": "or", "rules":
+        [
+          { "type": "equal", "start": 6, "end": 7, "bytes": "00" },
+          { "type": "equal", "start": 6, "end": 7, "bytes": "01" }
+        ]
+      }
+    ]
+  },
+  {
+    "type": "gz",
+    "ext": "gz",
+    "mime": "application/gzip",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 3, "bytes": "1f8b08" }
+    ]
+  },
+  {
+    "type": "bz2",
+    "ext": "bz2",
+    "mime": "application/x-bzip2",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 3, "bytes": "425a68" }
+    ]
+  },
+  {
+    "type": "7z",
+    "ext": "7z",
+    "mime": "application/x-7z-compressed",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 6, "bytes": "377abcaf271c" }
+    ]
+  },
+  {
+    "type": "dmg",
+    "ext": "dmg",
+    "mime": "application/x-apple-diskimage",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 2, "bytes": "7801" }
+    ]
+  },
+
+  {
+    "type": "mp4",
+    "ext": "mp4",
+    "mime": "video/mp4",
+    "rules": [
+      { "type": "or", "rules":
+        [
+          { "type": "and", "rules":
+            [
+              { "type": "equal", "start": 0, "end": 3, "bytes": "000000" },
+              { "type": "or", "rules":
+                [
+                  { "type": "equal", "start": 3, "end": 4, "bytes": "18" },
+                  { "type": "equal", "start": 3, "end": 4, "bytes": "20" }
+                ]
+              },
+              { "type": "equal", "start": 4, "end": 8, "bytes": "66747970" }
+            ]
+          },
+          { "type": "equal", "start": 0, "end": 4, "bytes": "33677035" },
+          { "type": "and", "rules":
+            [
+              { "type": "equal", "start": 0, "end": 11, "bytes": "0000001c667479706d7034" },
+              { "type": "equal", "start": 16, "end": 28, "bytes": "6d7034316d70343269736f6d" }
+            ]
+          },
+          { "type": "equal", "start": 0, "end": 12, "bytes": "0000001c6674797069736f6d" },
+          { "type": "equal", "start": 0, "end": 16, "bytes": "0000001c667479706d70343200000000" }
+        ]
+      }
+    ]
+  },
+
+  {
+    "type": "m4v",
+    "ext": "m4v",
+    "mime": "video/x-m4v",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 11, "bytes": "0000001c667479704d3456" }
+    ]
+  },
+
+  {
+    "type": "mid",
+    "ext": "mid",
+    "mime": "audio/midi",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "4d546864" }
+    ]
+  },
+
+  {
+    "type": "mkv",
+    "ext": "mkv",
+    "mime": "video/x-matroska",
+    "rules": [
+      { "type": "equal", "start": 31, "end": 39, "bytes": "6d6174726f736b61" }
+    ]
+  },
+
+  {
+    "type": "webm",
+    "ext": "webm",
+    "mime": "video/webm",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "1a45dfa3" },
+      { "type": "notEqual", "start": 31, "end": 39, "bytes": "6d6174726f736b61" }
+    ]
+  },
+
+  {
+    "type": "wmv",
+    "ext": "wmv",
+    "mime": "video/x-ms-wmv",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 10, "bytes": "3026b2758e66cf11a6d9" }
+    ]
+  },
+
+  {
+    "type": "mpg",
+    "ext": "mpg",
+    "mime": "video/mpeg",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 3, "bytes": "000001" },
+      { "type": "or", "rules":
+        [
+          { "type": "equal", "start": 3, "end": 4, "bytes": "b0"},
+          { "type": "equal", "start": 3, "end": 4, "bytes": "b1"},
+          { "type": "equal", "start": 3, "end": 4, "bytes": "b2"},
+          { "type": "equal", "start": 3, "end": 4, "bytes": "b3"},
+          { "type": "equal", "start": 3, "end": 4, "bytes": "b4"},
+          { "type": "equal", "start": 3, "end": 4, "bytes": "b5"},
+          { "type": "equal", "start": 3, "end": 4, "bytes": "b6"},
+          { "type": "equal", "start": 3, "end": 4, "bytes": "b7"},
+          { "type": "equal", "start": 3, "end": 4, "bytes": "b8"},
+          { "type": "equal", "start": 3, "end": 4, "bytes": "b9"},
+          { "type": "equal", "start": 3, "end": 4, "bytes": "ba"},
+          { "type": "equal", "start": 3, "end": 4, "bytes": "bb"},
+          { "type": "equal", "start": 3, "end": 4, "bytes": "bc"},
+          { "type": "equal", "start": 3, "end": 4, "bytes": "bd"},
+          { "type": "equal", "start": 3, "end": 4, "bytes": "be"},
+          { "type": "equal", "start": 3, "end": 4, "bytes": "bf"}
+        ]
+      }
+    ]
+  },
+
+  {
+    "type": "mp3",
+    "ext": "mp3",
+    "mime": "audio/mpeg",
+    "rules": [
+      { "type": "or", "rules":
+        [
+          { "type": "equal", "start": 0, "end": 3, "bytes": "494433" },
+          { "type": "equal", "start": 0, "end": 2, "bytes": "fffb" }
+        ]
+      }
+    ]
+  },
+
+  {
+    "type": "m4a",
+    "ext": "m4a",
+    "mime": "audio/m4a",
+    "rules": [
+      { "type": "or", "rules":
+        [
+          { "type": "equal", "start": 4, "end": 11, "bytes": "667479704d3441" },
+          { "type": "equal", "start": 0, "end": 4, "bytes": "4d344120" }
+        ]
+      }
+    ]
+  },
+
+  {
+    "type": "opus",
+    "ext": "opus",
+    "mime": "audio/opus",
+    "rules": [
+      { "type": "equal", "start": 28, "end": 36, "bytes": "4f70757348656164" }
+    ]
+  },
+
+  {
+    "type": "ogg",
+    "ext": "ogg",
+    "mime": "audio/ogg",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "4f676753" },
+      { "type": "notEqual", "start": 28, "end": 36, "bytes": "4f70757348656164" }
+    ]
+  },
+
+  {
+    "type": "flac",
+    "ext": "flac",
+    "mime": "audio/x-flac",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "664c6143" }
+    ]
+  },
+
+  {
+    "type": "wav",
+    "ext": "wav",
+    "mime": "audio/x-wav",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "52494646" },
+      { "type": "equal", "start": 8, "end": 12, "bytes": "57415645" }
+    ]
+  },
+
+  {
+    "type": "amr",
+    "ext": "amr",
+    "mime": "audio/amr",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 6, "bytes": "2321414d520a" }
+    ]
+  },
+
+  {
+    "type": "pdf",
+    "ext": "pdf",
+    "mime": "application/pdf",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "25504446" }
+    ]
+  },
+
+  {
+    "type": "exe",
+    "ext": "exe",
+    "mime": "application/x-msdownload",
+    "iana": "application/vnd.microsoft.portable-executable",
+    "rules": [
+      { "type": "or", "rules":
+        [
+          { "type": "equal", "start": 0, "end": 2, "bytes": "4d5a" },
+          { "type": "equal", "start": 0, "end": 2, "bytes": "4d7a" },
+          { "type": "equal", "start": 0, "end": 2, "bytes": "6d7a" },
+          { "type": "equal", "start": 0, "end": 2, "bytes": "6d5a" }
+        ]
+      }
+    ]
+  },
+
+  {
+    "type": "swf",
+    "ext": "swf",
+    "mime": "application/x-shockwave-flash",
+    "iana": "application/vnd.adobe.flash.movie",
+    "rules": [
+      { "type": "or", "rules":
+        [
+          { "type": "equal", "start": 0, "end": 1, "bytes": "43" },
+          { "type": "equal", "start": 0, "end": 1, "bytes": "46" }
+        ]
+      },
+      { "type": "equal", "start": 1, "end": 3, "bytes": "5753" }
+    ]
+  },
+
+  {
+    "type": "rtf",
+    "ext": "rtf",
+    "mime": "application/rtf",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 5, "bytes": "7b5c727466" }
+    ]
+  },
+
+  {
+    "type": "mov",
+    "ext": "mov",
+    "mime": "video/quicktime",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 8, "bytes": "0000001466747970" }
+    ]
+  },
+
+  {
+    "type": "avi",
+    "ext": "avi",
+    "mime": "video/x-msvideo",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "52494646" },
+      { "type": "equal", "start": 8, "end": 11, "bytes": "415649" }
+    ]
+  },
+
+  {
+    "type": "woff",
+    "ext": "woff",
+    "mime": "application/font-woff",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "774f4646" },
+      { "type": "or", "rules":
+        [
+          { "type": "equal", "start": 4, "end": 8, "bytes": "00010000" },
+          { "type": "equal", "start": 4, "end": 8, "bytes": "4f54544f" }
+        ]
+      }
+    ]
+  },
+
+  {
+    "type": "woff2",
+    "ext": "woff2",
+    "mime": "application/font-woff",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "774f4632" },
+      { "type": "or", "rules":
+        [
+          { "type": "equal", "start": 4, "end": 8, "bytes": "00010000" },
+          { "type": "equal", "start": 4, "end": 8, "bytes": "4f54544f" }
+        ]
+      }
+    ]
+  },
+
+  {
+    "type": "eot",
+    "ext": "eot",
+    "mime": "application/octet-stream",
+    "rules": [
+      { "type": "equal", "start": 34, "end": 36, "bytes": "4c50" },
+      { "type": "or", "rules":
+        [
+          { "type": "equal", "start": 8, "end": 11, "bytes": "000001" },
+          { "type": "equal", "start": 8, "end": 11, "bytes": "010002" },
+          { "type": "equal", "start": 8, "end": 11, "bytes": "020002" }
+        ]
+      }
+    ]
+  },
+
+  {
+    "type": "ttf",
+    "ext": "ttf",
+    "mime": "application/font-sfnt",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 5, "bytes": "0001000000" }
+    ]
+  },
+
+  {
+    "type": "otf",
+    "ext": "otf",
+    "mime": "application/font-sfnt",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 5, "bytes": "4f54544f00" }
+    ]
+  },
+
+  {
+    "type": "ico",
+    "ext": "ico",
+    "mime": "application/x-icon",
+    "iana": "image/vnd.microsoft.icon",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "00000100" }
+    ]
+  },
+
+  {
+    "type": "flv",
+    "ext": "flv",
+    "mime": "application/x-flv",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "464c5601" }
+    ]
+  },
+
+  {
+    "type": "ps",
+    "ext": "ps",
+    "mime": "application/postscript",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 2, "bytes": "2521" }
+    ]
+  },
+
+  {
+    "type": "xz",
+    "ext": "xz",
+    "mime": "application/x-xz",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 6, "bytes": "fd377a585a00" }
+    ]
+  },
+
+  {
+    "type": "sqlite",
+    "ext": "sqlite",
+    "mime": "application/x-sqlite3",
+    "iana": "application/vnd.sqlite3",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "53514c69" }
+    ]
+  },
+
+  {
+    "type": "nes",
+    "ext": "nes",
+    "mime": "application/x-nintendo-nes-rom",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "4e45531a" }
+    ]
+  },
+
+  {
+    "type": "crx",
+    "ext": "crx",
+    "mime": "application/x-google-chrome-extension",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "43723234" }
+    ]
+  },
+
+  {
+    "type": "cab",
+    "ext": "cab",
+    "mime": "application/vnd.ms-cab-compressed",
+    "rules": [
+      { "type": "or", "rules":
+        [
+          { "type": "equal", "start": 0, "end": 4, "bytes": "4d534346" },
+          { "type": "equal", "start": 0, "end": 4, "bytes": "49536328" }
+        ]
+      }
+    ]
+  },
+
+  {
+    "type": "ar",
+    "ext": "ar",
+    "mime": "application/x-unix-archive",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 7, "bytes": "213c617263683e" },
+      { "type": "notEqual", "start": 0, "end": 21, "bytes": "213c617263683e0a64656269616e2d62696e617279" }
+    ]
+  },
+
+  {
+    "type": "deb",
+    "ext": "deb",
+    "mime": "application/x-deb",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 21, "bytes": "213c617263683e0a64656269616e2d62696e617279" }
+    ]
+  },
+
+  {
+    "type": "rpm",
+    "ext": "rpm",
+    "mime": "application/x-rpm",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "edabeedb" }
+    ]
+  },
+
+  {
+    "type": "Z",
+    "ext": "Z",
+    "mime": "application/x-compress",
+    "rules": [
+      { "type": "or", "rules":
+        [
+          { "type": "equal", "start": 0, "end": 2, "bytes": "1fa0" },
+          { "type": "equal", "start": 0, "end": 2, "bytes": "1f9d" }
+        ]
+      }
+    ]
+  },
+
+  {
+    "type": "lz",
+    "ext": "lz",
+    "mime": "application/x-lzip",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 4, "bytes": "4c5a4950" }
+    ]
+  },
+
+  {
+    "type": "msi",
+    "ext": "msi",
+    "mime": "application/x-msi",
+    "rules": [
+      { "type": "equal", "start": 0, "end": 8, "bytes": "d0cf11e0a1b11ae1" }
+    ]
+  },
+
+  {
+    "type": "svg",
+    "ext": "svg",
+    "mime": "image/svg+xml",
+    "rules": [
+      { "type": "contains", "bytes": "3c737667" }
+    ]
+  },
+
+  {
+    "type": "html",
+    "ext": "html",
+    "mime": "text/html",
+    "rules": [
+      { "type": "or", "rules":
+      [
+        { "type": "contains", "bytes": "3c68746d6c" },
+        { "type": "contains", "bytes": "3c00680074006d006c00" },
+        { "type": "equal", "end": 5, "bytes": "3c68746d6c" },
+        { "type": "equal", "end": 10, "bytes": "3c00680074006d006c00" },
+        { "type": "equal", "end": 9, "bytes": "3c21646f6374797065" },
+        { "type": "equal", "end": 5, "bytes": "3c626f6479" },
+        { "type": "equal", "end": 5, "bytes": "3c68656164" },
+        { "type": "equal", "end": 7, "bytes": "3c696672616d65" },
+        { "type": "equal", "end": 4, "bytes": "3c696d67" },
+        { "type": "equal", "end": 7, "bytes": "3c6f626a656374" },
+        { "type": "equal", "end": 7, "bytes": "3c736372697074" },
+        { "type": "equal", "end": 6, "bytes": "3c7461626c65" },
+        { "type": "equal", "end": 6, "bytes": "3c7469746c65" }
+      ]
+      }
+    ]
+  },
+
+  {
+    "type": "docx",
+    "ext": "docx",
+    "mime": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+    "rules": [
+      { "type": "or", "rules":
+      [
+        { "type": "contains", "bytes": "6170706c69636174696f6e2f766e642e6f70656e786d6c666f726d6174732d6f6666696365646f63756d656e74" }
+      ]
+      }
+    ]
+  },
+
+  {
+    "type": "xml",
+    "ext": "xml",
+    "mime": "application/xml",
+    "rules": [
+      { "type": "or", "rules":
+      [
+        { "type": "equal", "end": 19, "bytes": "3c3f786d6c2076657273696f6e3d22312e3022" }
+      ]
+      }
+    ]
+  },
+
+  {
+    "type": "mobi",
+    "ext": "mobi",
+    "mime": "application/x-mobipocket-ebook",
+    "rules": [
+      { "type": "equal", "start": 64, "end": 68, "bytes": "4d4f4249" }
+    ]
+  }
+
+]
--- a/server/core/ReaderWorker.js
+++ b/server/core/ReaderWorker.js
@@ -22,7 +22,7 @@ class ReaderWorker {

        this.down = new FileDownloader();
        this.decomp = new FileDecompressor();
-        this.bookConverter = new BookConverter();
+        this.bookConverter = new BookConverter(this.config);

        if (!singleCleanExecute) {
            this.periodicCleanDir(this.config.tempPublicDir, this.config.maxTempPublicDirSize, 60*60*1000);//1 раз в час
@@ -63,17 +63,24 @@ class ReaderWorker {
            //decompress
            wState.set({state: 'decompress', step: 2, progress: 0});
            decompDir = `${this.config.tempDownloadDir}/${decompDirname}`;
-            const decompFilename = await this.decomp.decompressFile(downloadedFilename, decompDir);
+            let decompFiles = {};
+            try {
+                decompFiles = await this.decomp.decompressNested(downloadedFilename, decompDir);
+            } catch (e) {
+                if (this.config.branch == 'development')
+                    console.error(e);
+                throw new Error('Ошибка распаковки');
+            }
            wState.set({progress: 100});
            
-            //parse book
+            //конвертирование в fb2
            wState.set({state: 'convert', step: 3, progress: 0});
            convertFilename = `${this.config.tempDownloadDir}/${tempFilename2}`;
-            await this.bookConverter.convertToFb2(decompFilename, convertFilename, url, progress => {
+            await this.bookConverter.convertToFb2(decompFiles, convertFilename, url, progress => {
                wState.set({progress});
            });

-            //compress file to tmp dir, if not exists with the same hashname
+            //сжимаем файл в tmp, если там уже нет с тем же именем-sha256
            const compFilename = await this.decomp.gzipFileIfNotExists(convertFilename, `${this.config.tempPublicDir}`);

            wState.set({progress: 100});
@@ -83,8 +90,9 @@ class ReaderWorker {
            wState.finish({path: `/tmp/${finishFilename}`});

        } catch (e) {
+            if (this.config.branch == 'development')
+                console.error(e);
            wState.set({state: 'error', error: (errMes ? errMes : e.message)});
-
        } finally {
            //clean
            if (decompDir)
--- a/server/core/utils.js
+++ b/server/core/utils.js
@@ -1,3 +1,4 @@
+const { spawn } = require('child_process');
 const fs = require('fs-extra');
 const crypto = require('crypto');

@@ -13,8 +14,48 @@ async function touchFile(filename) {
    await fs.utimes(filename, Date.now()/1000, Date.now()/1000);
 }

+function spawnProcess(cmd, opts) {
+    let {args, killAfter, onData} = opts;
+    killAfter = (killAfter ? killAfter : 120*1000);
+    onData = (onData ? onData : () => {});
+    args = (args ? args : []);
+
+    return new Promise(async(resolve, reject) => {
+        let resolved = false;
+        const proc = spawn(cmd, args, {detached: true});
+
+        let stdout = '';
+        proc.stdout.on('data', (data) => {
+            stdout += data;
+            onData(data);
+        });
+
+        let stderr = '';
+        proc.stderr.on('data', (data) => {
+            stderr += data;
+            onData(data);
+        });
+
+        proc.on('close', (code) => {
+            resolved = true;
+            resolve({status: 'close', code, stdout, stderr});
+        });
+
+        proc.on('error', (error) => {
+            reject({status: 'error', error, stdout, stderr});
+        });
+
+        await sleep(killAfter);
+        if (!resolved) {
+            process.kill(proc.pid);
+            reject({status: 'killed', stdout, stderr});
+        }
+    });
+}
+
 module.exports = {
    sleep,
    randomHexString,
-    touchFile
+    touchFile,
+    spawnProcess
 };
--- a/server/index.js
+++ b/server/index.js
@@ -1,7 +1,7 @@
 const config = require('./config');
-const {initLogger, getLog} = require('./core/getLogger');
-initLogger(config);
-const log = getLog();
+const logger = require('./core/getLogger');
+logger.initLogger(config);
+const log = logger.getLog();

 const configSaver = require('./config/configSaver');
 const argv = require('minimist')(process.argv.slice(2));
@@ -31,6 +31,7 @@ async function init() {
 }

 async function main() {
+    log(`${config.name} v${config.version}`);
    log('Initializing');
    await init();

@@ -89,7 +90,7 @@ async function main() {
    try {
        await main();
    } catch (e) {
-        console.error(e.message);
+        console.error(e);
        process.exit(1);
    }
 })();
Author	SHA1	Message	Date
Book Pauk	89bf907613	Merge branch 'release/0.5.4'	2019-03-04 22:57:38 +07:00
Book Pauk	641d0e45fd	Версия 0.5.4	2019-03-04 22:57:10 +07:00
Book Pauk	b3e579d8b7	Улучшение парсинга pdf и html	2019-03-04 22:56:15 +07:00
Book Pauk	fcb61c89d5	Улучшение парсинга html	2019-03-04 22:42:54 +07:00
Book Pauk	3483d78c2c	Улучшение парсинга pdf и текстов	2019-03-04 22:28:11 +07:00
Book Pauk	36b14d0b3a	Мелкая поправка	2019-03-04 21:26:07 +07:00
Book Pauk	2f8b68ec62	Улучшение парсинга Pdf	2019-03-04 21:22:12 +07:00
Book Pauk	cb65cac333	Конвертер pdf - загружаем изображения	2019-03-04 20:00:51 +07:00
Book Pauk	d12ffc3d0d	Поправил комментарий	2019-03-04 16:39:30 +07:00
Book Pauk	921744167e	Поправка мелкого бага	2019-03-03 12:32:22 +07:00
Book Pauk	ebd96c4759	Merge tag '0.5.3' into develop 0.5.3	2019-03-01 21:30:38 +07:00
Book Pauk	dd9876fc43	Merge branch 'release/0.5.3'	2019-03-01 21:30:28 +07:00
Book Pauk	e0de614f30	Версия 0.5.3	2019-03-01 21:30:03 +07:00
Book Pauk	30260883fb	Поправки текста приветствия	2019-03-01 21:29:11 +07:00
Book Pauk	91c331e5f3	Добавлен конвертер для Mobi	2019-03-01 21:23:33 +07:00
Book Pauk	db803bcd23	Отказ от пакета decompress	2019-03-01 20:47:55 +07:00
Book Pauk	cd482ea890	Небольшая поправка	2019-03-01 20:47:39 +07:00
Book Pauk	a2497c939a	Добавлен пакет tar-fs	2019-03-01 20:12:19 +07:00
Book Pauk	2e5249d30b	Доработки, переименования	2019-03-01 20:11:37 +07:00
Book Pauk	b1d60c19d5	Добавлен метод unTar	2019-03-01 19:48:50 +07:00
Book Pauk	d28a82b33a	УБрал дебаг	2019-03-01 19:39:55 +07:00
Book Pauk	787821f64b	Поправки багов	2019-03-01 19:28:25 +07:00
Book Pauk	612b15fecc	Добавлен метод unBz2	2019-03-01 18:23:46 +07:00
Book Pauk	d88d5a1352	Начата переделка FileDecompressor - отказ от использования багнутого пакета decompress	2019-03-01 18:00:09 +07:00
Book Pauk	8584ddd00e	Убрал сигнатуру Epub	2019-03-01 17:58:23 +07:00
Book Pauk	4f572b5a10	Добавлен конвертер для Epub	2019-03-01 17:55:42 +07:00
Book Pauk	90a0882c59	Рефакторинг	2019-03-01 15:10:01 +07:00
Book Pauk	759344bb34	Улучшение конвертера html	2019-03-01 00:24:19 +07:00
Book Pauk	c9b65a3c43	Улучшение конвертирования Pdf	2019-02-28 23:02:34 +07:00
Book Pauk	b06e600946	Поправка багов	2019-02-28 22:04:42 +07:00
Book Pauk	2777751e54	Улучшение конвертирования Pdf	2019-02-28 20:29:09 +07:00
Book Pauk	b4493b2e8d	Работа над конвертером pdf	2019-02-28 20:02:14 +07:00
Book Pauk	55d5f6524d	Работа над конвертером Pdf	2019-02-28 18:58:41 +07:00
Book Pauk	c7d376adf2	Некоторые доработки	2019-02-28 18:31:08 +07:00
Book Pauk	56bf69a770	Урезал очередь конвертирования до 10 процессов	2019-02-28 15:52:13 +07:00
Book Pauk	22f9287d8b	Небольшие доработки	2019-02-28 15:38:03 +07:00
Book Pauk	ca47d9272c	Поправка бага	2019-02-28 15:20:20 +07:00
Book Pauk	0d61f5523a	Мелкая поправка	2019-02-28 15:00:06 +07:00
Book Pauk	863ea9089a	Небольшие оптимизации работы с кешем и чистки	2019-02-28 14:58:48 +07:00
Book Pauk	ad2af95ebd	Поправки текста	2019-02-28 01:01:55 +07:00
Book Pauk	d65092c203	Merge tag '0.5.2' into develop 0.5.2	2019-02-28 00:50:52 +07:00
Book Pauk	7982698880	Merge branch 'release/0.5.2'	2019-02-28 00:50:41 +07:00
Book Pauk	afbdff8a88	К предыдущему	2019-02-28 00:50:03 +07:00
Book Pauk	cec07208ac	Версия 0.5.2 - поправки для продакшена	2019-02-28 00:48:49 +07:00
Book Pauk	c1b82d0fd2	Merge tag '0.5.1' into develop 0.5.1	2019-02-28 00:06:59 +07:00
Book Pauk	c69e9d4b69	Merge branch 'hotfix/0.5.1'	2019-02-28 00:06:47 +07:00
Book Pauk	cc66c7f5ce	Версия 0.5.1, поправки для работы на продакшене	2019-02-28 00:06:16 +07:00
Book Pauk	7d3a689577	Merge tag '0.5.0' into develop 0.5.0	2019-02-27 23:32:32 +07:00
Book Pauk	7b5915cdf7	Merge branch 'release/0.5.0'	2019-02-27 23:32:20 +07:00
Book Pauk	5cc99366ef	Версия 0.5.0	2019-02-27 23:31:51 +07:00
Book Pauk	73289543e7	Поправки приветствия	2019-02-27 23:30:22 +07:00
Book Pauk	716b8b5b9a	Добавил распаковку вложенных архивов	2019-02-27 23:19:18 +07:00
Book Pauk	c4f6c9383c	Меняем текст приветствия в зависимости от useExternalBookConverter	2019-02-27 22:09:00 +07:00
Book Pauk	7d77d478c1	Добавил конвертер файлов rtf	2019-02-27 21:59:45 +07:00
Book Pauk	572c0d0717	Увеличил время ожидания до 2х минут	2019-02-27 21:50:47 +07:00
Book Pauk	b786b7b2d6	Поправки spawnProcess	2019-02-27 21:31:47 +07:00
Book Pauk	3253858c7f	Добавил конвертер для msdoc	2019-02-27 21:14:47 +07:00
Book Pauk	a5fe61078d	Сделал конвертер для DocX	2019-02-27 20:39:15 +07:00
Book Pauk	528adae3d0	Подготовка к работе с внешними конвертерами	2019-02-27 20:00:55 +07:00
Book Pauk	d3ff0edbff	Рефакторинг, плюс небольшие изменения - подготовка к использованию внешних конвертеров	2019-02-27 19:30:04 +07:00
Book Pauk	61cfee222f	Переименования	2019-02-27 19:10:33 +07:00
Book Pauk	a96eb50784	Подготовка к запуску внешних конвертеров, для обработки файлов pdf, doc, epub, mobi и пр.	2019-02-27 17:48:37 +07:00
Book Pauk	8219e19c1b	Улучшение FileDetector	2019-02-27 17:48:06 +07:00
Book Pauk	3d56a6915f	Улучшил отображение ошибки	2019-02-27 17:47:06 +07:00
Book Pauk	4d6502f5e2	Удалил пакет detect-file-type	2019-02-27 17:46:39 +07:00
Book Pauk	f0f245884f	Добавил инструкции по установке внешних конвертеров	2019-02-27 15:59:19 +07:00
Book Pauk	815f9178bf	Merge tag '0.4.7' into develop 0.4.7	2019-02-27 06:22:09 +07:00
Book Pauk	2df88f4280	Merge branch 'release/0.4.7'	2019-02-27 06:21:57 +07:00
Book Pauk	156a1b4aa8	Версия 0.4.7	2019-02-27 06:21:41 +07:00
Book Pauk	962eda7860	Поправки багов	2019-02-27 06:12:59 +07:00
Book Pauk	954ce9e85c	Поправки	2019-02-27 06:00:30 +07:00
Book Pauk	ff27ddd442	Оптимизация - улучшение скорости загрузки читалки	2019-02-27 05:52:59 +07:00
Book Pauk	f9cc2ad70a	Мелкая поправка	2019-02-27 04:13:56 +07:00
Book Pauk	4bcd45a795	Рефакторинг - вынес методы конвертирования в отдельные классы	2019-02-27 03:59:08 +07:00
Book Pauk	9e7ccd6e20	Мелкий рефакторинг	2019-02-26 18:23:17 +07:00
Book Pauk	631c5930e9	Мелкая поправка	2019-02-25 20:49:12 +07:00
Book Pauk	0ddb182642	Улучшение парсинга fb2	2019-02-25 17:14:44 +07:00
Book Pauk	de2f0e74c8	Небольшая поправка	2019-02-25 15:29:58 +07:00
Book Pauk	ad4ee6ccc9	Merge tag '0.4.6' into develop 0.4.6	2019-02-24 22:02:53 +07:00
Book Pauk	1670df02db	Merge branch 'release/0.4.6'	2019-02-24 22:02:43 +07:00
Book Pauk	0268e647cd	Версия 0.4.6	2019-02-24 22:02:27 +07:00
Book Pauk	4b9315c13c	Поправка бага	2019-02-24 22:00:41 +07:00
Book Pauk	14a9948dd2	Merge tag '0.4.5' into develop 0.4.5	2019-02-24 21:37:21 +07:00
Book Pauk	060ec98b0c	Merge branch 'release/0.4.5'	2019-02-24 21:37:11 +07:00
Book Pauk	9c1efe381e	Версия 0.4.5	2019-02-24 21:36:49 +07:00
Book Pauk	6a1b052d16	Поправил баг	2019-02-24 21:36:06 +07:00
Book Pauk	d6151d541e	Поправил баг	2019-02-24 21:27:18 +07:00
Book Pauk	3e90277e1e	Добавил опцию imageFitWidth	2019-02-24 19:32:16 +07:00
Book Pauk	641cbdfe85	Merge tag '0.4.4' into develop 0.4.4	2019-02-24 00:41:59 +07:00
Book Pauk	c36e9b36d8	Merge branch 'release/0.4.4'	2019-02-24 00:41:48 +07:00
Book Pauk	ecc3acce93	Версия 0.4.4	2019-02-24 00:41:35 +07:00
Book Pauk	33a2ca55f0	Поправки	2019-02-24 00:32:19 +07:00
Book Pauk	9d0bbec4b3	Поправка отображения картинок внутри title	2019-02-24 00:00:55 +07:00
Book Pauk	4de0b3cffd	Поправки парсера fb2	2019-02-23 23:51:06 +07:00
Book Pauk	06221a474b	Мелкая поправка	2019-02-23 23:38:19 +07:00
Book Pauk	e99a42b7af	К предыдущему	2019-02-23 23:20:03 +07:00
Book Pauk	37822e8409	Мелкая поправка	2019-02-23 23:18:03 +07:00
Book Pauk	2e477e6c99	Улучшение парсинга СИ	2019-02-23 23:03:01 +07:00
Book Pauk	360ee98d8d	Улучшение парсинга fb2	2019-02-23 22:17:16 +07:00
Book Pauk	69afd7720a	Поправки форматирования fb2	2019-02-23 20:45:21 +07:00
Book Pauk	a75590c493	Улучшение формирования fb2	2019-02-23 20:15:40 +07:00
Book Pauk	2acb65f6b3	Мелкие поправки	2019-02-23 20:04:41 +07:00
Book Pauk	1e1a58b58c	Улучшен convertHtml	2019-02-23 19:47:16 +07:00
Book Pauk	aeadb5aeb8	Улучшено определение кодировки и текстового файла	2019-02-23 19:09:57 +07:00
Book Pauk	3e2f01d56d	Мелкие поправки	2019-02-23 18:06:29 +07:00
Book Pauk	cad97e639a	Добавил цвет фона	2019-02-23 14:37:40 +07:00
Book Pauk	e2632f1802	Добавил вывод версии в консоль	2019-02-23 14:24:29 +07:00
Book Pauk	9aa0bb2bde	Merge tag '0.4.3' into develop 0.4.3	2019-02-23 14:17:13 +07:00
Book Pauk	f015d5f7ed	Merge branch 'release/0.4.3'	2019-02-23 14:17:00 +07:00
Book Pauk	74f8f7f9a4	0.4.3	2019-02-23 14:16:43 +07:00
Book Pauk	2598538de9	Улучшил отзывчивость historyPage при открытии	2019-02-23 14:13:41 +07:00
Book Pauk	a78a00df2b	Поправка label	2019-02-23 14:03:28 +07:00
Book Pauk	92f6beb64e	Merge tag '0.4.2' into develop 0.4.2	2019-02-21 21:39:19 +07:00