diff --git a/client/components/App.vue b/client/components/App.vue
index 44859c56..9232d1c1 100644
--- a/client/components/App.vue
+++ b/client/components/App.vue
@@ -2,7 +2,7 @@
-
+
@@ -12,8 +12,11 @@
//-----------------------------------------------------------------------------
import Vue from 'vue';
import Component from 'vue-class-component';
+
import Notify from './share/Notify.vue';
import StdDialog from './share/StdDialog.vue';
+
+import miscApi from '../api/misc';
import * as utils from '../share/utils';
export default @Component({
@@ -30,6 +33,8 @@ export default @Component({
})
class App extends Vue {
+ showPage = false;
+
itemRuText = {
'/cardindex': 'Картотека',
'/reader': 'Читалка',
@@ -42,7 +47,6 @@ class App extends Vue {
created() {
this.commit = this.$store.commit;
- this.dispatch = this.$store.dispatch;
this.state = this.$store.state;
this.uistate = this.$store.state.uistate;
this.config = this.$store.state.config;
@@ -116,18 +120,24 @@ class App extends Vue {
this.$root.notify = this.$refs.notify;
this.$root.stdDialog = this.$refs.stdDialog;
- this.dispatch('config/loadConfig');
- this.$watch('apiError', function(newError) {
- if (newError) {
- let mes = newError.message;
- if (newError.response && newError.response.config)
- mes = newError.response.config.url + '
' + newError.response.statusText;
- this.$root.notify.error(mes, 'Ошибка API');
- }
- });
-
this.setAppTitle();
(async() => {
+ //загрузим конфиг сревера
+ try {
+ const config = await miscApi.loadConfig();
+ this.commit('config/setConfig', config);
+ this.showPage = true;
+ } catch(e) {
+ //проверим, не получен ли конфиг ранее
+ if (!this.mode) {
+ this.$root.notify.error(e.message, 'Ошибка API');
+ } else {
+ //вероятно, работаем в оффлайне
+ this.showPage = true;
+ }
+ console.error(e);
+ }
+
//запросим persistent storage
if (navigator.storage && navigator.storage.persist) {
navigator.storage.persist();
diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 09a46a36..f1ee8e8b 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -133,6 +133,9 @@ import ReaderDialogs from './ReaderDialogs/ReaderDialogs.vue';
import bookManager from './share/bookManager';
import rstore from '../../store/modules/reader';
import readerApi from '../../api/reader';
+import miscApi from '../../api/misc';
+
+import {versionHistory} from './versionHistory';
import * as utils from '../../share/utils';
export default @Component({
@@ -229,7 +232,6 @@ class Reader extends Vue {
this.rstore = rstore;
this.loading = true;
this.commit = this.$store.commit;
- this.dispatch = this.$store.dispatch;
this.reader = this.$store.state.reader;
this.config = this.$store.state.config;
@@ -293,6 +295,16 @@ class Reader extends Vue {
await this.$refs.dialogs.init();
})();
+
+ (async() => {
+ this.isFirstNeedUpdateNotify = true;
+ //вечный цикл, запрашиваем периодически конфиг для проверки выхода новой версии читалки
+ while (true) {// eslint-disable-line no-constant-condition
+ await this.checkNewVersionAvailable();
+ await utils.sleep(3600*1000); //каждый час
+ }
+ //дальше кода нет
+ })();
}
loadSettings() {
@@ -304,6 +316,7 @@ class Reader extends Vue {
this.blinkCachedLoad = settings.blinkCachedLoad;
this.showToolButton = settings.showToolButton;
this.enableSitesFilter = settings.enableSitesFilter;
+ this.showNeedUpdateNotify = settings.showNeedUpdateNotify;
this.readerActionByKeyCode = utils.userHotKeysObjectSwap(settings.userHotKeys);
this.$root.readerActionByKeyEvent = (event) => {
@@ -313,6 +326,30 @@ class Reader extends Vue {
this.updateHeaderMinWidth();
}
+ async checkNewVersionAvailable() {
+ if (!this.checkingNewVersion && this.showNeedUpdateNotify) {
+ this.checkingNewVersion = true;
+ try {
+ await utils.sleep(15*1000); //подождем 15 секунд, чтобы прогрузился ServiceWorker при выходе новой версии
+ const config = await miscApi.loadConfig();
+ this.commit('config/setConfig', config);
+
+ let againMes = '';
+ if (this.isFirstNeedUpdateNotify) {
+ againMes = ' ЕЩЕ один раз';
+ }
+
+ if (this.version != this.clientVersion)
+ this.$root.notify.info(`Вышла новая версия (v${this.version}) читалки.
Пожалуйста, обновите страницу${againMes}.`, 'Обновление');
+ } catch(e) {
+ console.error(e);
+ } finally {
+ this.checkingNewVersion = false;
+ }
+ }
+ this.isFirstNeedUpdateNotify = false;
+ }
+
updateHeaderMinWidth() {
const showButtonCount = Object.values(this.showToolButton).reduce((a, b) => a + (b ? 1 : 0), 0);
if (this.$refs.buttons)
@@ -394,6 +431,16 @@ class Reader extends Vue {
return this.$store.state.config.mode;
}
+ get version() {
+ return this.$store.state.config.version;
+ }
+
+ get clientVersion() {
+ let v = versionHistory[0].header;
+ v = v.split(' ')[0];
+ return v;
+ }
+
get routeParamUrl() {
let result = '';
const path = this.$route.fullPath;
@@ -963,6 +1010,8 @@ class Reader extends Vue {
progress.hide(); this.progressActive = false;
this.loaderActive = true;
this.$root.stdDialog.alert(e.message, 'Ошибка', {color: 'negative'});
+ } finally {
+ this.checkNewVersionAvailable();
}
}
diff --git a/client/components/Reader/SettingsPage/include/OthersTab.inc b/client/components/Reader/SettingsPage/include/OthersTab.inc
index 46f3427b..5bc4f21b 100644
--- a/client/components/Reader/SettingsPage/include/OthersTab.inc
+++ b/client/components/Reader/SettingsPage/include/OthersTab.inc
@@ -36,7 +36,18 @@
Показывать уведомление "Что нового"
Показывать уведомления "Что нового"
- при каждом выходе новой версии читалки
+ при появлении новой версии читалки
+
+
+
+
+
+
Уведомление
+
+ Показывать уведомление о новой версии
+
+ Напоминать о необходимости обновления страницы
+ при появлении новой версии читалки
'};
}
@@ -142,29 +150,26 @@ class ConvertPdf extends ConvertHtml {
putImage(100000);
};
+ const onTextNode = (text, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
+ if (!cutCounter && inText) {
+ let tOpen = (bold ? '' : '');
+ tOpen += (italic ? '' : '');
+ let tClose = (italic ? '' : '');
+ tClose += (bold ? '' : '');
+
+ line.text += ` ${tOpen}${text}${tClose}`;
+ }
+ };
+
const onStartNode = (tag, tail, singleTag, cutCounter, cutTag) => {// eslint-disable-line no-unused-vars
- if (tag == 'textstyle') {
- const attrs = sax.getAttrsSync(tail);
- const fontId = (attrs.id && attrs.id.value ? attrs.id.value : '');
- const fontStyle = (attrs.fontstyle && attrs.fontstyle.value ? attrs.fontstyle.value : '');
- const fontSize = (attrs.fontsize && attrs.fontsize.value ? attrs.fontsize.value : '');
-
- if (fontId) {
- const styleTags = {bold: 'b', italics: 'i', superscript: 'sup', subscript: 'sub'};
- const f = fonts[fontId] = {tOpen: '', tClose: '', isBold: false, fontSize};
-
- if (fontStyle) {
- const styles = fontStyle.split(' ');
- styles.forEach(style => {
- const s = styleTags[style];
- if (s) {
- f.tOpen += `<${s}>`;
- f.tClose = `${f.tClose}`;
- if (s == 'b')
- f.isBold = true;
- }
- });
- }
+ if (inText) {
+ switch (tag) {
+ case 'i':
+ italic = true;
+ break;
+ case 'b':
+ bold = true;
+ break;
}
}
@@ -177,80 +182,78 @@ class ConvertPdf extends ConvertHtml {
putPageLines();
}
- if (tag == 'textline') {
+ if (tag == 'fontspec') {
+ const attrs = sax.getAttrsSync(tail);
+ const fontId = (attrs.id && attrs.id.value ? attrs.id.value : '');
+ const fontSize = (attrs.size && attrs.size.value ? attrs.size.value : '');
+
+ if (fontId) {
+ fonts[fontId] = {fontSize};
+
+ }
+ }
+
+ if (tag == 'text' && !inText) {
const attrs = sax.getAttrsSync(tail);
line = {
text: '',
- top: parseInt((attrs.vpos && attrs.vpos.value ? attrs.vpos.value : null), 10),
- left: parseInt((attrs.hpos && attrs.hpos.value ? attrs.hpos.value : null), 10),
+ 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),
- tOpen: '',
- tClose: '',
isSectionTitle: false,
isSubtitle: false,
pageWidth: page.width,
- fonts: [],
+ fontId: (attrs.font && attrs.font.value ? attrs.font.value : ''),
};
if (line.width != 0 || line.height != 0) {
+ inText = true;
pagelines.push(line);
}
}
- if (tag == 'string') {
+ if (tag == 'image') {
const attrs = sax.getAttrsSync(tail);
- if (attrs.content && attrs.content.value) {
+ let 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,
+ left: parseInt((attrs.left && attrs.left.value ? attrs.left.value : null), 10) || 0,
+ width: parseInt((attrs.width && attrs.width.value ? attrs.width.value : null), 10) || 0,
+ height: parseInt((attrs.height && attrs.height.value ? attrs.height.value : null), 10) || 0,
+ };
- let tOpen = '';
- let tClose = '';
- const fontId = (attrs.stylerefs && attrs.stylerefs.value ? attrs.stylerefs.value : '');
- if (fontId && fonts[fontId]) {
- tOpen = fonts[fontId].tOpen;
- tClose = fonts[fontId].tClose;
- if (!line.fonts.length || line.fonts[0] != fontId)
- line.fonts.push(fontId);
- }
-
- if (line.tOpen != tOpen) {
- line.text += line.tClose + tOpen;
- line.tOpen = tOpen;
- line.tClose = tClose;
- }
-
- line.text += `${line.text.length ? ' ' : ''}${attrs.content.value}`;
- }
- }
-
- if (tag == 'illustration') {
- const attrs = sax.getAttrsSync(tail);
- if (attrs.type && attrs.type.value == 'image') {
- let src = (attrs.fileid && attrs.fileid.value ? attrs.fileid.value : '');
- if (src) {
- const image = {
- isImage: true,
- src,
- data: '',
- type: '',
- top: parseInt((attrs.vpos && attrs.vpos.value ? attrs.vpos.value : null), 10) || 0,
- left: parseInt((attrs.hpos && attrs.hpos.value ? attrs.hpos.value : null), 10) || 0,
- width: parseInt((attrs.width && attrs.width.value ? attrs.width.value : null), 10) || 0,
- height: parseInt((attrs.height && attrs.height.value ? attrs.height.value : null), 10) || 0,
- };
- const exists = images.filter(img => (img.top == image.top && img.left == image.left && img.width == image.width && img.height == image.height));
- if (!exists.length) {
- loading.push(loadImage(image));
- images.push(image);
- images.sort((a, b) => (a.top - b.top)*10000 + (a.left - b.left));
- }
- }
+ loading.push(loadImage(image));
+ images.push(image);
+ images.sort((a, b) => (a.top - b.top)*10000 + (a.left - b.left));
}
}
};
+ 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
+ onStartNode, onEndNode, onTextNode
});
putPageLines();
@@ -277,16 +280,8 @@ class ConvertPdf extends ConvertHtml {
}
indents[0] = 0;
- //title
- if (fs.pathExists(metaFile)) {
- const metaXmlString = (await fs.readFile(metaFile)).toString();
- let metaXmlParsed = xmlParser.parseXml(metaXmlString);
- metaXmlParsed = xmlParser.simplifyXmlParsed(metaXmlParsed);
- if (metaXmlParsed.metadata) {
- title = (metaXmlParsed.metadata.title ? metaXmlParsed.metadata.title._t : '');
- author = (metaXmlParsed.metadata.author ? metaXmlParsed.metadata.author._t : '');
- }
- }
+ //author & title
+ let {author, title} = await this.getPdfTitleAndAuthor(inpFile);
if (!title && uploadFileName)
title = uploadFileName;
@@ -302,6 +297,7 @@ class ConvertPdf extends ConvertHtml {
let concat = '';
let sp = '';
+ let firstLine = true;
for (const line of lines) {
if (text.length > limitSize) {
throw new Error(`Файл для конвертирования слишком большой|FORLOG| text.length: ${text.length} > ${limitSize}`);
@@ -313,10 +309,15 @@ class ConvertPdf extends ConvertHtml {
}
if (line.isSectionTitle) {
- text += `${line.text.trim()}`;
+ if (firstLine)
+ text += `${line.text.trim()}`;
+ else
+ text += `${line.text.trim()}`;
continue;
}
+ firstLine = false;
+
if (line.isSubtitle) {
text += `
${line.text.trim()}`;
continue;
@@ -343,6 +344,32 @@ class ConvertPdf extends ConvertHtml {
await utils.sleep(100);
return await super.run(Buffer.from(text), {skipCheck: true, isText: true});
}
+
+ async getPdfTitleAndAuthor(pdfFile) {
+ const result = {author: '', title: ''};
+
+ const pdfinfoPath = '/usr/bin/pdfinfo';
+
+ if (!await fs.pathExists(pdfinfoPath))
+ throw new Error('Внешний конвертер pdfinfo не найден');
+
+ const execResult = await this.execConverter(pdfinfoPath, [pdfFile]);
+
+ const titlePrefix = 'Title:';
+ const authorPrefix = 'Author:';
+
+ const stdout = execResult.stdout.split("\n");
+ stdout.forEach(line => {
+ if (line.indexOf(titlePrefix) == 0)
+ result.title = line.substring(titlePrefix.length).trim();
+
+ if (line.indexOf(authorPrefix) == 0)
+ result.author = line.substring(authorPrefix.length).trim();
+ });
+
+ return result;
+ }
}
+
module.exports = ConvertPdf;
diff --git a/server/core/Reader/BookConverter/index.js b/server/core/Reader/BookConverter/index.js
index ae753bac..2f9e9abb 100644
--- a/server/core/Reader/BookConverter/index.js
+++ b/server/core/Reader/BookConverter/index.js
@@ -3,6 +3,7 @@ const FileDetector = require('../../FileDetector');
//порядок важен
const convertClassFactory = [
+ require('./ConvertJpegPng'),
require('./ConvertEpub'),
require('./ConvertDjvu'),
require('./ConvertPdf'),