alex/yomichan
1
Fork 0
Code Releases Activity

Disable cache on the backend and fix a bug with the cache key

Browse Source
This commit is contained in:
toasted-nutbread 2020-04-10 16:12:55 -04:00
parent 823c026533
commit e1ebfb02f7
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,8 @@ class Backend {
this.defaultAnkiFieldTemplates = null; this.defaultAnkiFieldTemplates = null;
this.audioUriBuilder = new AudioUriBuilder(); this.audioUriBuilder = new AudioUriBuilder();
this.audioSystem = new AudioSystem({ this.audioSystem = new AudioSystem({
audioUriBuilder: this.audioUriBuilder audioUriBuilder: this.audioUriBuilder,
useCache: false
}); });
this.ankiNoteBuilder = new AnkiNoteBuilder({ this.ankiNoteBuilder = new AnkiNoteBuilder({
anki: this.anki, anki: this.anki,

5
ext/bg/js/settings/audio.js
View File

@ -28,7 +28,10 @@ let audioSourceUI = null;
let audioSystem = null; let audioSystem = null;
async function audioSettingsInitialize() { async function audioSettingsInitialize() {
audioSystem = new AudioSystem({audioUriBuilder: null}); audioSystem = new AudioSystem({
audioUriBuilder: null,
useCache: true
});
const optionsContext = getOptionsContext(); const optionsContext = getOptionsContext();
const options = await getOptionsMutable(optionsContext); const options = await getOptionsMutable(optionsContext);

12
ext/mixed/js/audio-system.js
View File

@ -66,8 +66,8 @@ class TextToSpeechAudio {
} }
class AudioSystem { class AudioSystem {
constructor({audioUriBuilder}) { constructor({audioUriBuilder, useCache}) {
this._cache = new Map(); this._cache = useCache ? new Map() : null;
this._cacheSizeMaximum = 32; this._cacheSizeMaximum = 32;
this._audioUriBuilder = audioUriBuilder; this._audioUriBuilder = audioUriBuilder;
@ -79,11 +79,15 @@ class AudioSystem {
async getDefinitionAudio(definition, sources, details) { async getDefinitionAudio(definition, sources, details) {
const key = `${definition.expression}:${definition.reading}`; const key = `${definition.expression}:${definition.reading}`;
const cacheValue = this._cache.get(definition); const hasCache = (this._cache !== null);
if (hasCache) {
const cacheValue = this._cache.get(key);
if (typeof cacheValue !== 'undefined') { if (typeof cacheValue !== 'undefined') {
const {audio, uri, source} = cacheValue; const {audio, uri, source} = cacheValue;
return {audio, uri, source}; return {audio, uri, source};
} }
}
for (const source of sources) { for (const source of sources) {
const uri = await this._getAudioUri(definition, source, details); const uri = await this._getAudioUri(definition, source, details);
@ -91,8 +95,10 @@ class AudioSystem {
try { try {
const audio = await this._createAudio(uri); const audio = await this._createAudio(uri);
if (hasCache) {
this._cacheCheck(); this._cacheCheck();
this._cache.set(key, {audio, uri, source}); this._cache.set(key, {audio, uri, source});
}
return {audio, uri, source}; return {audio, uri, source};
} catch (e) { } catch (e) {
// NOP // NOP

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

@ -50,7 +50,8 @@ class Display {
async getUri(definition, source, details) { async getUri(definition, source, details) {
return await apiAudioGetUri(definition, source, details); return await apiAudioGetUri(definition, source, details);
} }
} },
useCache: true
}); });
this.styleNode = null; this.styleNode = null;