deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/0.2.2'

Browse Source
This commit is contained in:
Book Pauk
2019-02-17 14:59:14 +07:00
parent cfcee9eb99 09bfce4590
commit 3a32c09feb
8 changed files with 76 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/api/misc.js
View File

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

2
client/components/App.vue
View File

@@ -210,7 +210,7 @@ class App extends Vue {
}
//yandex-метрика для omnireader
if (this.mode == 'omnireader' && !this.yaMetricsDone) {
if (this.config.branch == 'production' && 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

6
client/components/Reader/HistoryPage/HistoryPage.vue
View File

@@ -126,8 +126,10 @@ class HistoryPage extends Vue {
updateTableData() {
let result = [];
for (let bookKey in bookManager.recent) {
const book = bookManager.recent[bookKey];
const sorted = bookManager.getSortedRecent();
const len = (sorted.length < 100 ? sorted.length : 100);
for (let i = 0; i < len; i++) {
const book = sorted[i];
let d = new Date();
d.setTime(book.touchTime);
const t = formatDate(d).split(' ');

9
client/components/Reader/TextPage/TextPage.vue
View File

@@ -569,7 +569,7 @@ class TextPage extends Vue {
}
if (this.book && this.bookPos > 0 && this.bookPos >= this.parsed.textLength) {
this.doEnd();
this.doEnd(true);
return;
}
@@ -591,7 +591,7 @@ class TextPage extends Vue {
this.debouncedDrawStatusBar();
if (this.book && this.linesDown && this.linesDown.length < this.pageLineCount) {
this.doEnd();
this.doEnd(true);
return;
}
}
@@ -822,7 +822,7 @@ class TextPage extends Vue {
this.bookPos = 0;
}
doEnd() {
doEnd(noAni) {
if (this.parsed.para.length && this.pageLineCount > 0) {
let i = this.parsed.para.length - 1;
let lastPos = this.parsed.para[i].offset + this.parsed.para[i].length - 1;
@@ -830,7 +830,8 @@ class TextPage extends Vue {
if (lines) {
i = this.pageLineCount - 1;
i = (i > lines.length - 1 ? lines.length - 1 : i);
this.currentAnimation = this.pageChangeAnimation;
if (!noAni)
this.currentAnimation = this.pageChangeAnimation;
this.pageChangeDirectionDown = true;
this.bookPos = lines[i].begin;
}

30
client/components/Reader/share/bookManager.js
View File

@@ -22,7 +22,8 @@ class BookManager {
this.settings = settings;
this.books = {};
this.recent = {};
this.recentChanged = true;
this.recentChanged1 = true;
this.recentChanged2 = true;
let len = await bmMetaStore.length();
for (let i = 0; i < len; i++) {
@@ -170,7 +171,8 @@ class BookManager {
await bmRecentStore.setItem(result.key, result);
await this.cleanRecentBooks();
this.recentChanged = true;
this.recentChanged1 = true;
this.recentChanged2 = true;
return result;
}
@@ -186,14 +188,15 @@ class BookManager {
await bmRecentStore.removeItem(value.key);
delete this.recent[value.key];
this.recentChanged = true;
this.recentChanged1 = true;
this.recentChanged2 = true;
}
async cleanRecentBooks() {
if (!this.recent)
await this.init();
if (Object.keys(this.recent).length > 100) {
if (Object.keys(this.recent).length > 1000) {
let min = Date.now();
let found = null;
for (let key in this.recent) {
@@ -212,7 +215,7 @@ class BookManager {
}
mostRecentBook() {
if (!this.recentChanged && this.mostRecentCached) {
if (!this.recentChanged1 && this.mostRecentCached) {
return this.mostRecentCached;
}
@@ -226,10 +229,25 @@ class BookManager {
}
}
this.mostRecentCached = result;
this.recentChanged = false;
this.recentChanged1 = false;
return result;
}
getSortedRecent() {
if (!this.recentChanged2 && this.sortedRecentCached) {
return this.sortedRecentCached;
}
let result = Object.values(this.recent);
result.sort((a, b) => b.touchTime - a.touchTime);
this.sortedRecentCached = result;
this.recentChanged2 = false;
return result;
}
}
export default new BookManager();

2
package.json
View File

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

62
server/core/BookConverter/index.js
View File

@@ -43,7 +43,7 @@ class BookConverter {
else {
//может это чистый текст?
if (textUtils.checkIfText(data)) {
await fs.writeFile(outputFile, this.convertHtml(data));
await fs.writeFile(outputFile, this.convertHtml(data, true));
return;
}
@@ -167,7 +167,7 @@ class BookConverter {
titleInfo['book-title'] = title;
//подозрение на чистый текст, надо разбить на параграфы
if ((isText || pars.length < buf.length/2000) && spaceCounter.length) {
if (isText || pars.length < buf.length/2000) {
let total = 0;
for (let i = 0; i < spaceCounter.length; i++) {
total += (spaceCounter[i] ? spaceCounter[i] : 0);
@@ -176,41 +176,37 @@ class BookConverter {
let i = spaceCounter.length - 1;
while (i > 0 && (!spaceCounter[i] || spaceCounter[i] < total)) i--;
const parIndent = i;
if (parIndent > 0) {//нашли отступ параграфа
const parIndent = (i > 0 ? i : 0);
let newPars = [];
const newPar = () => {
newPars.push({_n: 'p', _t: ''});
};
let newPars = [];
const newPar = () => {
newPars.push({_n: 'p', _t: ''});
};
const growPar = (text) => {
const l = newPars.length;
if (l) {
newPars[l - 1]._t += text;
}
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 (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;
}

13
server/core/BookConverter/textUtils.js
View File

@@ -70,13 +70,22 @@ function getEncoding(buf) {
function checkIfText(buf) {
let spaceCount = 0;
let crCount = 0;
let lfCount = 0;
for (let i = 0; i < buf.length; i++) {
if (buf[i] == 32)
spaceCount++;
if (buf[i] == 13)
crCount++;
if (buf[i] == 10)
lfCount++;
}
const freq = spaceCount/(buf.length + 1);
return (freq > 0.1);
const spaceFreq = spaceCount/(buf.length + 1);
const crFreq = crCount/(buf.length + 1);
const lfFreq = lfCount/(buf.length + 1);
return (spaceFreq > 0.1 || crFreq > 0.03 || lfFreq > 0.03);
}
module.exports = {