AudioUriBuilder simplification (#799)

* Rename variables to disambiguate

* Update handler argument convention

* Update getUri argument convention

* Change _getAudioUri argument convention

* Change getDefinitionAudio argument convention

* Add api.getDefinitionAudio definition

1 files changed, 5 insertions, 5 deletions

diff --git a/ext/bg/js/anki-note-builder.js b/ext/bg/js/anki-note-builder.js
index 72e3b337..a558db92 100644
--- a/ext/bg/js/anki-note-builder.js
+++ b/ext/bg/js/anki-note-builder.js
@@ -124,15 +124,16 @@ class AnkiNoteBuilder {
         try {
             const {sources, customSourceUrl} = details;
             const expressions = definition.expressions;
-            const audioSourceDefinition = Array.isArray(expressions) ? expressions[0] : definition;
+            const {expression, reading} = Array.isArray(expressions) ? expressions[0] : definition;
 
-            let fileName = this._createInjectedAudioFileName(audioSourceDefinition);
+            let fileName = this._createInjectedAudioFileName(expression, reading);
             if (fileName === null) { return; }
             fileName = this._replaceInvalidFileNameCharacters(fileName);
 
             const {audio: data} = await this._getDefinitionAudio(
-                audioSourceDefinition,
                 sources,
+                expression,
+                reading,
                 {
                     textToSpeechVoice: null,
                     customSourceUrl,
@@ -199,8 +200,7 @@ class AnkiNoteBuilder {
         }
     }
 
-    _createInjectedAudioFileName(definition) {
-        const {reading, expression} = definition;
+    _createInjectedAudioFileName(expression, reading) {
         if (!reading && !expression) { return null; }
 
         let fileName = 'yomichan';