alex/yomichan
1
Fork 0
Code Releases Activity

Move apiDefinitionsAddable implementation into Backend

Browse Source
This commit is contained in:
toasted-nutbread 2019-12-09 21:28:27 -05:00
parent c9cd29889d
commit 233ed4d0fb
2 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,51 +53,8 @@ function apiDefinitionAdd(definition, mode, context, optionsContext) {
return utilBackend()._onApiDefinitionAdd({definition, mode, context, optionsContext}); return utilBackend()._onApiDefinitionAdd({definition, mode, context, optionsContext});
} }
async function apiDefinitionsAddable(definitions, modes, optionsContext) { function apiDefinitionsAddable(definitions, modes, optionsContext) {
const options = await apiOptionsGet(optionsContext); return utilBackend()._onApiDefinitionsAddable({definitions, modes, optionsContext});
const states = [];
try {
const notes = [];
for (const definition of definitions) {
for (const mode of modes) {
const note = await dictNoteFormat(definition, mode, options);
notes.push(note);
}
}
const cannotAdd = [];
const anki = utilBackend().anki;
const results = await anki.canAddNotes(notes);
for (let resultBase = 0; resultBase < results.length; resultBase += modes.length) {
const state = {};
for (let modeOffset = 0; modeOffset < modes.length; ++modeOffset) {
const index = resultBase + modeOffset;
const result = results[index];
const info = {canAdd: result};
state[modes[modeOffset]] = info;
if (!result) {
cannotAdd.push([notes[index], info]);
}
}
states.push(state);
}
if (cannotAdd.length > 0) {
const noteIdsArray = await anki.findNoteIds(cannotAdd.map((e) => e[0]));
for (let i = 0, ii = Math.min(cannotAdd.length, noteIdsArray.length); i < ii; ++i) {
const noteIds = noteIdsArray[i];
if (noteIds.length > 0) {
cannotAdd[i][1].noteId = noteIds[0];
}
}
}
} catch (e) {
// NOP
}
return states;
} }
async function apiNoteView(noteId) { async function apiNoteView(noteId) {

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

@ -339,8 +339,50 @@ class Backend {
return this.anki.addNote(note); return this.anki.addNote(note);
} }
_onApiDefinitionsAddable({definitions, modes, optionsContext}) { async _onApiDefinitionsAddable({definitions, modes, optionsContext}) {
return apiDefinitionsAddable(definitions, modes, optionsContext); const options = await this.getOptions(optionsContext);
const states = [];
try {
const notes = [];
for (const definition of definitions) {
for (const mode of modes) {
const note = await dictNoteFormat(definition, mode, options);
notes.push(note);
}
}
const cannotAdd = [];
const results = await this.anki.canAddNotes(notes);
for (let resultBase = 0; resultBase < results.length; resultBase += modes.length) {
const state = {};
for (let modeOffset = 0; modeOffset < modes.length; ++modeOffset) {
const index = resultBase + modeOffset;
const result = results[index];
const info = {canAdd: result};
state[modes[modeOffset]] = info;
if (!result) {
cannotAdd.push([notes[index], info]);
}
}
states.push(state);
}
if (cannotAdd.length > 0) {
const noteIdsArray = await this.anki.findNoteIds(cannotAdd.map((e) => e[0]));
for (let i = 0, ii = Math.min(cannotAdd.length, noteIdsArray.length); i < ii; ++i) {
const noteIds = noteIdsArray[i];
if (noteIds.length > 0) {
cannotAdd[i][1].noteId = noteIds[0];
}
}
}
} catch (e) {
// NOP
}
return states;
} }
_onApiNoteView({noteId}) { _onApiNoteView({noteId}) {