diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index 207469bd..c2c40543 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -733,7 +733,7 @@ class Reader extends Vue { const mrb = this.mostRecentBook(); if (mrb) { if (mode && mode == 'split') { - this.loadBook({url: mrb.url, uploadFileName: mrb.uploadFileName, skipCheck: true, isText: true, force: true}); + this.loadBook({url: mrb.url, uploadFileName: mrb.uploadFileName, skipHtmlCheck: true, isText: true, force: true}); } else { this.loadBook({url: mrb.url, uploadFileName: mrb.uploadFileName, force: true}); } @@ -973,7 +973,7 @@ class Reader extends Vue { if (!book) { book = await readerApi.loadBook({ url, - skipCheck: (opts.skipCheck ? true : false), + skipHtmlCheck: (opts.skipHtmlCheck ? true : false), isText: (opts.isText ? true : false), enableSitesFilter: this.enableSitesFilter, uploadFileName diff --git a/server/controllers/ReaderController.js b/server/controllers/ReaderController.js index a4c967b8..763d9016 100644 --- a/server/controllers/ReaderController.js +++ b/server/controllers/ReaderController.js @@ -20,7 +20,7 @@ class ReaderController extends BaseController { const workerId = this.readerWorker.loadBookUrl({ url: request.url, enableSitesFilter: (request.hasOwnProperty('enableSitesFilter') ? request.enableSitesFilter : true), - skipCheck: (request.hasOwnProperty('skipCheck') ? request.skipCheck : false), + skipHtmlCheck: (request.hasOwnProperty('skipHtmlCheck') ? request.skipHtmlCheck : false), isText: (request.hasOwnProperty('isText') ? request.isText : false), uploadFileName: (request.hasOwnProperty('uploadFileName') ? request.uploadFileName : false), }); diff --git a/server/core/Reader/BookConverter/ConvertFb3.js b/server/core/Reader/BookConverter/ConvertFb3.js index cc927271..da4e6235 100644 --- a/server/core/Reader/BookConverter/ConvertFb3.js +++ b/server/core/Reader/BookConverter/ConvertFb3.js @@ -45,7 +45,7 @@ class ConvertFb3 extends ConvertHtml { .replace(//g, '

') .replace(/<\/subtitle>/g, '') ; - return await super.run(Buffer.from(text), {skipCheck: true}); + return await super.run(Buffer.from(text), {skipHtmlCheck: true}); } } diff --git a/server/core/Reader/BookConverter/ConvertHtml.js b/server/core/Reader/BookConverter/ConvertHtml.js index 6471662b..de6d65d4 100644 --- a/server/core/Reader/BookConverter/ConvertHtml.js +++ b/server/core/Reader/BookConverter/ConvertHtml.js @@ -24,15 +24,13 @@ class ConvertHtml extends ConvertBase { } async run(data, opts) { - let isText = false; - if (!opts.skipCheck) { + let {isText = false, uploadFileName = ''} = opts; + if (!opts.skipHtmlCheck) { const checkResult = this.check(data, opts); if (!checkResult) return false; isText = checkResult.isText; - } else { - isText = opts.isText; } let titleInfo = {}; @@ -242,6 +240,9 @@ class ConvertHtml extends ConvertBase { innerCut: new Set(['head', 'script', 'style', 'binary', 'fb2-image', 'fb2-title', 'fb2-author']) }); + if (!title) + title = uploadFileName; + titleInfo['book-title'] = title; if (author) titleInfo.author = {'last-name': author}; diff --git a/server/core/Reader/BookConverter/ConvertPdf.js b/server/core/Reader/BookConverter/ConvertPdf.js index a41a31e6..1e302740 100644 --- a/server/core/Reader/BookConverter/ConvertPdf.js +++ b/server/core/Reader/BookConverter/ConvertPdf.js @@ -342,7 +342,7 @@ class ConvertPdf extends ConvertHtml { //console.log(text); await utils.sleep(100); - return await super.run(Buffer.from(text), {skipCheck: true, isText: true}); + return await super.run(Buffer.from(text), {skipHtmlCheck: true, isText: true}); } async getPdfTitleAndAuthor(pdfFile) { diff --git a/server/core/Reader/BookConverter/ConvertSites.js b/server/core/Reader/BookConverter/ConvertSites.js index 6fb91d6b..85bc3e73 100644 --- a/server/core/Reader/BookConverter/ConvertSites.js +++ b/server/core/Reader/BookConverter/ConvertSites.js @@ -48,7 +48,7 @@ class ConvertSites extends ConvertHtml { if (text === false) return false; - return await super.run(Buffer.from(text), {skipCheck: true}); + return await super.run(Buffer.from(text), {skipHtmlCheck: true}); } getTitle(text) {