diff options
Diffstat (limited to 'ext/mixed/js')
-rw-r--r-- | ext/mixed/js/audio.js | 30 | ||||
-rw-r--r-- | ext/mixed/js/display.js | 3 |
2 files changed, 30 insertions, 3 deletions
diff --git a/ext/mixed/js/audio.js b/ext/mixed/js/audio.js index eb8fde94..0952887e 100644 --- a/ext/mixed/js/audio.js +++ b/ext/mixed/js/audio.js @@ -79,7 +79,35 @@ async function audioBuildUrl(definition, mode, cache={}) { } } }); - } else { + } else if (mode === 'jisho') { + return new Promise((resolve, reject) => { + const response = cache[definition.expression]; + if (response) { + resolve(response); + } else { + const xhr = new XMLHttpRequest(); + xhr.open('GET', `http://jisho.org/search/${definition.expression}`); + xhr.addEventListener('error', () => reject('failed to scrape audio data')); + xhr.addEventListener('load', () => { + cache[definition.expression] = xhr.responseText; + resolve(xhr.responseText); + }); + + xhr.send(); + } + }).then(response => { + try { + const dom = new DOMParser().parseFromString(response, 'text/html'); + const audio = dom.getElementById(`audio_${definition.expression}:${definition.reading}`); + if (audio) { + return audio.getElementsByTagName('source').item(0).getAttribute('src'); + } + } catch (e) { + // NOP + } + }); + } + else { return Promise.resolve(); } } diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js index 21748f5d..12950dfd 100644 --- a/ext/mixed/js/display.js +++ b/ext/mixed/js/display.js @@ -27,7 +27,6 @@ class Display { this.sequence = 0; this.index = 0; this.audioCache = {}; - this.responseCache = {}; $(document).keydown(this.onKeyDown.bind(this)); } @@ -368,7 +367,7 @@ class Display { try { this.spinner.show(); - let url = await audioBuildUrl(definition, this.options.general.audioSource, this.responseCache); + let url = await apiAudioGetUrl(definition, this.options.general.audioSource); if (!url) { url = '/mixed/mp3/button.mp3'; } |