alex/yomichan
1
Fork 0
Code Releases Activity

Dictionary import count details (#1935)

Browse Source 
* Store count information when importing a dictionary

* Add importDate

* Update property ordering

* Update tests

* Update importDate
This commit is contained in:
toasted-nutbread 2021-09-07 11:12:58 -04:00 committed by GitHub
parent c91831a817
commit ac12b50939
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ext/js/language/dictionary-importer.js
View File

@ -128,7 +128,15 @@ class DictionaryImporter {
// Add dictionary descriptor
this._progressNextStep(termList.length + termMetaList.length + kanjiList.length + kanjiMetaList.length + tagList.length + media.length);
const summary = this._createSummary(dictionaryTitle, version, index, {prefixWildcardsSupported});
const counts = {
terms: {total: termList.length},
termMeta: this._getMetaCounts(termMetaList),
kanji: {total: kanjiList.length},
kanjiMeta: this._getMetaCounts(kanjiMetaList),
tagMeta: {total: tagList.length},
media: {total: media.length}
};
const summary = this._createSummary(dictionaryTitle, version, index, {prefixWildcardsSupported, counts});
dictionaryDatabase.bulkAdd('dictionaries', [summary], 0, 1);
// Add data
@ -189,7 +197,8 @@ class DictionaryImporter {
title: dictionaryTitle,
revision: index.revision,
sequenced: index.sequenced,
version
version,
importDate: Date.now()
};
const {author, url, description, attribution} = index;
@ -556,4 +565,19 @@ class DictionaryImporter {
}
return results;
}
_getMetaCounts(metaList) {
const countsMap = new Map();
for (const {mode} of metaList) {
let count = countsMap.get(mode);
count = typeof count !== 'undefined' ? count + 1 : 1;
countsMap.set(mode, count);
}
const counts = {total: metaList.length};
for (const [key, value] of countsMap.entries()) {
if (Object.prototype.hasOwnProperty.call(counts, key)) { continue; }
counts[key] = value;
}
return counts;
}
}

12
test/test-database.js
View File

@ -147,7 +147,16 @@ async function testDatabase1() {
revision: 'test',
sequenced: true,
version: 3,
prefixWildcardsSupported: true
importDate: 0,
prefixWildcardsSupported: true,
counts: {
kanji: {total: 2},
kanjiMeta: {total: 2, freq: 2},
media: {total: 4},
tagMeta: {total: 15},
termMeta: {total: 16, freq: 9, pitch: 7},
terms: {total: 20}
}
};
// Import data
@ -158,6 +167,7 @@ async function testDatabase1() {
testDictionarySource,
{prefixWildcardsSupported: true}
);
expectedSummary.importDate = result.importDate;
vm.assert.deepStrictEqual(errors, []);
vm.assert.deepStrictEqual(result, expectedSummary);
assert.ok(progressEvent);