alex/yomichan
1
Fork 0
Code Releases Activity

Add custom context object for note creation

Browse Source
This commit is contained in:
toasted-nutbread 2020-03-15 17:13:00 -04:00
parent 8b07a23de9
commit 059db280bb
5 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/bg/js/anki-note-builder.js
View File

@ -21,7 +21,7 @@ class AnkiNoteBuilder {
this._renderTemplate = renderTemplate; this._renderTemplate = renderTemplate;
} }
async createNote(definition, mode, options, templates) { async createNote(definition, mode, context, options, templates) {
const isKanji = (mode === 'kanji'); const isKanji = (mode === 'kanji');
const tags = options.anki.tags; const tags = options.anki.tags;
const modeOptions = isKanji ? options.anki.kanji : options.anki.terms; const modeOptions = isKanji ? options.anki.kanji : options.anki.terms;
@ -35,7 +35,7 @@ class AnkiNoteBuilder {
}; };
for (const [fieldName, fieldValue] of modeOptionsFieldEntries) { for (const [fieldName, fieldValue] of modeOptionsFieldEntries) {
note.fields[fieldName] = await this.formatField(fieldValue, definition, mode, options, templates, null); note.fields[fieldName] = await this.formatField(fieldValue, definition, mode, context, options, templates, null);
} }
if (!isKanji && definition.audio) { if (!isKanji && definition.audio) {
@ -60,7 +60,7 @@ class AnkiNoteBuilder {
return note; return note;
} }
async formatField(field, definition, mode, options, templates, errors=null) { async formatField(field, definition, mode, context, options, templates, errors=null) {
const data = { const data = {
marker: null, marker: null,
definition, definition,
@ -69,7 +69,8 @@ class AnkiNoteBuilder {
modeTermKanji: mode === 'term-kanji', modeTermKanji: mode === 'term-kanji',
modeTermKana: mode === 'term-kana', modeTermKana: mode === 'term-kana',
modeKanji: mode === 'kanji', modeKanji: mode === 'kanji',
compactGlossaries: options.general.compactGlossaries compactGlossaries: options.general.compactGlossaries,
context
}; };
const pattern = /\{([\w-]+)\}/g; const pattern = /\{([\w-]+)\}/g;
return await AnkiNoteBuilder.stringReplaceAsync(field, pattern, async (g0, marker) => { return await AnkiNoteBuilder.stringReplaceAsync(field, pattern, async (g0, marker) => {

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

@ -455,7 +455,7 @@ class Backend {
return results; return results;
} }
async _onApiDefinitionAdd({definition, mode, details, optionsContext}) { async _onApiDefinitionAdd({definition, mode, context, details, optionsContext}) {
const options = this.getOptions(optionsContext); const options = this.getOptions(optionsContext);
const templates = this.defaultAnkiFieldTemplates; const templates = this.defaultAnkiFieldTemplates;
@ -476,11 +476,11 @@ class Backend {
); );
} }
const note = await this.ankiNoteBuilder.createNote(definition, mode, options, templates); const note = await this.ankiNoteBuilder.createNote(definition, mode, context, options, templates);
return this.anki.addNote(note); return this.anki.addNote(note);
} }
async _onApiDefinitionsAddable({definitions, modes, optionsContext}) { async _onApiDefinitionsAddable({definitions, modes, context, optionsContext}) {
const options = this.getOptions(optionsContext); const options = this.getOptions(optionsContext);
const templates = this.defaultAnkiFieldTemplates; const templates = this.defaultAnkiFieldTemplates;
const states = []; const states = [];
@ -489,7 +489,7 @@ class Backend {
const notes = []; const notes = [];
for (const definition of definitions) { for (const definition of definitions) {
for (const mode of modes) { for (const mode of modes) {
const note = await this.ankiNoteBuilder.createNote(definition, mode, options, templates); const note = await this.ankiNoteBuilder.createNote(definition, mode, context, options, templates);
notes.push(note); notes.push(note);
} }
} }

3
ext/bg/js/settings/anki-templates.js
View File

@ -99,10 +99,11 @@ async function ankiTemplatesValidate(infoNode, field, mode, showSuccessResult, i
const definition = await ankiTemplatesValidateGetDefinition(text, optionsContext); const definition = await ankiTemplatesValidateGetDefinition(text, optionsContext);
if (definition !== null) { if (definition !== null) {
const options = await apiOptionsGet(optionsContext); const options = await apiOptionsGet(optionsContext);
const context = {};
let templates = options.anki.fieldTemplates; let templates = options.anki.fieldTemplates;
if (typeof templates !== 'string') { templates = await apiGetDefaultAnkiFieldTemplates(); } if (typeof templates !== 'string') { templates = await apiGetDefaultAnkiFieldTemplates(); }
const ankiNoteBuilder = new AnkiNoteBuilder({renderTemplate: apiTemplateRender}); const ankiNoteBuilder = new AnkiNoteBuilder({renderTemplate: apiTemplateRender});
result = await ankiNoteBuilder.formatField(field, definition, mode, options, templates, exceptions); result = await ankiNoteBuilder.formatField(field, definition, mode, context, options, templates, exceptions);
} }
} catch (e) { } catch (e) {
exceptions.push(e); exceptions.push(e);

8
ext/mixed/js/api.js
View File

@ -53,12 +53,12 @@ function apiKanjiFind(text, optionsContext) {
return _apiInvoke('kanjiFind', {text, optionsContext}); return _apiInvoke('kanjiFind', {text, optionsContext});
} }
function apiDefinitionAdd(definition, mode, details, optionsContext) { function apiDefinitionAdd(definition, mode, context, details, optionsContext) {
return _apiInvoke('definitionAdd', {definition, mode, details, optionsContext}); return _apiInvoke('definitionAdd', {definition, mode, context, details, optionsContext});
} }
function apiDefinitionsAddable(definitions, modes, optionsContext) { function apiDefinitionsAddable(definitions, modes, context, optionsContext) {
return _apiInvoke('definitionsAddable', {definitions, modes, optionsContext}); return _apiInvoke('definitionsAddable', {definitions, modes, context, optionsContext});
} }
function apiNoteView(noteId) { function apiNoteView(noteId) {

8
ext/mixed/js/display.js
View File

@ -760,7 +760,7 @@ class Display {
} }
} }
const noteId = await apiDefinitionAdd(definition, mode, details, this.getOptionsContext()); const noteId = await apiDefinitionAdd(definition, mode, this._getNoteContext(), details, this.getOptionsContext());
if (noteId) { if (noteId) {
const index = this.definitions.indexOf(definition); const index = this.definitions.indexOf(definition);
const adderButton = this.adderButtonFind(index, mode); const adderButton = this.adderButtonFind(index, mode);
@ -908,7 +908,7 @@ class Display {
async getDefinitionsAddable(definitions, modes) { async getDefinitionsAddable(definitions, modes) {
try { try {
return await apiDefinitionsAddable(definitions, modes, this.getOptionsContext()); return await apiDefinitionsAddable(definitions, modes, this._getNoteContext(), this.getOptionsContext());
} catch (e) { } catch (e) {
return []; return [];
} }
@ -934,6 +934,10 @@ class Display {
return (typeof key === 'string' ? (key.length === 1 ? key.toUpperCase() : key) : ''); return (typeof key === 'string' ? (key.length === 1 ? key.toUpperCase() : key) : '');
} }
_getNoteContext() {
return {};
}
async _getAudioUri(definition, source) { async _getAudioUri(definition, source) {
const optionsContext = this.getOptionsContext(); const optionsContext = this.getOptionsContext();
return await apiAudioGetUri(definition, source, optionsContext); return await apiAudioGetUri(definition, source, optionsContext);