From 746f9517d91a1bc27cb365bc3731f074123622d2 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 19 Feb 2019 02:31:03 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=B4=D0=B8=D1=80=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/core/BookConverter/index.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/server/core/BookConverter/index.js b/server/core/BookConverter/index.js index efede3d3..41dfd629 100644 --- a/server/core/BookConverter/index.js +++ b/server/core/BookConverter/index.js @@ -53,18 +53,16 @@ class BookConverter { } decode(data) { - const charsetAll = chardet.detectAll(data.slice(0, 20000)); - - let selected = 'ISO-8859-5'; - for (const charset of charsetAll) { - if (charset.name.indexOf('ISO-8859') < 0) { - selected = charset.name; - break; - } - } + let selected = textUtils.getEncoding(data); if (selected == 'ISO-8859-5') { - selected = textUtils.getEncoding(data); + const charsetAll = chardet.detectAll(data.slice(0, 20000)); + for (const charset of charsetAll) { + if (charset.name.indexOf('ISO-8859') < 0) { + selected = charset.name; + break; + } + } } return iconv.decode(data, selected);