Merge branch 'release/0.1.3'

0.1.2

client/assets/robots.txt

@@ -0,0 +1,3 @@
+User-agent: *
+Disallow: /?*url=
+Disallow: /#/

client/components/App.vue

@@ -208,6 +208,22 @@ class App extends Vue {
                 this.$router.replace('/reader');
             }
         }
+
+        //yandex-метрика для omnireader
+        if (this.mode == 'omnireader' && !this.yaMetricsDone) {
+            (function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
+            m[i].l=1*new Date();k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)})
+            (window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");// eslint-disable-line no-unexpected-multiline
+
+            ym(52347334, "init", {// eslint-disable-line no-undef
+                id:52347334,
+                clickmap:true,
+                trackLinks:true,
+                accurateTrackBounce:true
+            });
+
+            this.yaMetricsDone = true;
+        }
     }
 }
 //-----------------------------------------------------------------------------

client/components/Reader/HistoryPage/HistoryPage.vue

@@ -141,17 +141,27 @@ class HistoryPage extends Vue {
             }
 
             const fb2 = (book.fb2 ? book.fb2 : {});
+
+            let title = fb2.bookTitle;
+            if (title)
+                title = `"${title}"`;
+            else
+                title = '';
+
+            let author = _.compact([
+                fb2.lastName,
+                fb2.firstName,
+                fb2.middleName
+            ]).join(' ');
+            author = (author ? author : (fb2.bookTitle ? fb2.bookTitle : book.url));
+
             result.push({
                 touchDateTime: book.touchTime,
                 touchDate: t[0],
                 touchTime: t[1],
                 desc: {
-                    title: `"${fb2.bookTitle}"${perc}${textLen}`,
-                    author: _.compact([
-                        fb2.lastName,
-                        fb2.firstName,
-                        fb2.middleName
-                    ]).join(' '),
+                    title: `${title}${perc}${textLen}`,
+                    author,
                 },
                 url: book.url,
                 path: book.path,

client/components/Reader/LoaderPage/LoaderPage.vue

@@ -73,6 +73,7 @@ class LoaderPage extends Vue {
 
     loadFile() {
         const file = this.$refs.file.files[0];
+        this.$refs.file.value = '';
         if (file)
             this.$emit('load-file', {file});
     }

client/components/Reader/Reader.vue

@@ -440,51 +440,55 @@ class Reader extends Vue {
 
     buttonClick(button) {
         const activeClass = this.buttonActiveClass(button);
-        if (!activeClass['tool-button-disabled'])
-            switch (button) {
-                case 'loader':
-                    this.loaderToggle();
-                    break;
-                case 'undoAction':
-                    if (this.actionCur > 0) {
-                        this.actionCur--;
-                        this.bookPosChanged({bookPos: this.actionList[this.actionCur]});
-                    }
-                    break;
-                case 'redoAction':
-                    if (this.actionCur < this.actionList.length - 1) {
-                        this.actionCur++;
-                        this.bookPosChanged({bookPos: this.actionList[this.actionCur]});
-                    }
-                    break;
-                case 'fullScreen':
-                    this.fullScreenToggle();
-                    break;
-                case 'setPosition':
-                    this.setPositionToggle();
-                    break;
-                case 'scrolling':
-                    this.scrollingToggle();
-                    break;
-                case 'search':
-                    this.searchToggle();
-                    break;
-                case 'copyText':
-                    this.copyTextToggle();
-                    break;
-                case 'history':
-                    this.historyToggle();
-                    break;
-                case 'refresh':
-                    if (this.mostRecentBook()) {
-                        this.loadBook({url: this.mostRecentBook().url, force: true});
-                    }
-                    break;
-                case 'settings':
-                    this.settingsToggle();
-                    break;
-            }
+
         this.$refs[button].$el.blur();
+
+        if (activeClass['tool-button-disabled'])
+            return;
+        
+        switch (button) {
+            case 'loader':
+                this.loaderToggle();
+                break;
+            case 'undoAction':
+                if (this.actionCur > 0) {
+                    this.actionCur--;
+                    this.bookPosChanged({bookPos: this.actionList[this.actionCur]});
+                }
+                break;
+            case 'redoAction':
+                if (this.actionCur < this.actionList.length - 1) {
+                    this.actionCur++;
+                    this.bookPosChanged({bookPos: this.actionList[this.actionCur]});
+                }
+                break;
+            case 'fullScreen':
+                this.fullScreenToggle();
+                break;
+            case 'setPosition':
+                this.setPositionToggle();
+                break;
+            case 'scrolling':
+                this.scrollingToggle();
+                break;
+            case 'search':
+                this.searchToggle();
+                break;
+            case 'copyText':
+                this.copyTextToggle();
+                break;
+            case 'history':
+                this.historyToggle();
+                break;
+            case 'refresh':
+                if (this.mostRecentBook()) {
+                    this.loadBook({url: this.mostRecentBook().url, force: true});
+                }
+                break;
+            case 'settings':
+                this.settingsToggle();
+                break;
+        }
     }
 
     buttonActiveClass(button) {
@@ -591,14 +595,19 @@ class Reader extends Vue {
     }
 
     loadBook(opts) {
-        if (!opts) {
+        if (!opts || !opts.url) {
             this.mostRecentBook();
             return;
         }
 
+        let url = opts.url;
+        if ((url.indexOf('http://') != 0) && (url.indexOf('https://') != 0) &&
+            (url.indexOf('file://') != 0))
+            url = 'http://' + url;
+
         // уже просматривается сейчас
         const lastBook = (this.$refs.page ? this.$refs.page.lastBook : null);
-        if (!opts.force && lastBook && lastBook.url == opts.url && bookManager.hasBookParsed(lastBook)) {
+        if (!opts.force && lastBook && lastBook.url == url && bookManager.hasBookParsed(lastBook)) {
             this.loaderActive = false;
             return;
         }
@@ -615,7 +624,7 @@ class Reader extends Vue {
                 progress.setState({state: 'parse'});
 
                 // есть ли среди недавних
-                const key = bookManager.keyFromUrl(opts.url);
+                const key = bookManager.keyFromUrl(url);
                 let wasOpened = await bookManager.getRecentBook({key});
                 wasOpened = (wasOpened ? wasOpened : {});
                 const bookPos = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos);
@@ -626,7 +635,7 @@ class Reader extends Vue {
 
                 if (!opts.force) {
                     // пытаемся загрузить и распарсить книгу в менеджере из локального кэша
-                    const bookParsed = await bookManager.getBook({url: opts.url}, (prog) => {
+                    const bookParsed = await bookManager.getBook({url}, (prog) => {
                         progress.setState({progress: prog});
                     });
 
@@ -662,7 +671,7 @@ class Reader extends Vue {
                 // не удалось, скачиваем книгу полностью с конвертацией
                 let loadCached = true;
                 if (!book) {
-                    book = await readerApi.loadBook(opts.url, (state) => {
+                    book = await readerApi.loadBook(url, (state) => {
                         progress.setState(state);
                     });
                     loadCached = false;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Liberama",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "engines": {
     "node": ">=10.0.0"
   },

server/core/BookConverter/getEncoding.js

@@ -1,68 +0,0 @@
-function getEncoding(buf) {
-        const lowerCase = 3;
-        const upperCase = 1;
-
-        const codePage = {
-            'k': 'koi8-r',
-            'w': 'Windows-1251',
-            'd': 'cp866',
-            'i': 'ISO-8859-5',
-            'm': 'maccyrillic',
-        };
-
-        let charsets = {
-            'k': 0,
-            'w': 0,
-            'd': 0,
-            'i': 0,
-            'm': 0
-        };
-
-        const len = buf.length;
-        const blockSize = (len > 5*3000 ? 3000 : len);
-        let counter = 0;
-        let i = 0;
-        while (i < len) {
-            const char = buf[i];
-            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;
-
-            //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;
-
-            //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;
-
-            counter++;
-
-            if (counter > blockSize) {
-                counter = 0;
-                i += Math.round(len/2 - 2*blockSize);
-            }
-        }
-
-        let sorted = Object.keys(charsets).map(function(key) {
-            return { codePage: codePage[key], c: charsets[key] };
-        });
-
-        sorted.sort((a, b) => b.c - a.c);
-
-        return sorted[0].codePage;
-    }
-
-module.exports = getEncoding;

server/core/BookConverter/index.js

@@ -4,7 +4,7 @@ const iconv = require('iconv-lite');
 const chardet = require('chardet');
 const _ = require('lodash');
 const sax = require('./sax');
-const getEncoding = require('./getEncoding');
+const textUtils = require('./textUtils');
 
 const FileDetector = require('../FileDetector');
 
@@ -18,11 +18,12 @@ class BookConverter {
     async convertToFb2(inputFile, outputFile, url, callback) {
         const fileType = await this.detector.detectFile(inputFile);
         
-        if (fileType && (fileType.ext == 'html' || fileType.ext == 'xml')) {
-            const data = await fs.readFile(inputFile);
+        const data = await fs.readFile(inputFile);
+        callback(100);
 
-            if (data.toString().indexOf('<FictionBook') >= 0) {            
-                await fs.writeFile(outputFile, data);
+        if (fileType && (fileType.ext == 'html' || fileType.ext == 'xml')) {
+            if (data.toString().indexOf('<FictionBook') >= 0) {
+                await fs.writeFile(outputFile, this.checkEncoding(data));
                 return;
             }
 
@@ -34,12 +35,19 @@ class BookConverter {
             }
 
             await fs.writeFile(outputFile, this.convertHtml(data));
-            callback(100);
+            return;
         } else {
             if (fileType)
-                throw new Error(`unknown file format: ${fileType.mime}`);
-            else
-                throw new Error(`unsupported file format: ${url}`);
+                throw new Error(`Этот формат файла не поддерживается: ${fileType.mime}`);
+            else {
+                //может это чистый текст?
+                if (textUtils.checkIfText(data)) {
+                    await fs.writeFile(outputFile, this.convertHtml(data));
+                    return;
+                }
+
+                throw new Error(`Не удалось определить формат файла: ${url}`);
+            }
         }
     }
 
@@ -55,12 +63,34 @@ class BookConverter {
         }
 
         if (selected == 'ISO-8859-5') {
-            selected = getEncoding(data);
+            selected = textUtils.getEncoding(data);
         }
 
         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"'));
+                    }
+                }
+            }
+        }
+
+        return result;
+    }
+
     convertHtml(data, isText) {
         let titleInfo = {};
         let desc = {_n: 'description', 'title-info': titleInfo};

server/core/BookConverter/textUtils.js

@@ -0,0 +1,85 @@
+function getEncoding(buf) {
+    const lowerCase = 3;
+    const upperCase = 1;
+
+    const codePage = {
+        'k': 'koi8-r',
+        'w': 'Windows-1251',
+        'd': 'cp866',
+        'i': 'ISO-8859-5',
+        'm': 'maccyrillic',
+    };
+
+    let charsets = {
+        'k': 0,
+        'w': 0,
+        'd': 0,
+        'i': 0,
+        'm': 0
+    };
+
+    const len = buf.length;
+    const blockSize = (len > 5*3000 ? 3000 : len);
+    let counter = 0;
+    let i = 0;
+    while (i < len) {
+        const char = buf[i];
+        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;
+
+        //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;
+
+        //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;
+
+        counter++;
+
+        if (counter > blockSize) {
+            counter = 0;
+            i += Math.round(len/2 - 2*blockSize);
+        }
+    }
+
+    let sorted = Object.keys(charsets).map(function(key) {
+        return { codePage: codePage[key], c: charsets[key] };
+    });
+
+    sorted.sort((a, b) => b.c - a.c);
+
+    if (sorted[0].c > 0)
+        return sorted[0].codePage;
+    else
+        return 'ISO-8859-5';
+}
+
+function checkIfText(buf) {
+    let spaceCount = 0;
+    for (let i = 0; i < buf.length; i++) {
+        if (buf[i] == 32)
+            spaceCount++;
+    }
+    const freq = spaceCount/(buf.length + 1);
+
+    return (freq > 0.1);
+}
+
+module.exports = {
+    getEncoding,
+    checkIfText,
+}