summaryrefslogtreecommitdiff
path: root/ext/bg/js/database.js
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-07-10 14:53:06 -0700
committerAlex Yatskov <alex@foosoft.net>2017-07-10 14:53:06 -0700
commitf694026827ab2ce3a884206f7494b98335137709 (patch)
tree720b7d897751328cdc4ecdfe3692c30016cbe450 /ext/bg/js/database.js
parent49352c5fa1baea4a6ed7d71d1353c13a56b00bca (diff)
move zip import to async
Diffstat (limited to 'ext/bg/js/database.js')
-rw-r--r--ext/bg/js/database.js48
1 files changed, 47 insertions, 1 deletions
diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 9eed8ea3..45ba3d08 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -224,7 +224,53 @@ class Database {
await this.db.kanji.bulkAdd(rows);
};
- await zipLoadDb(archive, indexLoaded, termsLoaded, kanjiLoaded);
+ await Database.importDictionaryZip(archive, indexLoaded, termsLoaded, kanjiLoaded);
return summary;
}
+
+ static async importDictionaryZip(archive, indexLoaded, termsLoaded, kanjiLoaded) {
+ const files = (await JSZip.loadAsync(archive)).files;
+
+ const indexFile = files['index.json'];
+ if (!indexFile) {
+ throw 'no dictionary index found in archive';
+ }
+
+ const index = JSON.parse(await indexFile.async('string'));
+ if (!index.title || !index.version || !index.revision) {
+ throw 'unrecognized dictionary format';
+ }
+
+ await indexLoaded(
+ index.title,
+ index.version,
+ index.revision,
+ index.tagMeta || {},
+ index.termBanks > 0,
+ index.kanjiBanks > 0
+ );
+
+ const banksTotal = index.termBanks + index.kanjiBanks;
+ let banksLoaded = 0;
+
+ for (let i = 1; i <= index.termBanks; ++i) {
+ const bankFile = files[`term_bank_${i}.json`];
+ if (bankFile) {
+ const bank = JSON.parse(await bankFile.async('string'));
+ await termsLoaded(index.title, bank, banksTotal, banksLoaded++);
+ } else {
+ throw 'missing term bank file';
+ }
+ }
+
+ for (let i = 1; i <= index.kanjiBanks; ++i) {
+ const bankFile = files[`kanji_bank_${i}.json`];
+ if (bankFile) {
+ const bank = JSON.parse(await bankFile.async('string'));
+ await kanjiLoaded(index.title, bank, banksTotal, banksLoaded++);
+ } else {
+ throw 'missing kanji bank file';
+ }
+ }
+ }
}