alex/yomichan
1
Fork 0
Code Releases Activity

Ensure frequency values are always numbers (#1943)

Browse Source
This commit is contained in:
toasted-nutbread 2021-09-26 11:08:21 -04:00 committed by GitHub
parent 9899727d7d
commit c15683d206
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/data/schemas/dictionary-kanji-meta-bank-v3-schema.json
View File

@ -17,7 +17,7 @@
"description": "Type of data. \"freq\" corresponds to frequency information." "description": "Type of data. \"freq\" corresponds to frequency information."
}, },
{ {
"type": ["string", "number"], "type": ["number"],
"description": "Data for the character." "description": "Data for the character."
} }
] ]

4
ext/data/schemas/dictionary-term-meta-bank-v3-schema.json
View File

@ -28,7 +28,7 @@
{ {
"oneOf": [ "oneOf": [
{ {
"type": ["string", "number"], "type": ["number"],
"description": "Frequency information for the term." "description": "Frequency information for the term."
}, },
{ {
@ -44,7 +44,7 @@
"description": "Reading for the term." "description": "Reading for the term."
}, },
"frequency": { "frequency": {
"type": ["string", "number"], "type": ["number"],
"description": "Frequency information for the term." "description": "Frequency information for the term."
} }
} }

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

@ -866,7 +866,7 @@ class Translator {
dictionaryIndex, dictionaryIndex,
dictionaryPriority, dictionaryPriority,
hasReading, hasReading,
frequency this._convertFrequency(frequency)
)); ));
} }
} }
@ -920,7 +920,7 @@ class Translator {
dictionaryIndex, dictionaryIndex,
dictionaryPriority, dictionaryPriority,
character, character,
data this._convertFrequency(data)
)); ));
} }
break; break;
@ -971,6 +971,18 @@ class Translator {
}); });
} }
_convertFrequency(value) {
switch (typeof value) {
case 'number':
return value;
case 'string':
value = Number.parseFloat(value);
return Number.isFinite(value) ? value : 0;
default:
return 0;
}
}
// Helpers // Helpers
_getNameBase(name) { _getNameBase(name) {