diff --git a/server/core/BookConverter/index.js b/server/core/BookConverter/index.js index 1a6adaf9..a87bbdbe 100644 --- a/server/core/BookConverter/index.js +++ b/server/core/BookConverter/index.js @@ -22,8 +22,8 @@ class BookConverter { callback(100); if (fileType && (fileType.ext == 'html' || fileType.ext == 'xml')) { - if (data.toString().indexOf('= 0) { - await fs.writeFile(outputFile, data); + if (data.toString().indexOf('= 0) { + await fs.writeFile(outputFile, this.checkEncoding(data)); return; } @@ -69,6 +69,26 @@ class BookConverter { return iconv.decode(data, selected); } + checkEncoding(data) { + let result = data; + + const left = data.indexOf('= 0) { + const right = data.indexOf('?>', left); + if (right >= 0) { + const head = data.slice(left, right + 2).toString(); + const m = head.match(/encoding="(.*)"/); + if (m) { + let encoding = m[1].toLowerCase(); + if (encoding != 'utf-8') + result = iconv.decode(data, encoding); + } + } + } + + return result; + } + convertHtml(data, isText) { let titleInfo = {}; let desc = {_n: 'description', 'title-info': titleInfo};