summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/js/language/dictionary-importer.js2
-rw-r--r--test/test-database.js9
2 files changed, 9 insertions, 2 deletions
diff --git a/ext/js/language/dictionary-importer.js b/ext/js/language/dictionary-importer.js
index cd1b796b..98cddf76 100644
--- a/ext/js/language/dictionary-importer.js
+++ b/ext/js/language/dictionary-importer.js
@@ -126,7 +126,7 @@ class DictionaryImporter {
const {media} = await this._resolveAsyncRequirements(requirements, archive);
// Add dictionary descriptor
- this._progressNextStep(termList.length + termMetaList.length + kanjiList.length + kanjiMetaList.length + tagList.length);
+ this._progressNextStep(termList.length + termMetaList.length + kanjiList.length + kanjiMetaList.length + tagList.length + media.length);
const summary = this._createSummary(dictionaryTitle, version, index, {prefixWildcardsSupported});
dictionaryDatabase.bulkAdd('dictionaries', [summary], 0, 1);
diff --git a/test/test-database.js b/test/test-database.js
index 21c653be..e855f07f 100644
--- a/test/test-database.js
+++ b/test/test-database.js
@@ -43,7 +43,14 @@ function createTestDictionaryArchive(dictionary, dictionaryName) {
function createDictionaryImporter(onProgress) {
const dictionaryImporterMediaLoader = new DatabaseVMDictionaryImporterMediaLoader();
- return new DictionaryImporter(dictionaryImporterMediaLoader, onProgress);
+ return new DictionaryImporter(dictionaryImporterMediaLoader, (...args) => {
+ const {stepIndex, stepCount, index, count} = args[0];
+ assert.ok(stepIndex < stepCount);
+ assert.ok(index <= count);
+ if (typeof onProgress === 'function') {
+ onProgress(...args);
+ }
+ });
}