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

Мелкий рефакторинг

Browse Source
This commit is contained in:
Book Pauk
2020-12-07 22:13:14 +07:00
parent 063d01b5ca
commit bc3e1f0a6f
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/core/Reader/BookConverter/ConvertFb3.js
View File

@@ -2,7 +2,7 @@ const fs = require('fs-extra');
const ConvertHtml = require('./ConvertHtml'); const ConvertHtml = require('./ConvertHtml');
class ConvertDocX extends ConvertHtml { class ConvertFb3 extends ConvertHtml {
async check(data, opts) { async check(data, opts) {
const {inputFiles} = opts; const {inputFiles} = opts;
if (this.config.useExternalBookConverter && if (this.config.useExternalBookConverter &&
@@ -42,10 +42,11 @@ class ConvertDocX extends ConvertHtml {
text = `<title>${title}</title>` + text text = `<title>${title}</title>` + text
.replace(/<title>/g, '<br><b>') .replace(/<title>/g, '<br><b>')
.replace(/<\/title>/g, '</b><br>') .replace(/<\/title>/g, '</b><br>')
.replace(/<subtitle>/g, '<br><br><subtitle>') .replace(/<subtitle>/g, '<br><br><fb2-subtitle>')
.replace(/<\/subtitle>/g, '</fb2-subtitle>')
; ;
return await super.run(Buffer.from(text), {skipCheck: true, cutTitle: true}); return await super.run(Buffer.from(text), {skipCheck: true, cutTitle: true});
} }
} }
module.exports = ConvertDocX; module.exports = ConvertFb3;

4
server/core/Reader/BookConverter/ConvertHtml.js
View File

@@ -148,7 +148,7 @@ class ConvertHtml extends ConvertBase {
cutTitle = true; cutTitle = true;
} }
if (tag == 'subtitle') { if (tag == 'fb2-subtitle') {
inSubTitle = true; inSubTitle = true;
} }
@@ -184,7 +184,7 @@ class ConvertHtml extends ConvertBase {
if (tag == 'title' || tag == 'cut-title') if (tag == 'title' || tag == 'cut-title')
inTitle = false; inTitle = false;
if (tag == 'subtitle') if (tag == 'fb2-subtitle')
inSubTitle = false; inSubTitle = false;
if (tag == 'fb2-image') if (tag == 'fb2-image')

12
server/core/Reader/BookConverter/ConvertSites.js
View File

@@ -95,12 +95,12 @@ class ConvertSites extends ConvertHtml {
return text.substring(l, r) return text.substring(l, r)
.replace(/blockquote class="?book"?/g, 'p') .replace(/blockquote class="?book"?/g, 'p')
.replace(/<br\/?>\s*<\/h3>/g, '</h3>') .replace(/<br\/?>\s*<\/h3>/g, '</h3>')
.replace(/<h3 class="?book"?>/g, '<br><br><subtitle>') .replace(/<h3 class="?book"?>/g, '<br><br><fb2-subtitle>')
.replace(/<h5 class="?book"?>/g, '<br><br><subtitle>') .replace(/<h5 class="?book"?>/g, '<br><br><fb2-subtitle>')
.replace(/<h3>/g, '<br><br><subtitle>') .replace(/<h3>/g, '<br><br><fb2-subtitle>')
.replace(/<h5>/g, '<br><br><subtitle>') .replace(/<h5>/g, '<br><br><fb2-subtitle>')
.replace(/<\/h3>/g, '</subtitle><br>') .replace(/<\/h3>/g, '</fb2-subtitle><br>')
.replace(/<\/h5>/g, '</subtitle><br>') .replace(/<\/h5>/g, '</fb2-subtitle><br>')
.replace(/<div class="?stanza"?>/g, '<br>') .replace(/<div class="?stanza"?>/g, '<br>')
.replace(/<div>/g, '<br>') .replace(/<div>/g, '<br>')
+ title; + title;