Merge branch 'release/0.7.7d'

Поправлены мета-теги
Merge tag '0.7.7c' into develop
2019-11-18 20:03:46 +07:00 · 2019-11-18 20:03:09 +07:00 · 2019-11-16 18:05:56 +07:00 · 2019-11-16 18:05:40 +07:00 · 2019-11-16 18:04:48 +07:00 · 2019-11-13 19:42:30 +07:00
4 changed files with 6 additions and 6 deletions
--- a/client/assets/robots.txt
+++ b/client/assets/robots.txt
@@ -1,3 +1,2 @@
 User-agent: *
 Disallow: /?*url=
-Disallow: /#/
--- a/client/index.html.template
+++ b/client/index.html.template
@@ -3,8 +3,8 @@
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <meta name="description" content="браузерная онлайн-читалка книг из интернета и библиотека">
-    <meta name="keywords" content="библиотека,онлайн,читалка,книги,читать,браузер,интернет">
+    <meta name="description" content="Браузерная онлайн-читалка книг. Поддерживаются форматы: fb2, html, txt, rtf, doc, docx, pdf, epub, mobi.">
+    <meta name="keywords" content="онлайн,читалка,fb2,книги,читать,браузер,интернет">
    <title></title>
  </head>
  <body>
--- a/server/core/Reader/BookConverter/ConvertBase.js
+++ b/server/core/Reader/BookConverter/ConvertBase.js
@@ -82,7 +82,7 @@ class ConvertBase {
    }

    escapeEntities(text) {
-        return he.escape(he.decode(text));
+        return he.escape(he.decode(text.replace(/&nbsp;/g, ' ')));
    }

    formatFb2(fb2) {
--- a/server/core/Reader/BookConverter/ConvertHtml.js
+++ b/server/core/Reader/BookConverter/ConvertHtml.js
@@ -64,6 +64,7 @@ class ConvertHtml extends ConvertBase {
            for (let line of lines) {
                if (line.trim() == '')
                    continue;
+
                line = repCrLfTab(line);

                let l = 0;
@@ -171,7 +172,6 @@ class ConvertHtml extends ConvertBase {
        });

        titleInfo['book-title'] = title;
-
        //подозрение на чистый текст, надо разбить на параграфы
        if (isText || pars.length < buf.length/2000) {
            let total = 0;
@@ -257,8 +257,9 @@ class ConvertHtml extends ConvertBase {

            pars[i]._t = this.repSpaces(pars[i]._t).trim();

-            if (pars[i]._t.indexOf('<') >= 0) {
+            if (pars[i]._t.indexOf('<') >= 0 || bold || italic) {
                const t = pars[i]._t;
+
                let a = [];

                const onTextNode = (text) => {
Author	SHA1	Message	Date
Book Pauk	aa13dc68fc	Merge branch 'release/0.7.7d'	2019-11-18 20:03:46 +07:00
Book Pauk	813876dd90	Поправлены мета-теги	2019-11-18 20:03:09 +07:00
Book Pauk	596c7d65c5	Merge tag '0.7.7c' into develop 0.7.7c	2019-11-16 18:05:56 +07:00
Book Pauk	ce8dcb75bf	Merge branch 'release/0.7.7c'	2019-11-16 18:05:40 +07:00
Book Pauk	1bd51b5565	Поправил robots.txt	2019-11-16 18:04:48 +07:00
Book Pauk	1f9ec305b4	Merge tag '0.7.7b' into develop 0.7.7b	2019-11-13 19:42:30 +07:00
Book Pauk	be0f6e57d7	Merge branch 'release/0.7.7b'	2019-11-13 19:42:21 +07:00
Book Pauk	b268e9ee74	Улучшение парсинга html	2019-11-13 19:41:20 +07:00
Book Pauk	e97774435b	Merge tag '0.7.7a' into develop 0.7.7a	2019-11-08 17:21:17 +07:00