Track n anki field values also inherit html markup on update-last-card

killergerbah · Aug 4, 2024 · 12fad84 · 12fad84
1 parent 03ae88d
commit 12fad84
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 12 deletions.
diff --git a/common/anki/anki.ts b/common/anki/anki.ts
@@ -1,7 +1,7 @@
 import { AudioClip } from '@project/common/audio-clip';
 import { CardModel, Image } from '@project/common';
 import { HttpFetcher, Fetcher } from '@project/common';
-import { AnkiSettings } from '@project/common/settings';
+import { AnkiSettings, AnkiSettingsFieldKey } from '@project/common/settings';
 import sanitize from 'sanitize-filename';
 import { extractText, sourceString } from '@project/common/util';
 
@@ -331,17 +331,10 @@ export class Anki {
                 if (infoResponse.result.length > 0 && infoResponse.result[0].noteId === lastNoteId) {
                     const info = infoResponse.result[0];
 
-                    if (
-                        this.settingsProvider.sentenceField &&
-                        info.fields &&
-                        typeof info.fields[this.settingsProvider.sentenceField]?.value === 'string' &&
-                        typeof params.note.fields[this.settingsProvider.sentenceField] === 'string'
-                    ) {
-                        params.note.fields[this.settingsProvider.sentenceField] = inheritHtmlMarkup(
-                            params.note.fields[this.settingsProvider.sentenceField],
-                            info.fields[this.settingsProvider.sentenceField].value
-                        );
-                    }
+                    this._inheritHtmlMarkupFromField('sentenceField', info, params);
+                    this._inheritHtmlMarkupFromField('track1Field', info, params);
+                    this._inheritHtmlMarkupFromField('track2Field', info, params);
+                    this._inheritHtmlMarkupFromField('track3Field', info, params);
 
                     await this._executeAction('updateNoteFields', params, ankiConnectUrl);
 
@@ -405,6 +398,22 @@ export class Anki {
         );
     }
 
+    private _inheritHtmlMarkupFromField(fieldKey: AnkiSettingsFieldKey, info: any, params: any) {
+        const fieldName = this.settingsProvider[fieldKey];
+
+        if (
+            fieldName &&
+            info.fields &&
+            typeof info.fields[fieldName]?.value === 'string' &&
+            typeof params.note.fields[fieldName] === 'string'
+        ) {
+            params.note.fields[fieldName] = inheritHtmlMarkup(
+                params.note.fields[fieldName],
+                info.fields[fieldName].value
+            );
+        }
+    }
+
     private async _executeAction(action: string, params: any, ankiConnectUrl?: string) {
         const body: any = {
             action: action,

diff --git a/common/settings/settings.ts b/common/settings/settings.ts
@@ -21,6 +21,18 @@ export interface MiscSettings {
     readonly tabName: string;
 }
 
+export type AnkiSettingsFieldKey =
+    | 'sentenceField'
+    | 'definitionField'
+    | 'audioField'
+    | 'imageField'
+    | 'wordField'
+    | 'sourceField'
+    | 'urlField'
+    | 'track1Field'
+    | 'track2Field'
+    | 'track3Field';
+
 export interface AnkiSettings {
     readonly ankiConnectUrl: string;
     readonly deck: string;