alex/yomichan
1
Fork 0
Code Releases Activity

Improve dictionary priority (#1447)

Browse Source 
* Refactor _sortDefinitions

* Remove use of useDictionaryPriority
This commit is contained in:
toasted-nutbread 2021-02-26 23:55:32 -05:00 committed by GitHub
parent 0bf0620c35
commit 9e7a76a1f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ext/js/language/translator.js
View File

@ -149,7 +149,7 @@ class Translator {
async _findTermsSimple(text, options) { async _findTermsSimple(text, options) {
const {enabledDictionaryMap} = options; const {enabledDictionaryMap} = options;
const [definitions, length] = await this._findTermsInternal(text, enabledDictionaryMap, options); const [definitions, length] = await this._findTermsInternal(text, enabledDictionaryMap, options);
this._sortDefinitions(definitions, false); this._sortDefinitions(definitions);
return [definitions, length]; return [definitions, length];
} }
@ -157,7 +157,7 @@ class Translator {
const {enabledDictionaryMap} = options; const {enabledDictionaryMap} = options;
const [definitions, length] = await this._findTermsInternal(text, enabledDictionaryMap, options); const [definitions, length] = await this._findTermsInternal(text, enabledDictionaryMap, options);
await this._buildTermMeta(definitions, enabledDictionaryMap); await this._buildTermMeta(definitions, enabledDictionaryMap);
this._sortDefinitions(definitions, true); this._sortDefinitions(definitions);
return [definitions, length]; return [definitions, length];
} }
@ -167,7 +167,7 @@ class Translator {
const groupedDefinitions = this._groupTerms(definitions, enabledDictionaryMap); const groupedDefinitions = this._groupTerms(definitions, enabledDictionaryMap);
await this._buildTermMeta(groupedDefinitions, enabledDictionaryMap); await this._buildTermMeta(groupedDefinitions, enabledDictionaryMap);
this._sortDefinitions(groupedDefinitions, false); this._sortDefinitions(groupedDefinitions);
for (const definition of groupedDefinitions) { for (const definition of groupedDefinitions) {
this._flagRedundantDefinitionTags(definition.definitions); this._flagRedundantDefinitionTags(definition.definitions);
@ -214,7 +214,7 @@ class Translator {
} }
await this._buildTermMeta(definitionsMerged, enabledDictionaryMap); await this._buildTermMeta(definitionsMerged, enabledDictionaryMap);
this._sortDefinitions(definitionsMerged, false); this._sortDefinitions(definitionsMerged);
for (const definition of definitionsMerged) { for (const definition of definitionsMerged) {
this._flagRedundantDefinitionTags(definition.definitions); this._flagRedundantDefinitionTags(definition.definitions);
@ -470,7 +470,7 @@ class Translator {
glossaryDefinitions.push(glossaryDefinition); glossaryDefinitions.push(glossaryDefinition);
} }
this._sortDefinitions(glossaryDefinitions, true); this._sortDefinitions(glossaryDefinitions);
const termDetailsList = this._createTermDetailsListFromTermInfoMap(termInfoMap); const termDetailsList = this._createTermDetailsListFromTermInfoMap(termInfoMap);
@ -580,7 +580,7 @@ class Translator {
const results = []; const results = [];
for (const groupDefinitions of groups.values()) { for (const groupDefinitions of groups.values()) {
this._sortDefinitions(groupDefinitions, true); this._sortDefinitions(groupDefinitions);
const definition = this._createGroupedTermDefinition(groupDefinitions); const definition = this._createGroupedTermDefinition(groupDefinitions);
results.push(definition); results.push(definition);
} }
@ -1282,11 +1282,14 @@ class Translator {
}); });
} }
_sortDefinitions(definitions, useDictionaryPriority) { _sortDefinitions(definitions) {
if (definitions.length <= 1) { return; } if (definitions.length <= 1) { return; }
const stringComparer = this._stringComparer; const stringComparer = this._stringComparer;
const compareFunction1 = (v1, v2) => { const compareFunction = (v1, v2) => {
let i = v2.source.length - v1.source.length; let i = v2.dictionaryPriority - v1.dictionaryPriority;
if (i !== 0) { return i; }
i = v2.source.length - v1.source.length;
if (i !== 0) { return i; } if (i !== 0) { return i; }
i = v1.reasons.length - v2.reasons.length; i = v1.reasons.length - v2.reasons.length;
@ -1307,11 +1310,7 @@ class Translator {
return stringComparer.compare(expression1, expression2); return stringComparer.compare(expression1, expression2);
}; };
const compareFunction2 = (v1, v2) => { definitions.sort(compareFunction);
const i = v2.dictionaryPriority - v1.dictionaryPriority;
return (i !== 0) ? i : compareFunction1(v1, v2);
};
definitions.sort(useDictionaryPriority ? compareFunction2 : compareFunction1);
} }
_sortDatabaseDefinitionsByIndex(definitions) { _sortDatabaseDefinitionsByIndex(definitions) {