Поправил определение кодировки

2019-02-19 02:31:03 +07:00
parent 2a373de5f5
commit 746f9517d9
1 changed files with 8 additions and 10 deletions
--- 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);