alex/yomichan
1
Fork 0
Code Releases Activity

Move apiTextParse implementation into Backend

Browse Source
This commit is contained in:
toasted-nutbread 2019-12-09 21:18:23 -05:00
parent 73ce2fe3d3
commit ddad034aa6
2 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ext/bg/js/api.js
View File

@ -37,36 +37,8 @@ function apiTermsFind(text, details, optionsContext) {
return utilBackend()._onApiTermsFind({text, details, optionsContext}); return utilBackend()._onApiTermsFind({text, details, optionsContext});
} }
async function apiTextParse(text, optionsContext) { function apiTextParse(text, optionsContext) {
const options = await apiOptionsGet(optionsContext); return utilBackend()._onApiTextParse({text, optionsContext});
const translator = utilBackend().translator;
const results = [];
while (text.length > 0) {
const term = [];
const [definitions, sourceLength] = await translator.findTermsInternal(
text.substring(0, options.scanning.length),
dictEnabledSet(options),
options.scanning.alphanumeric,
{}
);
if (definitions.length > 0) {
dictTermsSort(definitions);
const {expression, reading} = definitions[0];
const source = text.substring(0, sourceLength);
for (const {text, furigana} of jpDistributeFuriganaInflected(expression, reading, source)) {
const reading = jpConvertReading(text, furigana, options.parsing.readingMode);
term.push({text, reading});
}
text = text.substring(source.length);
} else {
const reading = jpConvertReading(text[0], null, options.parsing.readingMode);
term.push({text: text[0], reading});
text = text.substring(1);
}
results.push(term);
}
return results;
} }
async function apiTextParseMecab(text, optionsContext) { async function apiTextParseMecab(text, optionsContext) {

30
ext/bg/js/backend.js
View File

@ -254,8 +254,34 @@ class Backend {
return {length, definitions}; return {length, definitions};
} }
_onApiTextParse({text, optionsContext}) { async _onApiTextParse({text, optionsContext}) {
return apiTextParse(text, optionsContext); const options = await this.getOptions(optionsContext);
const results = [];
while (text.length > 0) {
const term = [];
const [definitions, sourceLength] = await this.translator.findTermsInternal(
text.substring(0, options.scanning.length),
dictEnabledSet(options),
options.scanning.alphanumeric,
{}
);
if (definitions.length > 0) {
dictTermsSort(definitions);
const {expression, reading} = definitions[0];
const source = text.substring(0, sourceLength);
for (const {text, furigana} of jpDistributeFuriganaInflected(expression, reading, source)) {
const reading = jpConvertReading(text, furigana, options.parsing.readingMode);
term.push({text, reading});
}
text = text.substring(source.length);
} else {
const reading = jpConvertReading(text[0], null, options.parsing.readingMode);
term.push({text: text[0], reading});
text = text.substring(1);
}
results.push(term);
}
return results;
} }
_onApiTextParseMecab({text, optionsContext}) { _onApiTextParseMecab({text, optionsContext}) {