aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2019-10-19 10:09:18 -0400
committertoasted-nutbread <toasted-nutbread@users.noreply.github.com>2019-10-19 10:19:12 -0400
commitd212d0aba132efb17d5dd2f354dfe596d6f8d018 (patch)
tree5f1f5ff80d4ff683bac035b42efaefcd1e05054a
parent9364a7cb4ebec4f0ec2c1b51e305ab00a8131856 (diff)
Add additional database bulk methods
-rw-r--r--ext/bg/js/database.js86
1 files changed, 75 insertions, 11 deletions
diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index dfa4ea70..37f19359 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -58,7 +58,7 @@ class Database {
await this.prepare();
}
- async findTermsBulk(terms, titles) {
+ async findTermsBulk(termList, titles) {
this.validate();
const promises = [];
@@ -77,8 +77,8 @@ class Database {
const dbIndex1 = dbTerms.index('expression');
const dbIndex2 = dbTerms.index('reading');
- for (let i = 0; i < terms.length; ++i) {
- const only = IDBKeyRange.only(terms[i]);
+ for (let i = 0; i < termList.length; ++i) {
+ const only = IDBKeyRange.only(termList[i]);
promises.push(
Database.getAll(dbIndex1, only, i, processRow),
Database.getAll(dbIndex2, only, i, processRow)
@@ -103,6 +103,32 @@ class Database {
return results;
}
+ async findTermsExactBulk(termList, readingList, titles) {
+ this.validate();
+
+ const promises = [];
+ const results = [];
+ const processRow = (row, index) => {
+ if (row.reading === readingList[index] && titles.includes(row.dictionary)) {
+ results.push(Database.createTerm(row, index));
+ }
+ };
+
+ const db = this.db.backendDB();
+ const dbTransaction = db.transaction(['terms'], 'readonly');
+ const dbTerms = dbTransaction.objectStore('terms');
+ const dbIndex = dbTerms.index('expression');
+
+ for (let i = 0; i < termList.length; ++i) {
+ const only = IDBKeyRange.only(termList[i]);
+ promises.push(Database.getAll(dbIndex, only, i, processRow));
+ }
+
+ await Promise.all(promises);
+
+ return results;
+ }
+
async findTermsBySequence(sequence, mainDictionary) {
this.validate();
@@ -116,24 +142,24 @@ class Database {
return results;
}
- async findTermMetaBulk(terms, titles) {
+ async findTermsBySequenceBulk(sequenceList, mainDictionary) {
this.validate();
const promises = [];
const results = [];
const processRow = (row, index) => {
- if (titles.includes(row.dictionary)) {
- results.push(Database.createMeta(row, index));
+ if (row.dictionary === mainDictionary) {
+ results.push(Database.createTerm(row, index));
}
};
const db = this.db.backendDB();
- const dbTransaction = db.transaction(['termMeta'], 'readonly');
- const dbTerms = dbTransaction.objectStore('termMeta');
- const dbIndex = dbTerms.index('expression');
+ const dbTransaction = db.transaction(['terms'], 'readonly');
+ const dbTerms = dbTransaction.objectStore('terms');
+ const dbIndex = dbTerms.index('sequence');
- for (let i = 0; i < terms.length; ++i) {
- const only = IDBKeyRange.only(terms[i]);
+ for (let i = 0; i < sequenceList.length; ++i) {
+ const only = IDBKeyRange.only(sequenceList[i]);
promises.push(Database.getAll(dbIndex, only, i, processRow));
}
@@ -142,6 +168,10 @@ class Database {
return results;
}
+ async findTermMetaBulk(termList, titles) {
+ return this.findGenericBulk('termMeta', 'expression', termList, titles, Database.createMeta);
+ }
+
async findKanji(kanji, titles) {
this.validate();
@@ -155,6 +185,10 @@ class Database {
return results;
}
+ async findKanjiBulk(kanjiList, titles) {
+ return this.findGenericBulk('kanji', 'character', kanjiList, titles, Database.createKanji);
+ }
+
async findKanjiMeta(kanji, titles) {
this.validate();
@@ -168,6 +202,36 @@ class Database {
return results;
}
+ async findKanjiMetaBulk(kanjiList, titles) {
+ return this.findGenericBulk('kanjiMeta', 'character', kanjiList, titles, Database.createMeta);
+ }
+
+ async findGenericBulk(tableName, indexName, indexValueList, titles, createResult) {
+ this.validate();
+
+ const promises = [];
+ const results = [];
+ const processRow = (row, index) => {
+ if (titles.includes(row.dictionary)) {
+ results.push(createResult(row, index));
+ }
+ };
+
+ const db = this.db.backendDB();
+ const dbTransaction = db.transaction([tableName], 'readonly');
+ const dbTerms = dbTransaction.objectStore(tableName);
+ const dbIndex = dbTerms.index(indexName);
+
+ for (let i = 0; i < indexValueList.length; ++i) {
+ const only = IDBKeyRange.only(indexValueList[i]);
+ promises.push(Database.getAll(dbIndex, only, i, processRow));
+ }
+
+ await Promise.all(promises);
+
+ return results;
+ }
+
findTagForTitleCached(name, title) {
if (this.tagCache.hasOwnProperty(title)) {
const cache = this.tagCache[title];