diff --git a/client/components/Search/BookInfoDialog/BookInfoDialog.vue b/client/components/Search/BookInfoDialog/BookInfoDialog.vue index dc43230..1c88f49 100644 --- a/client/components/Search/BookInfoDialog/BookInfoDialog.vue +++ b/client/components/Search/BookInfoDialog/BookInfoDialog.vue @@ -8,8 +8,15 @@ -
{{ annotation }}
/g, `
`); } } + } okClick() { diff --git a/server/core/WebWorker.js b/server/core/WebWorker.js index ae54819..c862b0d 100644 --- a/server/core/WebWorker.js +++ b/server/core/WebWorker.js @@ -480,8 +480,8 @@ class WebWorker { result.fb2 = false; if (book.ext == 'fb2') { - const {desc, cover, coverExt} = await this.fb2Helper.getDescAndCover(bookFile); - result.fb2 = desc; + const {fb2, cover, coverExt} = await this.fb2Helper.getDescAndCover(bookFile); + result.fb2 = fb2; if (cover) { result.cover = `${this.config.filesPathStatic}/${hash}${coverExt}`; diff --git a/server/core/fb2/Fb2Helper.js b/server/core/fb2/Fb2Helper.js index 4bb07f3..709844c 100644 --- a/server/core/fb2/Fb2Helper.js +++ b/server/core/fb2/Fb2Helper.js @@ -56,15 +56,15 @@ class Fb2Helper { data = this.checkEncoding(data); - const fb2 = new Fb2Parser(); + const parser = new Fb2Parser(); - fb2.fromString(data.toString(), { + parser.fromString(data.toString(), { lowerCase: true, pickNode: route => route.indexOf('fictionbook/body') !== 0, }); - const desc = fb2.$$('description').toObject(); - const coverImage = fb2.inspector(desc).$('description/title-info/coverpage/image'); + const desc = parser.$$('description').toObject(); + const coverImage = parser.inspector(desc).$('description/title-info/coverpage/image'); let cover = null; let coverExt = ''; @@ -79,7 +79,7 @@ class Fb2Helper { const binaryId = (href[0] == '#' ? href.substring(1) : href); //найдем нужный image - fb2.$$('binary').eachSelf(node => { + parser.$$('binary').eachSelf(node => { let attrs = node.attrs(); if (!attrs) return; @@ -95,7 +95,8 @@ class Fb2Helper { } } - return {desc, cover, coverExt}; + parser.remove('binary'); + return {fb2: parser.toObject(), cover, coverExt}; } }