alex/yomichan
1
Fork 0
Code Releases Activity

Use native IndexedDB for bulkAdd operations

Browse Source
This commit is contained in:
toasted-nutbread 2019-11-03 13:41:32 -05:00
parent 750439ebf0
commit 6c023789d9
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ext/bg/js/database.js
View File

@ -292,14 +292,18 @@ class Database {
this.validate(); this.validate();
const maxTransactionLength = 1000; const maxTransactionLength = 1000;
const bulkAdd = async (table, items, total, current) => { const bulkAdd = async (objectStoreName, items, total, current) => {
if (items.length < maxTransactionLength) { const db = this.db.backendDB();
for (let i = 0; i < items.length; i += maxTransactionLength) {
if (progressCallback) { if (progressCallback) {
progressCallback(total, current); progressCallback(total, current + i / items.length);
} }
try { try {
await table.bulkAdd(items); const count = Math.min(maxTransactionLength, items.length - i);
const transaction = db.transaction([objectStoreName], 'readwrite');
const objectStore = transaction.objectStore(objectStoreName);
await Database.bulkAdd(objectStore, items, i, count);
} catch (e) { } catch (e) {
if (exceptions) { if (exceptions) {
exceptions.push(e); exceptions.push(e);
@ -307,23 +311,6 @@ class Database {
throw e; throw e;
} }
} }
} else {
for (let i = 0; i < items.length; i += maxTransactionLength) {
if (progressCallback) {
progressCallback(total, current + i / items.length);
}
let count = Math.min(maxTransactionLength, items.length - i);
try {
await table.bulkAdd(items.slice(i, i + count));
} catch (e) {
if (exceptions) {
exceptions.push(e);
} else {
throw e;
}
}
}
} }
}; };
@ -377,7 +364,7 @@ class Database {
} }
} }
await bulkAdd(this.db.terms, rows, total, current); await bulkAdd('terms', rows, total, current);
}; };
const termMetaDataLoaded = async (summary, entries, total, current) => { const termMetaDataLoaded = async (summary, entries, total, current) => {
@ -391,7 +378,7 @@ class Database {
}); });
} }
await bulkAdd(this.db.termMeta, rows, total, current); await bulkAdd('termMeta', rows, total, current);
}; };
const kanjiDataLoaded = async (summary, entries, total, current) => { const kanjiDataLoaded = async (summary, entries, total, current) => {
@ -421,7 +408,7 @@ class Database {
} }
} }
await bulkAdd(this.db.kanji, rows, total, current); await bulkAdd('kanji', rows, total, current);
}; };
const kanjiMetaDataLoaded = async (summary, entries, total, current) => { const kanjiMetaDataLoaded = async (summary, entries, total, current) => {
@ -435,7 +422,7 @@ class Database {
}); });
} }
await bulkAdd(this.db.kanjiMeta, rows, total, current); await bulkAdd('kanjiMeta', rows, total, current);
}; };
const tagDataLoaded = async (summary, entries, total, current) => { const tagDataLoaded = async (summary, entries, total, current) => {
@ -453,7 +440,7 @@ class Database {
rows.push(row); rows.push(row);
} }
await bulkAdd(this.db.tagMeta, rows, total, current); await bulkAdd('tagMeta', rows, total, current);
}; };
return await Database.importDictionaryZip( return await Database.importDictionaryZip(