Merge branch 'release/0.8.1-1'

Добавлен компонент GithubCorner на LoaderPage
0.8.1
2020-01-10 21:47:50 +07:00 · 2020-01-09 20:15:32 +07:00 · 2020-01-09 20:14:49 +07:00 · 2020-01-08 13:46:24 +07:00 · 2020-01-07 23:12:06 +07:00 · 2020-01-07 22:57:38 +07:00
14 changed files with 233 additions and 54 deletions
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 Браузерная онлайн-читалка книг и децентрализованная библиотека.

-Читалка ![](https://omnireader.ru/favicon.ico)[OmniReader](https://omnireader.ru) является частью данного проекта, развернутой на VPS:
+Читалка ![](https://omnireader.ru/favicon.ico)[OmniReader](https://omnireader.ru) является частью данного проекта, размещенной на VPS:

 ![](docs/assets/face.jpg)
 ![](docs/assets/reader.jpg)
@@ -11,6 +11,7 @@
 Для разворачивания читалки на чистом VPS с нуля смотрите [docs/omnireader](docs/omnireader/README.md)

 ## Сборка проекта
+Необходима версия node.js не ниже 10.

 ```
 $ git clone https://github.com/bookpauk/liberama
--- a/client/components/Reader/LoaderPage/GithubCorner/GithubCorner.vue
+++ b/client/components/Reader/LoaderPage/GithubCorner/GithubCorner.vue
@@ -0,0 +1,128 @@
+<template>
+  <div id="vue-github-corner">
+    <a  :href="url" id="github-corner" target="_blank" aria-label="View source on Github" >
+      <svg  id="github-corner-svg"
+            aria-hidden="true"
+            viewBox="0 0 250 250" 
+            :width="size" :height="size"
+            :style="svgStyle" >
+        <path :d="svgPath1" @mouseenter="flipColor" @mouseleave="flipColor"></path>
+        <path :d="svgPath2" :style="gitStyle" class="octo-arm"></path>
+        <path :d="svgPath3" :style="gitStyle" class="octo-body"></path>
+      </svg>
+    </a>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'GithubCorner',
+    props: {
+      url: {
+        type: String,
+        default: '/'
+      },
+      size: {
+        type: Number,
+        default: 80
+      },
+      colorScheme: {
+        type: String,
+        default: 'auto'
+      },
+      cornerColor: {
+        type: String, 
+        default: '#625D5D'
+      },
+      gitColor: {
+        type: String,
+        default: 'PeachPuff'
+      },
+      leftCorner: {
+        type: Boolean,
+        default: false
+      },
+      flipOnHover: {
+        type: Boolean,
+        default: false
+      }
+    },
+    data () {
+      return {
+        svgStyle: {
+          fill: this.cornerColor,
+          right: (this.leftCorner ? 'auto' : '0'),
+          left: (this.leftCorner ? '0' : 'auto'),
+          transform: (this.leftCorner ? 'scale(-1, 1)' : 'none')
+        },
+        gitStyle: {
+          fill: this.gitColor
+        },
+        flipped: false,
+        svgPath1: 'M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z',
+        svgPath2: 'M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2',
+        svgPath3: 'M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z'
+      }
+    },
+    methods: {
+      flipColor: function() {
+        if (this.flipOnHover) {
+          let holdSvgFill = this.svgStyle.fill
+          this.svgStyle.fill = this.gitStyle.fill
+          this.gitStyle.fill = holdSvgFill
+        }
+      }
+    },
+    beforeMount: function() {
+      if (this.colorScheme != 'auto') {
+        let sch = this.colorScheme
+        this.gitStyle.fill = '#fff'
+
+        if (sch.toLowerCase() == 'black') {
+          this.svgStyle.fill = '#151513'
+        } 
+        if (sch.toLowerCase() == 'green') {
+          this.svgStyle.fill = '#64CEAA'
+        }
+        if (sch.toLowerCase() == 'red') {
+          this.svgStyle.fill = '#FD6C6C'
+        }
+        if (sch.toLowerCase() == 'blue') {
+          this.svgStyle.fill = '#70B7FD'
+        }
+        if (sch.toLowerCase() == 'white') {
+          this.svgStyle.fill = '#fff'
+          this.gitStyle.fill = '#151513'
+        }
+      }
+    }
+  }
+</script>
+
+<style>
+  #github-corner .octo-arm {
+    transform-origin: 130px 106px
+  }
+  #github-corner:hover .octo-arm {
+    animation: octocat-wave 560ms ease-in-out;
+  }
+
+  @keyframes octocat-wave {
+    0% { transform: rotate(0deg); }
+    20% { transform: rotate(-25deg); }
+    40% { transform: rotate(10deg); }
+    60% { transform: rotate(-25deg); }
+    80% { transform: rotate(10deg); }
+    100% { transform: rotate(0deg); }
+  }
+
+  #github-corner-svg {
+    color: #fff;
+    position: absolute;
+    top: 0;
+    border: 0;
+  }
+    #github-corner-svg, #github-corner-svg .octo-arm, #github-corner-svg .octo-body {
+      transition: fill 1s ease;
+    }
+</style>
--- a/client/components/Reader/LoaderPage/LoaderPage.vue
+++ b/client/components/Reader/LoaderPage/LoaderPage.vue
@@ -1,5 +1,6 @@
 <template>
    <div ref="main" class="main">
+        <GithubCorner url="https://github.com/bookpauk/liberama" cornerColor="#1B695F"></GithubCorner>
        <div class="part top">
            <span class="greeting bold-font">{{ title }}</span>
            <div class="space"></div>
@@ -54,11 +55,14 @@
 //-----------------------------------------------------------------------------
 import Vue from 'vue';
 import Component from 'vue-class-component';
+import GithubCorner from './GithubCorner/GithubCorner.vue';
+
 import PasteTextPage from './PasteTextPage/PasteTextPage.vue';
 import {versionHistory} from '../versionHistory';

 export default @Component({
    components: {
+        GithubCorner,
        PasteTextPage,
    },
 })
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -824,7 +824,8 @@ class Reader extends Vue {
            return;
        }

-        let url = opts.url;
+        let url = encodeURI(decodeURI(opts.url));
+
        if ((url.indexOf('http://') != 0) && (url.indexOf('https://') != 0) &&
            (url.indexOf('file://') != 0))
            url = 'http://' + url;
--- a/client/components/Reader/TextPage/TextPage.vue
+++ b/client/components/Reader/TextPage/TextPage.vue
@@ -225,30 +225,23 @@ class TextPage extends Vue {

        //scrolling page
        const pageSpace = this.scrollHeight - this.pageLineCount*this.lineHeight;
-        let y = pageSpace/2;
+        let top = pageSpace/2;
        if (this.showStatusBar)
-            y += this.statusBarHeight*(this.statusBarTop ? 1 : 0);
-        let page1 = this.$refs.scrollBox1;
-        let page2 = this.$refs.scrollBox2;
+            top += this.statusBarHeight*(this.statusBarTop ? 1 : 0);
+        let page1 = this.$refs.scrollBox1.style;
+        let page2 = this.$refs.scrollBox2.style;
        
-        page1.style.perspective = '3072px';
-        page2.style.perspective = '3072px';
+        page1.perspective = page2.perspective = '3072px';

-        page1.style.width = this.w + this.indentLR + 'px';
-        page2.style.width = this.w + this.indentLR + 'px';
-        page1.style.height = this.scrollHeight - (pageSpace > 0 ? pageSpace : 0) + 'px';
-        page2.style.height = this.scrollHeight - (pageSpace > 0 ? pageSpace : 0) + 'px';
-        page1.style.top = y + 'px';
-        page2.style.top = y + 'px';
-        page1.style.left = this.indentLR + 'px';
-        page2.style.left = this.indentLR + 'px';
+        page1.width = page2.width = this.w + this.indentLR + 'px';
+        page1.height = page2.height = this.scrollHeight - (pageSpace > 0 ? pageSpace : 0) + 'px';
+        page1.top = page2.top = top + 'px';
+        page1.left = page2.left = this.indentLR + 'px';

-        page1 = this.$refs.scrollingPage1;
-        page2 = this.$refs.scrollingPage2;
-        page1.style.width = this.w + this.indentLR + 'px';
-        page2.style.width = this.w + this.indentLR + 'px';
-        page1.style.height = this.scrollHeight + this.lineHeight + 'px';
-        page2.style.height = this.scrollHeight + this.lineHeight + 'px';
+        page1 = this.$refs.scrollingPage1.style;
+        page2 = this.$refs.scrollingPage2.style;
+        page1.width = page2.width = this.w + this.indentLR + 'px';
+        page1.height = page2.height = this.scrollHeight + this.lineHeight + 'px';
    }

    async checkLoadedFonts() {
--- a/client/components/Reader/versionHistory.js
+++ b/client/components/Reader/versionHistory.js
@@ -1,12 +1,24 @@
 export const versionHistory = [
 {
-    showUntil: '2019-12-31',
+    showUntil: '2020-01-06',
+    header: '0.8.1 (2020-01-07)',
+    content:
+`
+<ul>
+    <li>добавлена частичная поддержка формата FB3</li>
+    <li>исправлен баг "Request path contains unescaped characters"</li>
+</ul>
+`
+},
+
+{
+    showUntil: '2020-01-05',
    header: '0.8.0 (2020-01-02)',
    content:
 `
 <ul>
    <li>окончательный переход на https</li>
-    <li>код проекта выложен на GitHub под лицензией cc0</li>
+    <li>код проекта теперь Open Source: <a href="https://github.com/bookpauk/liberama" target="_blank">https://github.com/bookpauk/liberama</a></li>
 </ul>
 `
 },
--- a/docs/omnireader/README.md
+++ b/docs/omnireader/README.md
@@ -9,7 +9,7 @@ git clone https://github.com/bookpauk/liberama
 ### node.js
 ```
 sudo apt install -y curl
-curl -sL https://deb.nodesource.com/setup_10.x | sudo bash -
+curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
 sudo apt install -y nodejs
 ```

@@ -39,6 +39,8 @@ sudo apt install poppler-utils
 ```

 ### nginx, server config
+Для своего домена необходимо будет подправить docs/omnireader/omnireader.
+Можно также настроить сервер для HTTP, без SSL.
 ```
 sudo apt install nginx
 sudo cp docs/omnireader/omnireader /etc/nginx/sites-available/omnireader
@@ -48,6 +50,8 @@ sudo service nginx reload
 sudo chown -R www-data.www-data /var/www
 ```

+### certbot
+Следовать инструкции установки certbot https://certbot.eff.org/lets-encrypt/ubuntubionic-nginx
 ### old.omnireader 
 ```
 sudo apt install php7.2 php7.2-curl php7.2-mbstring php7.2-fpm
@@ -61,12 +65,12 @@ sudo -u www-data cp -r docs/omnireader/old/* /home/oldreader
 ## Деплой и запуск
 ```
 cd docs/omnireader
-sh deploy.sh
-sh run_server.sh
+./deploy.sh
+./run_server.sh
 ```

 После первого запуска будет создан конфигурационный файл `/home/liberama/data/config.json`.
-Необходимо переключить приложение в режим omnireader, отредактировав опцию `servers`:
+Необходимо переключить приложение в режим `omnireader`, отредактировав опцию `servers`:
 ```
    "servers": [
        {
--- a/docs/omnireader/deploy.sh
+++ b/docs/omnireader/deploy.sh
@@ -1,2 +1,4 @@
+#!/bin/sh
+
 npm run build:linux
 sudo -u www-data cp -r ../../dist/linux/* /home/liberama
--- a/docs/omnireader/run_server.sh
+++ b/docs/omnireader/run_server.sh
@@ -1 +1,3 @@
+#!/bin/sh
+
 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.8.0",
+  "version": "0.8.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -3610,12 +3610,6 @@
        "path-type": "^3.0.0"
      }
    },
-    "disable-output-webpack-plugin": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/disable-output-webpack-plugin/-/disable-output-webpack-plugin-1.0.1.tgz",
-      "integrity": "sha512-fT4qiosyTqteTKDbYLXISMKzMVbl2dMXbMpUN3VPAUxX9JL81MmOilisbX555W1XS4B6FRzQt9zMtqg1T6Jx9Q==",
-      "dev": true
-    },
    "doctrine": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -4179,12 +4173,6 @@
      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
    },
-    "event-hooks-webpack-plugin": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/event-hooks-webpack-plugin/-/event-hooks-webpack-plugin-2.1.4.tgz",
-      "integrity": "sha512-TmxHNmRHPIG4XVDtAKT6i/rXNTAR6EnFQlSVsBFMkQ1f0MT2Me9RBNLw4E1JvdH433ag1VF9tPkp5sjTOfZM4Q==",
-      "dev": true
-    },
    "events": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
@@ -7500,12 +7488,6 @@
        "boolbase": "~1.0.0"
      }
    },
-    "null-loader": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/null-loader/-/null-loader-0.1.1.tgz",
-      "integrity": "sha1-F76av80/8OFRL2/Er8sfUDk3j64=",
-      "dev": true
-    },
    "number-is-nan": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "Liberama",
-  "version": "0.8.0",
+  "version": "0.8.1",
  "author": "Book Pauk <bookpauk@gmail.com>",
  "license": "CC0-1.0",
  "repository": "bookpauk/liberama",
@@ -32,17 +32,14 @@
    "clean-webpack-plugin": "^1.0.1",
    "copy-webpack-plugin": "^5.1.1",
    "css-loader": "^1.0.0",
-    "disable-output-webpack-plugin": "^1.0.1",
    "element-theme-chalk": "^2.12.0",
    "eslint": "^5.16.0",
    "eslint-plugin-html": "^5.0.5",
    "eslint-plugin-node": "^8.0.0",
    "eslint-plugin-vue": "^5.2.3",
-    "event-hooks-webpack-plugin": "^2.1.4",
    "file-loader": "^3.0.1",
    "html-webpack-plugin": "^3.2.0",
    "mini-css-extract-plugin": "^0.5.0",
-    "null-loader": "^0.1.1",
    "optimize-css-assets-webpack-plugin": "^5.0.3",
    "pkg": "^4.4.2",
    "terser-webpack-plugin": "^1.4.1",
--- a/server/core/Reader/BookConverter/ConvertDocX.js
+++ b/server/core/Reader/BookConverter/ConvertDocX.js
@@ -4,14 +4,15 @@ const path = require('path');
 const ConvertBase = require('./ConvertBase');

 class ConvertDocX extends ConvertBase {
-    check(data, opts) {
+    async 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;
+                    const contentTypes = await fs.readFile(`${inputFiles.filesDir}/${file.path}`, 'utf8');
+                    return contentTypes.indexOf('/word/document.xml') >= 0;
                }
            }
        }
@@ -30,7 +31,7 @@ class ConvertDocX extends ConvertBase {
    }

    async run(data, opts) {
-        if (!this.check(data, opts))
+        if (!(await this.check(data, opts)))
            return false;
        await this.checkExternalConverterPresent();

--- a/server/core/Reader/BookConverter/ConvertFb3.js
+++ b/server/core/Reader/BookConverter/ConvertFb3.js
@@ -0,0 +1,51 @@
+const fs = require('fs-extra');
+
+const ConvertHtml = require('./ConvertHtml');
+
+class ConvertDocX extends ConvertHtml {
+    async 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') {
+                    const contentTypes = await fs.readFile(`${inputFiles.filesDir}/${file.path}`, 'utf8');
+                    return contentTypes.indexOf('/fb3/body.xml') >= 0;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    getTitle(text) {
+        let title = '';
+        const m = text.match(/<title>([\s\S]*?)<\/title>/);
+        if (m)
+            title = m[1];
+
+        return title.trim();
+    }
+
+    async run(data, opts) {
+        if (!(await this.check(data, opts)))
+            return false;
+
+        const {inputFiles} = opts;
+
+        let text = await fs.readFile(`${inputFiles.filesDir}/fb3/body.xml`, 'utf8');
+
+        const title = this.getTitle(text)
+            .replace(/<\/?p>/g, '')
+        ;
+        text = `<title>${title}</title>` + text
+            .replace(/<title>/g, '<br><b>')
+            .replace(/<\/title>/g, '</b><br>')
+            .replace(/<subtitle>/g, '<br><br><subtitle>')
+        ;
+        return await super.run(Buffer.from(text), {skipCheck: true, cutTitle: true});
+    }
+}
+
+module.exports = ConvertDocX;
--- a/server/core/Reader/BookConverter/index.js
+++ b/server/core/Reader/BookConverter/index.js
@@ -7,6 +7,7 @@ const convertClassFactory = [
    require('./ConvertPdf'),
    require('./ConvertRtf'),
    require('./ConvertDocX'),
+    require('./ConvertFb3'),
    require('./ConvertDoc'),
    require('./ConvertMobi'),
    require('./ConvertFb2'),
Author	SHA1	Message	Date
Book Pauk	da34472a6f	Merge branch 'release/0.8.1-1'	2020-01-10 21:47:50 +07:00
Book Pauk	e89b6e3ea0	Добавлен компонент GithubCorner на LoaderPage	2020-01-09 20:15:32 +07:00
Book Pauk	977bab4745	0.8.1	2020-01-09 20:14:49 +07:00
Book Pauk	26c73109fe	Небольшая поправка	2020-01-08 13:46:24 +07:00
Book Pauk	65f911ad51	Поправил CRLF => LF	2020-01-07 23:12:06 +07:00
Book Pauk	f8ed5ebd6a	Merge tag '0.8.1' into develop 0.8.1	2020-01-07 22:57:38 +07:00
Book Pauk	e4cb61bebe	Merge branch 'release/0.8.1'	2020-01-07 22:57:30 +07:00
Book Pauk	7d5310af42	Версия 0.8.1	2020-01-07 22:57:06 +07:00
Book Pauk	f68c610c0d	Добавлена поддержка формата FB3 "для галочки"	2020-01-07 22:52:28 +07:00
Book Pauk	ccfb6a6d73	Исправление бага "Request path contains unescaped characters"	2020-01-07 20:31:52 +07:00
Book Pauk	da55996e22	Удалил неиспользуемые пакеты	2020-01-05 15:28:35 +07:00
Book Pauk	ecd8400a34	Удалил неиспользуемые пакеты	2020-01-05 15:15:55 +07:00
Book Pauk	03914883bc	Поправил readme	2020-01-05 13:37:09 +07:00
Book Pauk	9981e1f3bd	Мелкие поправки	2020-01-03 17:06:03 +07:00
Book Pauk	4d1df66025	Небольшой рефакторинг	2020-01-03 16:58:37 +07:00
Book Pauk	a0f64e188b	Поправил readme	2020-01-03 15:59:00 +07:00
Book Pauk	08407a1094	Merge tag '0.8.0-1' into develop 0.8.0-1	2020-01-02 23:45:55 +07:00
Book Pauk	445ea3bb2e	Merge branch 'release/0.8.0-1'	2020-01-02 23:45:46 +07:00
Book Pauk	0e0aab98b1	Поправил историю версий	2020-01-02 23:45:16 +07:00
Book Pauk	721d5eb0c1	Поправил readme	2020-01-02 23:45:03 +07:00
Book Pauk	6d99dbc3a7	Мелкая поправка	2020-01-02 22:49:31 +07:00
Book Pauk	2be31f649b	Merge tag '0.8.0' into develop 0.8.0	2020-01-02 22:26:15 +07:00