alex/yomichan
1
Fork 0
Code Releases Activity

cleanup

Browse Source
This commit is contained in:
Alex Yatskov 2017-07-23 22:48:33 -07:00
parent edf1c0ff6d
commit 32680c58b8
10 changed files with 265 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ext/bg/background.html
View File

@ -4,23 +4,25 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
</head> </head>
<body> <body>
<script src="/mixed/lib/handlebars.min.js"></script>
<script src="/mixed/lib/dexie.min.js"></script> <script src="/mixed/lib/dexie.min.js"></script>
<script src="/mixed/lib/wanakana.min.js"></script> <script src="/mixed/lib/handlebars.min.js"></script>
<script src="/mixed/lib/jszip.min.js"></script> <script src="/mixed/lib/jszip.min.js"></script>
<script src="/mixed/js/audio.js"></script> <script src="/mixed/lib/wanakana.min.js"></script>
<script src="/bg/js/templates.js"></script>
<script src="/bg/js/instance.js"></script>
<script src="/bg/js/handlebars.js"></script>
<script src="/bg/js/dictionary.js"></script>
<script src="/mixed/js/japanese.js"></script>
<script src="/mixed/js/request.js"></script>
<script src="/bg/js/options.js"></script>
<script src="/bg/js/anki-connect.js"></script> <script src="/bg/js/anki-connect.js"></script>
<script src="/bg/js/anki-null.js"></script> <script src="/bg/js/anki-null.js"></script>
<script src="/bg/js/api.js"></script>
<script src="/bg/js/database.js"></script> <script src="/bg/js/database.js"></script>
<script src="/bg/js/deinflector.js"></script> <script src="/bg/js/deinflector.js"></script>
<script src="/bg/js/dictionary.js"></script>
<script src="/bg/js/handlebars.js"></script>
<script src="/bg/js/options.js"></script>
<script src="/bg/js/templates.js"></script>
<script src="/bg/js/translator.js"></script> <script src="/bg/js/translator.js"></script>
<script src="/mixed/js/audio.js"></script>
<script src="/mixed/js/japanese.js"></script>
<script src="/mixed/js/request.js"></script>
<script src="/bg/js/backend.js"></script> <script src="/bg/js/backend.js"></script>
</body> </body>
</html> </html>

236
ext/bg/js/api.js Normal file
View File

@ -0,0 +1,236 @@
/*
* Copyright (C) 2016 Alex Yatskov <alex@foosoft.net>
* Author: Alex Yatskov <alex@foosoft.net>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
function utilMessageDispatch({action, params}, sender, callback) {
const forward = (promise, callback) => {
return promise.then(result => {
callback({result});
}).catch(error => {
callback({error});
});
};
const handlers = {
optionsGet: ({callback}) => {
forward(optionsLoad(), callback);
},
kanjiFind: ({text, callback}) => {
forward(apiKanjiFind(text), callback);
},
termsFind: ({text, callback}) => {
forward(apiTermsFind(text), callback);
},
templateRender: ({template, data, callback}) => {
forward(apiTemplateRender(template, data), callback);
},
definitionAdd: ({definition, mode, callback}) => {
forward(apiDefinitionAdd(definition, mode), callback);
},
definitionsAddable: ({definitions, modes, callback}) => {
forward(apiDefinitionsAddable(definitions, modes), callback);
},
noteView: ({noteId}) => {
forward(apiNoteView(noteId), callback);
}
};
const handler = handlers[action];
if (handler) {
params.callback = callback;
handler(params);
}
return true;
}
function utilCommandDispatch(command) {
const handlers = {
search: () => {
chrome.tabs.create({url: chrome.extension.getURL('/bg/search.html')});
},
help: () => {
chrome.tabs.create({url: 'https://foosoft.net/projects/yomichan/'});
},
options: () => {
chrome.runtime.openOptionsPage();
},
toggle: () => {
this.options.general.enable = !this.options.general.enable;
optionsSave(this.options).then(() => this.optionsSet(this.options));
}
};
const handler = handlers[command];
if (handler) {
handler();
}
}
function utilNoteFormat(definition, mode) {
const options = Backend.instance().options;
const note = {fields: {}, tags: options.anki.tags};
let fields = [];
if (mode === 'kanji') {
fields = options.anki.kanji.fields;
note.deckName = options.anki.kanji.deck;
note.modelName = options.anki.kanji.model;
} else {
fields = options.anki.terms.fields;
note.deckName = options.anki.terms.deck;
note.modelName = options.anki.terms.model;
if (definition.audio) {
const audio = {
url: definition.audio.url,
filename: definition.audio.filename,
skipHash: '7e2c2f954ef6051373ba916f000168dc',
fields: []
};
for (const name in fields) {
if (fields[name].includes('{audio}')) {
audio.fields.push(name);
}
}
if (audio.fields.length > 0) {
note.audio = audio;
}
}
}
for (const name in fields) {
note.fields[name] = dictFieldFormat(fields[name], definition, mode, options);
}
return note;
}
async function apiOptionsSet(options) {
// In Firefox, setting options from the options UI somehow carries references
// to the DOM across to the background page, causing the options object to
// become a "DeadObject" after the options page is closed. The workaround used
// here is to create a deep copy of the options object.
Backend.instance().options = JSON.parse(JSON.stringify(options));
if (!options.general.enable) {
chrome.browserAction.setBadgeBackgroundColor({color: '#d9534f'});
chrome.browserAction.setBadgeText({text: 'off'});
} else if (!dictConfigured(options)) {
chrome.browserAction.setBadgeBackgroundColor({color: '#f0ad4e'});
chrome.browserAction.setBadgeText({text: '!'});
} else {
chrome.browserAction.setBadgeText({text: ''});
}
if (options.anki.enable) {
Backend.instance().anki = new AnkiConnect(options.anki.server);
} else {
Backend.instance().anki = new AnkiNull();
}
chrome.tabs.query({}, tabs => {
for (const tab of tabs) {
chrome.tabs.sendMessage(tab.id, {action: 'optionsSet', params: options}, () => null);
}
});
}
async function apiOptionsGet() {
return Backend.instance().options;
}
async function apiTermsFind(text) {
const options = Backend.instance().options;
const translator = Backend.instance().translator;
const searcher = options.general.groupResults ?
translator.findTermsGrouped.bind(translator) :
translator.findTerms.bind(translator);
const {definitions, length} = await searcher(
text,
dictEnabledSet(options),
options.scanning.alphanumeric
);
return {
length,
definitions: definitions.slice(0, options.general.maxResults)
};
}
async function apiKanjiFind(text) {
const options = Backend.instance().options;
const definitions = await Backend.instance().translator.findKanji(text, dictEnabledSet(options));
return definitions.slice(0, options.general.maxResults);
}
async function apiDefinitionAdd(definition, mode) {
if (mode !== 'kanji') {
const options = Backend.instance().options;
await audioInject(
definition,
options.anki.terms.fields,
options.general.audioSource
);
}
return Backend.instance().anki.addNote(utilNoteFormat(definition, mode));
}
async function apiDefinitionsAddable(definitions, modes) {
const notes = [];
for (const definition of definitions) {
for (const mode of modes) {
notes.push(utilNoteFormat(definition, mode));
}
}
const results = await Backend.instance().anki.canAddNotes(notes);
const states = [];
for (let resultBase = 0; resultBase < results.length; resultBase += modes.length) {
const state = {};
for (let modeOffset = 0; modeOffset < modes.length; ++modeOffset) {
state[modes[modeOffset]] = results[resultBase + modeOffset];
}
states.push(state);
}
return states;
}
async function apiNoteView(noteId) {
return Backend.instance().anki.guiBrowse(`nid:${noteId}`);
}
async function apiTemplateRender(template, data) {
return handlebarsRender(template, data);
}

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

@ -17,7 +17,7 @@
*/ */
window.yomichanBackend = new class { class Backend {
constructor() { constructor() {
handlebarsRegister(); handlebarsRegister();
@ -26,225 +26,20 @@ window.yomichanBackend = new class {
this.options = null; this.options = null;
this.translator.prepare().then(optionsLoad).then(options => { this.translator.prepare().then(optionsLoad).then(options => {
this.optionsSet(options); apiOptionsSet(options);
chrome.commands.onCommand.addListener(this.onCommand.bind(this)); chrome.commands.onCommand.addListener(utilCommandDispatch);
chrome.runtime.onMessage.addListener(this.onMessage.bind(this)); chrome.runtime.onMessage.addListener(utilMessageDispatch);
if (this.options.general.showGuide) { if (options.general.showGuide) {
chrome.tabs.create({url: chrome.extension.getURL('/bg/guide.html')}); chrome.tabs.create({url: chrome.extension.getURL('/bg/guide.html')});
} }
}); });
} }
optionsSet(options) { static instance() {
// In Firefox, setting options from the options UI somehow carries references return chrome.extension.getBackgroundPage().yomichanBackend;
// to the DOM across to the background page, causing the options object to
// become a "DeadObject" after the options page is closed. The workaround used
// here is to create a deep copy of the options object.
this.options = JSON.parse(JSON.stringify(options));
if (!this.options.general.enable) {
chrome.browserAction.setBadgeBackgroundColor({color: '#d9534f'});
chrome.browserAction.setBadgeText({text: 'off'});
} else if (!dictConfigured(this.options)) {
chrome.browserAction.setBadgeBackgroundColor({color: '#f0ad4e'});
chrome.browserAction.setBadgeText({text: '!'});
} else {
chrome.browserAction.setBadgeText({text: ''});
}
if (this.options.anki.enable) {
this.anki = new AnkiConnect(this.options.anki.server);
} else {
this.anki = new AnkiNull();
}
chrome.tabs.query({}, tabs => {
for (const tab of tabs) {
chrome.tabs.sendMessage(tab.id, {action: 'optionsSet', params: options}, () => null);
}
});
}
noteFormat(definition, mode) {
const note = {
fields: {},
tags: this.options.anki.tags
};
let fields = [];
if (mode === 'kanji') {
fields = this.options.anki.kanji.fields;
note.deckName = this.options.anki.kanji.deck;
note.modelName = this.options.anki.kanji.model;
} else {
fields = this.options.anki.terms.fields;
note.deckName = this.options.anki.terms.deck;
note.modelName = this.options.anki.terms.model;
if (definition.audio) {
const audio = {
url: definition.audio.url,
filename: definition.audio.filename,
skipHash: '7e2c2f954ef6051373ba916f000168dc',
fields: []
};
for (const name in fields) {
if (fields[name].includes('{audio}')) {
audio.fields.push(name);
}
}
if (audio.fields.length > 0) {
note.audio = audio;
}
}
}
for (const name in fields) {
note.fields[name] = dictFieldFormat(
fields[name],
definition,
mode,
this.options
);
}
return note;
}
termsFind(text) {
const searcher = this.options.general.groupResults ?
this.translator.findTermsGrouped.bind(this.translator) :
this.translator.findTerms.bind(this.translator);
return searcher(text, dictEnabledSet(this.options), this.options.scanning.alphanumeric).then(({definitions, length}) => {
return {length, definitions: definitions.slice(0, this.options.general.maxResults)};
});
}
kanjiFind(text) {
return this.translator.findKanji(text, dictEnabledSet(this.options)).then(definitions => {
return definitions.slice(0, this.options.general.maxResults);
});
}
definitionAdd(definition, mode) {
let promise = Promise.resolve();
if (mode !== 'kanji') {
promise = audioInject(definition, this.options.anki.terms.fields, this.options.general.audioSource);
}
return promise.then(() => {
const note = this.noteFormat(definition, mode);
return this.anki.addNote(note);
});
}
definitionsAddable(definitions, modes) {
const notes = [];
for (const definition of definitions) {
for (const mode of modes) {
notes.push(this.noteFormat(definition, mode));
}
}
return this.anki.canAddNotes(notes).then(raw => {
const states = [];
for (let resultBase = 0; resultBase < raw.length; resultBase += modes.length) {
const state = {};
for (let modeOffset = 0; modeOffset < modes.length; ++modeOffset) {
state[modes[modeOffset]] = raw[resultBase + modeOffset];
}
states.push(state);
}
return states;
});
}
noteView(noteId) {
return this.anki.guiBrowse(`nid:${noteId}`);
}
templateRender(template, data) {
return Promise.resolve(handlebarsRender(template, data));
}
onCommand(command) {
const handlers = {
search: () => {
chrome.tabs.create({url: chrome.extension.getURL('/bg/search.html')});
},
help: () => {
chrome.tabs.create({url: 'https://foosoft.net/projects/yomichan/'});
},
options: () => {
chrome.runtime.openOptionsPage();
},
toggle: () => {
this.options.general.enable = !this.options.general.enable;
optionsSave(this.options).then(() => this.optionsSet(this.options));
} }
}; };
const handler = handlers[command]; window.yomichanBackend = new Backend();
if (handler) {
handler();
}
}
onMessage({action, params}, sender, callback) {
const promiseCallback = (promise, callback) => {
return promise.then(result => {
callback({result});
}).catch(error => {
callback({error});
});
};
const handlers = {
optionsGet: ({callback}) => {
promiseCallback(optionsLoad(), callback);
},
kanjiFind: ({text, callback}) => {
promiseCallback(this.kanjiFind(text), callback);
},
termsFind: ({text, callback}) => {
promiseCallback(this.termsFind(text), callback);
},
templateRender: ({template, data, callback}) => {
promiseCallback(this.templateRender(template, data), callback);
},
definitionAdd: ({definition, mode, callback}) => {
promiseCallback(this.definitionAdd(definition, mode), callback);
},
definitionsAddable: ({definitions, modes, callback}) => {
promiseCallback(this.definitionsAddable(definitions, modes), callback);
},
noteView: ({noteId}) => {
promiseCallback(this.noteView(noteId), callback);
}
};
const handler = handlers[action];
if (handler) {
params.callback = callback;
handler(params);
}
return true;
}
};

20
ext/bg/js/display-window.js
View File

@ -29,26 +29,6 @@ window.displayWindow = new class extends Display {
window.wanakana.bind(query.get(0)); window.wanakana.bind(query.get(0));
} }
definitionAdd(definition, mode) {
return instYomi().definitionAdd(definition, mode);
}
definitionsAddable(definitions, modes) {
return instYomi().definitionsAddable(definitions, modes).catch(() => []);
}
noteView(noteId) {
return instYomi().noteView(noteId);
}
templateRender(template, data) {
return instYomi().templateRender(template, data);
}
kanjiFind(character) {
return instYomi().kanjiFind(character);
}
handleError(error) { handleError(error) {
window.alert(`Error: ${error}`); window.alert(`Error: ${error}`);
} }

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

@ -1,30 +0,0 @@
/*
* Copyright (C) 2016 Alex Yatskov <alex@foosoft.net>
* Author: Alex Yatskov <alex@foosoft.net>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
function instYomi() {
return chrome.extension.getBackgroundPage().yomichanBackend;
}
function instDb() {
return instYomi().translator.database;
}
function instAnki() {
return instYomi().anki;
}

2
ext/bg/js/options.js
View File

@ -126,6 +126,6 @@ function optionsSave(options) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
chrome.storage.local.set({options: JSON.stringify(options)}, resolve); chrome.storage.local.set({options: JSON.stringify(options)}, resolve);
}).then(() => { }).then(() => {
instYomi().optionsSet(options); apiOptionsSet(options);
}); });
} }

1
ext/bg/popup.html
View File

@ -30,7 +30,6 @@
<script src="/mixed/lib/jquery.min.js"></script> <script src="/mixed/lib/jquery.min.js"></script>
<script src="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script> <script src="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
<script src="/mixed/lib/handlebars.min.js"></script> <script src="/mixed/lib/handlebars.min.js"></script>
<script src="/bg/js/instance.js"></script>
<script src="/bg/js/dictionary.js"></script> <script src="/bg/js/dictionary.js"></script>
<script src="/mixed/js/request.js"></script> <script src="/mixed/js/request.js"></script>
<script src="/mixed/js/japanese.js"></script> <script src="/mixed/js/japanese.js"></script>

1
ext/bg/search.html
View File

@ -33,7 +33,6 @@
</div> </div>
<script src="/mixed/lib/jquery.min.js"></script> <script src="/mixed/lib/jquery.min.js"></script>
<script src="/bg/js/instance.js"></script>
<script src="/bg/js/dictionary.js"></script> <script src="/bg/js/dictionary.js"></script>
<script src="/mixed/js/request.js"></script> <script src="/mixed/js/request.js"></script>
<script src="/mixed/js/japanese.js"></script> <script src="/mixed/js/japanese.js"></script>

1
ext/bg/settings.html
View File

@ -276,7 +276,6 @@
<script src="/mixed/lib/bootstrap/js/bootstrap.min.js"></script> <script src="/mixed/lib/bootstrap/js/bootstrap.min.js"></script>
<script src="/mixed/lib/handlebars.min.js"></script> <script src="/mixed/lib/handlebars.min.js"></script>
<script src="/bg/js/templates.js"></script> <script src="/bg/js/templates.js"></script>
<script src="/bg/js/instance.js"></script>
<script src="/bg/js/handlebars.js"></script> <script src="/bg/js/handlebars.js"></script>
<script src="/bg/js/dictionary.js"></script> <script src="/bg/js/dictionary.js"></script>
<script src="/mixed/js/japanese.js"></script> <script src="/mixed/js/japanese.js"></script>

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

@ -32,26 +32,6 @@ class Display {
$(document).keydown(this.onKeyDown.bind(this)); $(document).keydown(this.onKeyDown.bind(this));
} }
definitionAdd(definition, mode) {
throw 'override me';
}
definitionsAddable(definitions, modes) {
throw 'override me';
}
noteView(noteId) {
throw 'override me';
}
templateRender(template, data) {
throw 'override me';
}
kanjiFind(character) {
throw 'override me';
}
handleError(error) { handleError(error) {
throw 'override me'; throw 'override me';
} }
@ -87,7 +67,7 @@ class Display {
} }
} }
this.templateRender('terms.html', params).then(content => { apiTemplateRender('terms.html', params).then(content => {
this.container.html(content); this.container.html(content);
this.entryScroll(context && context.index || 0); this.entryScroll(context && context.index || 0);
@ -126,7 +106,7 @@ class Display {
} }
} }
this.templateRender('kanji.html', params).then(content => { apiTemplateRender('kanji.html', params).then(content => {
this.container.html(content); this.container.html(content);
this.entryScroll(context && context.index || 0); this.entryScroll(context && context.index || 0);
@ -138,7 +118,7 @@ class Display {
} }
adderButtonsUpdate(modes, sequence) { adderButtonsUpdate(modes, sequence) {
return this.definitionsAddable(this.definitions, modes).then(states => { return apiDefinitionsAddable(this.definitions, modes).then(states => {
if (!states || sequence !== this.sequence) { if (!states || sequence !== this.sequence) {
return; return;
} }
@ -198,7 +178,7 @@ class Display {
context.url = this.context.url; context.url = this.context.url;
} }
this.kanjiFind(link.text()).then(kanjiDefs => { apiKanjiFind(link.text()).then(kanjiDefs => {
this.showKanjiDefs(kanjiDefs, this.options, context); this.showKanjiDefs(kanjiDefs, this.options, context);
}).catch(this.handleError.bind(this)); }).catch(this.handleError.bind(this));
} }
@ -220,7 +200,7 @@ class Display {
e.preventDefault(); e.preventDefault();
const link = $(e.currentTarget); const link = $(e.currentTarget);
const index = Display.entryIndexFind(link); const index = Display.entryIndexFind(link);
this.noteView(link.data('noteId')); apiNoteView(link.data('noteId'));
} }
onKeyDown(e) { onKeyDown(e) {
@ -234,7 +214,7 @@ class Display {
const noteTryView = mode => { const noteTryView = mode => {
const button = Display.viewerButtonFind(this.index); const button = Display.viewerButtonFind(this.index);
if (button.length !== 0 && !button.hasClass('disabled')) { if (button.length !== 0 && !button.hasClass('disabled')) {
this.noteView(button.data('noteId')); apiNoteView(button.data('noteId'));
} }
}; };
@ -351,7 +331,7 @@ class Display {
noteAdd(definition, mode) { noteAdd(definition, mode) {
this.spinner.show(); this.spinner.show();
return this.definitionAdd(definition, mode).then(noteId => { return apiDefinitionAdd(definition, mode).then(noteId => {
if (noteId) { if (noteId) {
const index = this.definitions.indexOf(definition); const index = this.definitions.indexOf(definition);
Display.adderButtonFind(index, mode).addClass('disabled'); Display.adderButtonFind(index, mode).addClass('disabled');