alex/yomichan
1
Fork 0
Code Releases Activity

more audio handling improvements

Browse Source
This commit is contained in:
Alex Yatskov 2017-03-25 10:46:59 -07:00
parent 0e16787692
commit 20d062329b
4 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/bg/background.html
View File

@ -7,6 +7,7 @@
<script src="/mixed/lib/handlebars.min.js"></script>
<script src="/mixed/lib/dexie.min.js"></script>
<script src="/mixed/lib/wanakana.min.js"></script>
<script src="/mixed/js/util.js"></script>
<script src="/bg/js/templates.js"></script>
<script src="/bg/js/util.js"></script>
<script src="/bg/js/anki-connect.js"></script>

35
ext/bg/js/yomichan.js
View File

@ -56,7 +56,10 @@ window.yomichan = new class {
}
noteFormat(definition, mode) {
const note = {fields: {}, tags: this.options.anki.tags};
const note = {
fields: {},
tags: this.options.anki.tags
};
let fields = [];
if (mode === 'kanji') {
@ -67,25 +70,6 @@ window.yomichan = new class {
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) {
@ -117,8 +101,15 @@ window.yomichan = new class {
}
definitionAdd(definition, mode) {
const note = this.noteFormat(definition, mode);
return this.anki.addNote(note);
let promise = Promise.resolve();
if (this.options.general.audioPlayback && mode !== 'kanji') {
promise = audioInject(definition, this.options.anki.terms.fields);
}
return promise.then(() => {
const note = this.noteFormat(definition, mode);
return this.anki.addNote(note);
});
}
definitionsAddable(definitions, modes) {

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

@ -251,24 +251,13 @@ class Display {
noteAdd(definition, mode) {
this.spinner.show();
let promise = Promise.resolve();
if (mode !== 'kanji') {
const filename = Display.audioBuildFilename(definition);
if (filename) {
promise = audioBuildUrl(definition, this.responseCache).then(url => definition.audio = {url, filename}).catch(() => {});
return this.definitionAdd(definition, mode).then(success => {
if (success) {
const index = this.definitions.indexOf(definition);
Display.adderButtonFind(index, mode).addClass('disabled');
} else {
this.handleError('note could not be added');
}
}
promise.then(() => {
return this.definitionAdd(definition, mode).then(success => {
if (success) {
const index = this.definitions.indexOf(definition);
Display.adderButtonFind(index, mode).addClass('disabled');
} else {
this.handleError('note could not be added');
}
});
}).catch(this.handleError.bind(this)).then(() => this.spinner.hide());
}

31
ext/mixed/js/util.js
View File

@ -21,7 +21,7 @@
* Audio
*/
function audioBuildUrl(definition, cache) {
function audioBuildUrl(definition, cache={}) {
return new Promise((resolve, reject) => {
const response = cache[definition.expression];
if (response) {
@ -78,3 +78,32 @@ function audioBuildFilename(definition) {
return filename += '.mp3';
}
}
function audioInject(definition, fields) {
const filename = audioBuildFilename(definition);
if (!filename) {
return Promise.resolve(true);
}
const audio = {
filename,
skipHash: '7e2c2f954ef6051373ba916f000168dc',
fields: []
};
for (const name in fields) {
if (fields[name].includes('{audio}')) {
audio.fields.push(name);
}
}
if (audio.fields.length === 0) {
return Promise.resolve(true);
}
return audioBuildUrl(definition).then(url => {
audio.url = url;
note.audio = audio;
return true;
}).catch(() => false);
}