Load the dictionary from https://skk-dev.github.io/dict/

The dictionaries are not available at http://skk-dict-mirror.appspot.com/ any more. This change replaces the URL with the ones at https://skk-dev.github.io/dict. This is a temporary change and is going to be configurable so that the user can specify any URLs as they like. The change also introduces a third party library, pako, for deflating a gzip file. This is just a hacky way to introduce a library into the extension and we need to take advantage of any package system to install the library.
hkurokawa · Jul 6, 2022 · 326337a · 326337a
1 parent 78ac54e
commit 326337a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 18 deletions.
diff --git a/extension/dictionary_loader.js b/extension/dictionary_loader.js
@@ -86,7 +86,8 @@ Dictionary.prototype.log = function(obj) {
 Dictionary.prototype.doUpdate = function(fs) {
   var self = this;
   var xhr = new XMLHttpRequest();
-  xhr.open('GET', 'http://skk-dict-mirror.appspot.com/' + this.dictionary_name);
+  xhr.responseType = 'arraybuffer';
+  xhr.open('GET', 'https://skk-dev.github.io/dict/' + this.dictionary_name);
   self.log({status:'loading'});
   xhr.onreadystatechange = function() {
     if (xhr.readyState != 4) {
@@ -95,23 +96,31 @@ Dictionary.prototype.doUpdate = function(fs) {
 
     self.log({status:'loaded'});
 
-    self.systemDict = self.parseData(xhr.responseText);
-    self.log({'status':'parsed'});
-    fs.root.getFile(
-      'system-dictionary.json', {create:true}, function(fileEntry) {
-        fileEntry.createWriter(function(fileWriter) {
-          fileWriter.onwriteend = function(e) {
-            var dict_size = 0;
-            for (var w in self.systemDict) dict_size++;
-            self.log({'status':'written'});
-            self.logger = null;
-          };
-          var blob = new Blob([JSON.stringify(self.systemDict)],
-                              {'type': 'text/plain'});
-          fileWriter.write(blob);
+    var fr = new FileReader;
+    fr.onloadend = function() {
+      var response = fr.result;
+      console.log(response);
+      self.systemDict = self.parseData(response);
+      self.log({'status':'parsed'});
+      fs.root.getFile(
+        'system-dictionary.json', {create:true}, function(fileEntry) {
+          fileEntry.createWriter(function(fileWriter) {
+            fileWriter.onwriteend = function(e) {
+              var dict_size = 0;
+              for (var w in self.systemDict) dict_size++;
+              self.log({'status':'written'});
+              self.logger = null;
+            };
+            var blob = new Blob([JSON.stringify(self.systemDict)],
+                                {'type': 'text/plain'});
+            fileWriter.write(blob);
+          });
         });
-      });
-    };
+    }
+    var compressed = new Uint8Array(xhr.response);
+    var decompressed = pako.inflate(compressed);
+    fr.readAsText(new Blob([decompressed], {type: "text/plain"}), 'euc-jp');
+  };
   xhr.send();
 };
 
@@ -170,7 +179,7 @@ Dictionary.prototype.initSystemDictionary = function() {
   }
 
   var request = window.requestFileSystem || window.webkitRequestFileSystem;
-  request(window.TEMPORARY, 50 * 1024 * 1024, onInitFS);
+  request(window.TEMPORARY, 50 * 1024 * 1024, onInitFS, function(error) { console.error(error); });
 };
 
 Dictionary.prototype.lookup = function(reading) {

diff --git a/extension/manifest.json b/extension/manifest.json
@@ -12,6 +12,7 @@
       "roman_modes.js",
       "preedit_modes.js",
       "conversion_modes.js",
+      "pako.es5.min.js",
       "main.js"
     ]
   },

diff --git a/extension/pako.es5.min.js b/extension/pako.es5.min.js
diff --git a/testpage/testpage.html b/testpage/testpage.html
@@ -9,6 +9,7 @@
     <script type="text/javascript" src="../extension/roman_table.js"></script>
     <script type="text/javascript" src="../extension/roman_modes.js"></script>
     <script type="text/javascript" src="../extension/preedit_modes.js"></script>
+    <script type="text/javascript" src="../extension/pako.es5.min.js"></script>
     <script type="text/javascript" src="../extension/main.js"></script>
   </head>
   <body>