killergerbah · killergerbah · May 10, 2024 · May 5, 2024 · May 6, 2024 · May 6, 2024
diff --git a/common/app/services/video-channel.ts b/common/app/services/video-channel.ts
@@ -486,6 +486,7 @@ export default class VideoChannel {
             maxImageHeight,
             surroundingSubtitlesCountRadius,
             surroundingSubtitlesTimeRadius,
+            clickToMineDefaultPlayback,
         } = settings;
         const message: AnkiSettingsToVideoMessage = {
             command: 'ankiSettings',
@@ -509,6 +510,7 @@ export default class VideoChannel {
                 maxImageHeight,
                 surroundingSubtitlesCountRadius,
                 surroundingSubtitlesTimeRadius,
+                clickToMineDefaultPlayback,
             },
         };
         this.protocol.postMessage(message);

diff --git a/common/components/SettingsForm.tsx b/common/components/SettingsForm.tsx
@@ -21,7 +21,7 @@ import RefreshIcon from '@material-ui/icons/Refresh';
 import Select from '@material-ui/core/Select';
 import TextField from '@material-ui/core/TextField';
 import { Theme } from '@material-ui/core/styles';
-import { AutoPausePreference, PostMineAction } from '@project/common';
+import { AutoPausePreference, PostMineAction, PostMinePlayback } from '@project/common';
 import { AsbplayerSettings, KeyBindName, SubtitleListPreference } from '@project/common/settings';
 import { computeStyles, download, isNumeric } from '@project/common/util';
 import { CustomStyle, validateSettings } from '@project/common/settings';
@@ -687,6 +687,7 @@ export default function SettingsForm({
         fastForwardModePlaybackRate,
         keyBindSet,
         clickToMineDefaultAction,
+        clickToMineDefaultPlayback,
         preferMp3,
         miningHistoryStorageLimit,
         preCacheSubtitleDom,
@@ -1163,6 +1164,50 @@ export default function SettingsForm({
                         label={t('postMineAction.none')}
                     />
                 </RadioGroup>
+                <FormLabel className={classes.top} component="legend">
+                    {t('settings.postMinePlayback')}
+                </FormLabel>
+                <RadioGroup row={false}>
+                    <LabelWithHoverEffect
+                        control={
+                            <Radio
+                                checked={clickToMineDefaultPlayback === PostMinePlayback.remember}
+                                value={PostMinePlayback.remember}
+                                onChange={(event) =>
+                                    event.target.checked &&
+                                    handleSettingChanged('clickToMineDefaultPlayback', PostMinePlayback.remember)
+                                }
+                            />
+                        }
+                        label={t('postMinePlayback.remember')}
+                    />
+                    <LabelWithHoverEffect
+                        control={
+                            <Radio
+                                checked={clickToMineDefaultPlayback === PostMinePlayback.play}
+                                value={PostMinePlayback.play}
+                                onChange={(event) =>
+                                    event.target.checked &&
+                                    handleSettingChanged('clickToMineDefaultPlayback', PostMinePlayback.play)
+                                }
+                            />
+                        }
+                        label={t('postMinePlayback.play')}
+                    />
+                    <LabelWithHoverEffect
+                        control={
+                            <Radio
+                                checked={clickToMineDefaultPlayback === PostMinePlayback.pause}
+                                value={PostMinePlayback.pause}
+                                onChange={(event) =>
+                                    event.target.checked &&
+                                    handleSettingChanged('clickToMineDefaultPlayback', PostMinePlayback.pause)
+                                }
+                            />
+                        }
+                        label={t('postMinePlayback.pause')}
+                    />
+                </RadioGroup>
                 <FormGroup className={classes.formGroup}>
                     <LabelWithHoverEffect
                         control={

diff --git a/common/locales/de.json b/common/locales/de.json
@@ -29,6 +29,11 @@
         "updateLastCard": "Update last card",
         "exportCard": "Export card"
     },
+    "postMinePlayback": {
+        "remember": "Keep previous state (as before mining)",
+        "play": "Always play",
+        "paused": "Always pause"
+    },
     "ankiDialog": {
         "applySelection": "Auswahl anwenden",
         "audio": "Audio",
@@ -269,6 +274,7 @@
         "mining": "Extraktion",
         "miningHistoryStorageLimit": "Extraktions-Historie Speicherlimit",
         "clickToMineDefaultAction": "Mining button default action",
+        "clickToMineDefaultPlayback": "Play mode to use after subtitle has been mined",
         "misc": "Sonstige",
         "mp3Preference": "Audio in MP3 neu encoden (langsamer)",
         "noteType": "Notiztyp",

diff --git a/common/locales/en.json b/common/locales/en.json
@@ -29,6 +29,11 @@
         "updateLastCard": "Update last card",
         "exportCard": "Export card"
     },
+    "postMinePlayback": {
+        "remember": "Keep previous state (as before mining)",
+        "play": "Always play",
+        "paused": "Always pause"
+    },
     "ankiDialog": {
         "applySelection": "Apply Selection",
         "audio": "Audio",
@@ -269,6 +274,7 @@
         "mining": "Mining",
         "miningHistoryStorageLimit": "Mining history storage limit",
         "clickToMineDefaultAction": "Mining button default action",
+        "clickToMineDefaultPlayback": "Play mode to use after subtitle has been mined",
         "misc": "Misc",
         "mp3Preference": "Re-encode audio as mp3 (slower)",
         "noteType": "Note Type",

diff --git a/common/locales/es.json b/common/locales/es.json
@@ -29,6 +29,11 @@
         "updateLastCard": "Actualizar última tarjeta",
         "exportCard": "Export card"
     },
+    "postMinePlayback": {
+        "remember": "Keep previous state (as before mining)",
+        "play": "Always play",
+        "paused": "Always pause"
+    },
     "ankiDialog": {
         "applySelection": "Aplicar Selección",
         "audio": "Audio",
@@ -269,6 +274,7 @@
         "mining": "Minado",
         "miningHistoryStorageLimit": "Límite de almacenamiento del historial de minado",
         "clickToMineDefaultAction": "Acción por defecto del botón de minado",
+        "clickToMineDefaultPlayback": "Play mode to use after subtitle has been mined",
         "misc": "Otros",
         "mp3Preference": "Recodificar audio como MP3 (más lento)",
         "noteType": "Tipo de Nota",

diff --git a/common/locales/ja.json b/common/locales/ja.json
@@ -29,6 +29,11 @@
         "updateLastCard": "最後のカードを更新する",
         "exportCard": "カードをエクスポート"
     },
+    "postMinePlayback": {
+        "remember": "Keep previous state (as before mining)",
+        "play": "Always play",
+        "paused": "Always pause"
+    },
     "ankiDialog": {
         "applySelection": "選択範囲を適用する",
         "audio": "音声",
@@ -269,6 +274,7 @@
         "mining": "マイニング",
         "miningHistoryStorageLimit": "マイニング履歴の保存数上限",
         "clickToMineDefaultAction": "ボタンでマイニングした際のデフォルト動作",
+        "clickToMineDefaultPlayback": "Play mode to use after subtitle has been mined",
         "misc": "その他",
         "mp3Preference": "音声を mp3 形式で再録音（低速）",
         "noteType": "メモタイプ",

diff --git a/common/locales/pl.json b/common/locales/pl.json
@@ -29,6 +29,11 @@
         "updateLastCard": "Update last card",
         "exportCard": "Export card"
     },
+    "postMinePlayback": {
+        "remember": "Keep previous state (as before mining)",
+        "play": "Always play",
+        "paused": "Always pause"
+    },
     "ankiDialog": {
         "applySelection": "Zastosuj wybór",
         "audio": "Audio",
@@ -269,6 +274,7 @@
         "mining": "Kopanie",
         "miningHistoryStorageLimit": "Limit przechowywania historii kopania",
         "clickToMineDefaultAction": "Mining button default action",
+        "clickToMineDefaultPlayback": "Play mode to use after subtitle has been mined",
         "misc": "Różne",
         "mp3Preference": "Ponowne kodowanie dźwięku do formatu mp3 (wolniejsze)",
         "noteType": "Typ notatek",

diff --git a/common/locales/pt_BR.json b/common/locales/pt_BR.json
@@ -29,6 +29,11 @@
         "updateLastCard": "Atualizar último card",
         "exportCard": "Export card"
     },
+    "postMinePlayback": {
+        "remember": "Manter o estado anterior (como antes da mineração)",
+        "play": "Sempre reproduzir",
+        "paused": "Sempre pausado"
+    },
     "ankiDialog": {
         "applySelection": "Aplicar seleção",
         "audio": "Áudio",
@@ -269,6 +274,7 @@
         "mining": "Mineração",
         "miningHistoryStorageLimit": "Limite de armazenamento do histórico de mineração",
         "clickToMineDefaultAction": "Ação padrão do botão de mineração",
+        "clickToMineDefaultPlayback": "Modo de reprodução a ser usado depois de mineração",
         "misc": "Diversos",
         "mp3Preference": "Recodificar áudio como MP3 (mais lento)",
         "noteType": "Tipo de nota",

diff --git a/common/locales/ru.json b/common/locales/ru.json
@@ -29,6 +29,11 @@
         "updateLastCard": "Обновить последнюю карточку",
         "exportCard": "Export card"
     },
+    "postMinePlayback": {
+        "remember": "Keep previous state (as before mining)",
+        "play": "Always play",
+        "paused": "Always pause"
+    },
     "ankiDialog": {
         "applySelection": "Применить выбор",
         "audio": "Аудио",
@@ -269,6 +274,7 @@
         "mining": "Майнинг",
         "miningHistoryStorageLimit": "Лимит хранения истории майнинга",
         "clickToMineDefaultAction": "Стандартное действие кнопки майнинга",
+        "clickToMineDefaultPlayback": "Play mode to use after subtitle has been mined",
         "misc": "Разное",
         "mp3Preference": "Перекодировать аудио в MP3 (медленнее)",
         "noteType": "Тип анки-заметки",

diff --git a/common/locales/zh_CN.json b/common/locales/zh_CN.json
@@ -29,6 +29,11 @@
         "updateLastCard": "Update last card",
         "exportCard": "Export card"
     },
+    "postMinePlayback": {
+        "remember": "Keep previous state (as before mining)",
+        "play": "Always play",
+        "paused": "Always pause"
+    },
     "ankiDialog": {
         "applySelection": "应用选中时间范围",
         "audio": "音频",
@@ -269,6 +274,7 @@
         "mining": "挖掘",
         "miningHistoryStorageLimit": "挖掘历史存储限制",
         "clickToMineDefaultAction": "Mining button default action",
+        "clickToMineDefaultPlayback": "Play mode to use after subtitle has been mined",
         "misc": "杂项",
         "mp3Preference": "将音频重新编码为mp3（较慢）",
         "noteType": "Anki卡牌类型",

diff --git a/common/settings/settings-import-export.test.ts b/common/settings/settings-import-export.test.ts
@@ -86,6 +86,7 @@ it('validates exported settings', () => {
         miningHistoryStorageLimit: 25,
         preCacheSubtitleDom: true,
         clickToMineDefaultAction: 1,
+        clickToMineDefaultPlayback: 0,
         themeType: 'dark',
         copyToClipboardOnMine: false,
         rememberSubtitleOffset: true,

diff --git a/common/settings/settings-import-export.ts b/common/settings/settings-import-export.ts
@@ -155,6 +155,9 @@ const settingsSchema = {
         clickToMineDefaultAction: {
             type: 'number',
         },
+        clickToMineDefaultPlayback: {
+            type: 'number',
+        },
         themeType: {
             type: 'string',
         },

diff --git a/common/settings/settings-provider.ts b/common/settings/settings-provider.ts
@@ -1,5 +1,5 @@
 import { AsbplayerSettings, KeyBindName, SubtitleListPreference } from '.';
-import { AutoPausePreference, PostMineAction } from '..';
+import { AutoPausePreference, PostMineAction, PostMinePlayback } from '..';
 
 // @ts-ignore
 const isMacOs = (navigator.userAgentData?.platform ?? navigator.platform)?.toUpperCase()?.indexOf('MAC') > -1;
@@ -72,6 +72,7 @@ export const defaultSettings: AsbplayerSettings = {
     miningHistoryStorageLimit: 25,
     preCacheSubtitleDom: true,
     clickToMineDefaultAction: PostMineAction.showAnkiDialog,
+    clickToMineDefaultPlayback: PostMinePlayback.remember,
     themeType: 'dark',
     copyToClipboardOnMine: false,
     rememberSubtitleOffset: true,

diff --git a/common/settings/settings.ts b/common/settings/settings.ts
@@ -1,4 +1,4 @@
-import { AutoPausePreference, PostMineAction } from '../src/model';
+import { AutoPausePreference, PostMineAction, PostMinePlayback } from '../src/model';
 
 export interface MiscSettings {
     readonly themeType: 'dark' | 'light';
@@ -39,6 +39,7 @@ export interface AnkiSettings {
     readonly maxImageHeight: number;
     readonly surroundingSubtitlesCountRadius: number;
     readonly surroundingSubtitlesTimeRadius: number;
+    readonly clickToMineDefaultPlayback: PostMinePlayback;
 }
 
 const ankiSettingsKeysObject: { [key in keyof AnkiSettings]: boolean } = {
@@ -61,6 +62,7 @@ const ankiSettingsKeysObject: { [key in keyof AnkiSettings]: boolean } = {
     maxImageHeight: true,
     surroundingSubtitlesCountRadius: true,
     surroundingSubtitlesTimeRadius: true,
+    clickToMineDefaultPlayback: true,
 };
 
 export const ankiSettingsKeys: (keyof AnkiSettings)[] = Object.keys(ankiSettingsKeysObject) as (keyof AnkiSettings)[];

diff --git a/common/src/model.ts b/common/src/model.ts
@@ -196,6 +196,12 @@ export enum PostMineAction {
     exportCard = 3,
 }
 
+export enum PostMinePlayback {
+    remember = 0,
+    play = 1,
+    pause = 2,
+}
+
 export enum AutoPausePreference {
     atStart = 1,
     atEnd = 2,

diff --git a/extension/src/controllers/anki-ui-controller.ts b/extension/src/controllers/anki-ui-controller.ts
@@ -1,20 +1,21 @@
 import {
     AnkiUiBridgeRerecordMessage,
-    AnkiUiInitialState,
-    AnkiUiSavedState,
-    AnkiUiResumeState,
     AnkiUiBridgeResumeMessage,
     AnkiUiBridgeRewindMessage,
-    OpenAsbplayerSettingsMessage,
-    VideoToExtensionCommand,
+    AnkiUiInitialState,
+    AnkiUiResumeState,
+    AnkiUiSavedState,
     CopyToClipboardMessage,
+    OpenAsbplayerSettingsMessage,
+    PostMinePlayback,
     ShowAnkiUiMessage,
+    VideoToExtensionCommand,
 } from '@project/common';
 import { AnkiSettings } from '@project/common/settings';
 import { sourceString } from '@project/common/util';
 import Binding from '../services/binding';
-import UiFrame from '../services/ui-frame';
 import { fetchLocalization } from '../services/localization-fetcher';
+import UiFrame from '../services/ui-frame';
 
 // We need to write the HTML into the iframe manually so that the iframe keeps it's about:blank URL.
 // Otherwise, Chrome won't insert content scripts into the iframe (e.g. Yomichan won't work).
@@ -248,8 +249,18 @@ export default class AnkiUiController {
                             }
                         }
 
-                        if (context.wasPlayingBeforeRecordingMedia) {
-                            context.play();
+                        switch (this._ankiSettings?.clickToMineDefaultPlayback) {
+                            case PostMinePlayback.remember:
+                                if (context.wasPlayingBeforeRecordingMedia) {
+                                    context.play();
+                                }
+                                break;
+                            case PostMinePlayback.play:
+                                context.play();
+                                break;
+                            case PostMinePlayback.pause:
+                                // already paused, don't need to do anything
+                                break;
                         }
                         break;
                     case 'rewind':