Optimization

This commit is contained in:
Alex Yatskov 2016-11-12 20:20:23 -08:00
parent 371c07ab1f
commit 320a82146b
2 changed files with 35 additions and 16 deletions

View File

@ -21,6 +21,7 @@ class Database {
constructor() {
this.db = null;
this.dbVer = 6;
this.entities = {};
}
init() {
@ -130,13 +131,29 @@ class Database {
return Promise.reject('database not initialized');
}
return this.db.entities.where('dictionary').anyOf(dictionaries).toArray(rows => {
this.entities = {};
for (const row of rows) {
this.entities[row.name] = row.value;
const promises = [];
for (const dictionary of dictionaries) {
if (this.entities.hasOwnProperty(dictionary)) {
promises.push(Promise.resolve(this.entities[dictionary]));
} else {
const entities = this.entities[dictionary] = {};
promises.push(
this.db.entities.where('dictionary').equals(dictionary).each(row => {
entities[row.name] = row.value;
}).then(() => entities)
);
}
}
return this.entities;
return Promise.all(promises).then(results => {
const entries = {};
for (const result of results) {
for (const name in result) {
entries[name] = result[name];
}
}
return entries;
});
}

View File

@ -125,7 +125,7 @@ function populateDictionaries(opts) {
const dictSpinner = $('#dict-spinner');
dictSpinner.show();
database().getDictionaries().then(rows => {
return database().getDictionaries().then(rows => {
rows.forEach(row => {
const dictOpts = opts.dictionaries[row.title] || {enableTerms: true, enableKanji: false};
const html = Handlebars.templates['dictionary.html']({
@ -197,8 +197,9 @@ function onDictionaryImport() {
};
const dictUrl = $('#dict-url');
loadOptions().then(opts => {
database().importDictionary(dictUrl.val(), callback).then(() => {
return loadOptions().then(opts => populateDictionaries(opts));
return populateDictionaries(opts);
}).catch(error => {
dictError.show().find('span').text(error);
}).then(() => {
@ -208,6 +209,7 @@ function onDictionaryImport() {
dictProgress.hide();
dictSpinner.hide();
});
});
}
function onDictionarySetUrl(e) {