Enter confirms subtitle track selection

README.md

@@ -47,7 +47,15 @@ Suna,
 kibo,
 [@genericdave](https://github.com/genericdave),
 Daniel,
-Cristian
+Cristian,
+Joey Potter,
+[@InteractiveNinja](https://github.com/InteractiveNinja),
+[@agloo](https://github.com/agloo),
+[@Venous771](https://github.com/Venous771),
+[@Viterkim](https://github.com/Viterkim),
+Julian,
+DanglingSabSuu
+
 
 and to those who have donated privately.
 
@@ -63,7 +71,8 @@ Thank you to all those who have contributed to asbplayer:
 [@bpwhelan](https://github.com/bpwhelan),
 [@pooky-programs](https://github.com/pooky-programs),
 [@m-edlund](https://github.com/m-edlund),
-[@nekorushi](https://github.com/nekorushi)
+[@nekorushi](https://github.com/nekorushi),
+[@Viterkim](https://github.com/Viterkim)
 
 Thank you to all those who have translated asbplayer:
 
@@ -75,7 +84,7 @@ Thank you to all those who have translated asbplayer:
 **Leo Gonzalez** (Spanish),
 **Yuri (ganqqwerty)** (Russian)
 
-If you are a non-English native, and would like to help translate asbplayer, join the [Crowdin project](https://crowdin.com/project/asbplayer).
+If you are a non-English native, and would like to help translate asbplayer, join the [Crowdin project](https://crowdin.com/project/asbplayer). If your language isn't there, feel free to create an issue to add it on the [issues page](https://github.com/killergerbah/asbplayer/issues).
 
 ## Getting Started
 
@@ -86,7 +95,7 @@ First, see if you can get started by following one of the [community guides](#co
 
 Otherwise, the following steps for setting up automated Anki flashcards should work for any language:
 
-1. Install and set up a dictionary tool for your target language that allows you to do instant lookups. Popular ones are [Yomitan](https://chromewebstore.google.com/detail/yomitan/likgccmbimhjbgkjambclfkhldnlhbnn) for Japanese and [VocabSieve](https://github.com/FreeLanguageTools/vocabsieve) for European languages.
+1. Install and set up a dictionary tool for your target language that allows you to do instant lookups. Popular ones are [Yomitan](https://chromewebstore.google.com/detail/yomitan/likgccmbimhjbgkjambclfkhldnlhbnn) (see [supported languages](https://yomitan.wiki/other/supported-languages/)) and [VocabSieve](https://github.com/FreeLanguageTools/vocabsieve) (tuned for European languages. Works with Asian languages too but doesn't automatically detect word boundaries).
 2. Install [Anki](https://apps.ankiweb.net/), and create a deck and note type. More details on [Refold's guide](https://refold.la/roadmap/stage-1/a/anki-setup).
 3. Install the [AnkiConnect](https://ankiweb.net/shared/info/2055492159) plugin for Anki.
 4. [Configure](https://killergerbah.github.io/asbplayer/?view=settings) asbplayer to create cards via AnkiConnect using your deck and note type.
@@ -158,7 +167,7 @@ Use <kbd>Ctrl + Shift + F</kbd> to see auto-detected subtitle tracks for streami
 
 -   Netflix
 -   Youtube
--   Disney Plus (known issue: subtitles sometimes off by ~5 seconds)
+-   Disney Plus (known issues: flakey video detection, subtitles sometimes off by ~5 seconds)
 -   Hulu
 -   TVer
 -   Bandai Channel
@@ -179,8 +188,14 @@ You can replace filtered content similarly by entering a string into the "Subtit
 
 Useful examples of regular expressions:
 
--   `([(（]([^()（）]|(([(（][^()（）]+[)）])))+[)）])` : Remove names enclosed by parenthesis to indicate speakers (i.e. "**（山田）**　元気ですか？")
--   `\[.*\]` : Remove indications enclosed by brackets that sound or music that is playing (i.e. "**\[PLAYFUL MUSIC]**")
+-   `([(（]([^()（）]|(([(（][^()（）]+[)）])))+[)）])` : Remove names enclosed by parenthesis to indicate speakers (e.g. "**（山田）**　元気ですか？")
+-   `(.*)\n+(?!-)(.*)` : Some subtitles are split in several lines and this regex forces them into a single line. For this filter to work, you must also put `$1 $2` in the "Subtitle regex filter text replacement" field.
+    -   **NB**: When using this regex pattern in combination with other patterns (using the `|` operator, see below), place this pattern at the end. This ensures that all other regex transformations are applied first, and then the results are finally combined into a single line.
+-   `-?\[.*\]` : Remove indications enclosed by square brackets that sound or music that is playing (e.g. "**\[PLAYFUL MUSIC]**" or "**\-[GASPS]**")
+    -   `^[-\(\)\.\sA-ZAÂÃÀÇÉÊÍÓÔÕÚÑ]+$` : As an alternative to the above, filter out descriptions written in capital letters, but without the square brackets (e.g. "**PLAYFUL MUSIC**"). If your language has additional letters with diacritics, you feel free to add them to this list.
+-   `[♪♬#～〜]+` : Any combination of symbols on their own that represent playing music (e.g. `♪♬♪`)
+
+Regular expressions can be combined with the character `|` (no spaces needed inbetween). E.g., if you want to use the 2 last regexes from this list, you can use `-?\[.*\]|[♪♬#～〜]+`. You can combine as many regexes as you wish this way.
 
 Learn how to write and test custom regular expressions at [Regex Learn - Playground](https://regexlearn.com/playground).
 
@@ -248,6 +263,8 @@ asbplayer can be setup to support one-click mining workflows by integrating with
 5. Configure Yomitan to use the same note type you have configured for asbplayer.
 6. Using Yomitan's `+` button on asbplayer subtitles will now trigger the flashcard creator with word and definition fields pre-populated by Yomitan.
 
+The proxy is very lightweight, so it's fine to leave it running in the background. On Windows, [RBTray](https://github.com/benbuck/rbtray) can be used to minimise it to the taskbar.
+
 See the proxy's [example configuration file](https://github.com/killergerbah/asbplayer/blob/main/scripts/anki-connect-proxy/.env.example) for how to further configure it.
 
 #### WebSocket interface

client/public/extension.json

@@ -1,48 +1,48 @@
 {
     "latest": {
-        "version": "1.2.0",
-        "url": "https://github.com/killergerbah/asbplayer/releases/tag/v1.2.0"
+        "version": "1.3.2",
+        "url": "https://github.com/killergerbah/asbplayer/releases/tag/v1.3.2"
     },
     "languages": [
         {
             "code": "en",
             "url": "/locales/en.json",
-            "version": 5
+            "version": 6
         },
         {
             "code": "es",
             "url": "/locales/es.json",
-            "version": 4
+            "version": 5
         },
         {
             "code": "ja",
             "url": "/locales/ja.json",
-            "version": 7
+            "version": 9
         },
         {
             "code": "de",
             "url": "/locales/de.json",
-            "version": 5
+            "version": 6
         },
         {
             "code": "pl",
             "url": "/locales/pl.json",
-            "version": 5
+            "version": 6
         },
         {
             "code": "pt_BR",
             "url": "/locales/pt_BR.json",
-            "version": 4
+            "version": 5
         },
         {
             "code": "zh_CN",
             "url": "/locales/zh_CN.json",
-            "version": 4
+            "version": 5
         },
         {
             "code": "ru",
             "url": "/locales/ru.json",
-            "version": 3
+            "version": 4
         }
     ]
 }

client/public/firefox-extension-updates.json

@@ -5,6 +5,14 @@
                 {
                     "version": "1.3.1",
                     "update_link": "https://github.com/killergerbah/asbplayer/releases/download/v1.3.1/asbplayer-extension-1.3.1-firefox.xpi"
+                },
+                {
+                    "version": "1.3.2",
+                    "update_link": "https://github.com/killergerbah/asbplayer/releases/download/v1.3.2/asbplayer-extension-1.3.2-firefox.xpi"
+                },
+                {
+                    "version": "1.4.2",
+                    "update_link": "https://github.com/killergerbah/asbplayer/releases/download/v1.4.2/asbplayer-extension-1.4.2-firefox.xpi"
                 }
             ]
         }

common/anki/anki.ts

@@ -1,10 +1,16 @@
 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';
 
+declare global {
+    interface String {
+        toWellFormed?: () => string;
+    }
+}
+
 const ankiQuerySpecialCharacters = ['"', '*', '_', '\\', ':'];
 const alphaNumericCharacters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 
@@ -325,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);
 
@@ -384,6 +383,10 @@ export class Anki {
     }
 
     private _sanitizeFileName(name: string) {
+        if (typeof name.toWellFormed === 'function') {
+            name = name.toWellFormed();
+        }
+
         return sanitize(name, { replacement: '_' });
     }
 
@@ -395,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,

common/app/components/App.tsx

@@ -23,7 +23,7 @@ import { createTheme } from '@project/common/theme';
 import { AsbplayerSettings, Profile } from '@project/common/settings';
 import { humanReadableTime, download, extractText } from '@project/common/util';
 import { AudioClip } from '@project/common/audio-clip';
-import { AnkiExportMode, ExportParams } from '@project/common/anki';
+import { ExportParams } from '@project/common/anki';
 import { SubtitleReader } from '@project/common/subtitle-reader';
 import { v4 as uuidv4 } from 'uuid';
 import clsx from 'clsx';
@@ -53,7 +53,7 @@ import { useAnki } from '../hooks/use-anki';
 import { usePlaybackPreferences } from '../hooks/use-playback-preferences';
 import { MiningContext } from '../services/mining-context';
 
-const latestExtensionVersion = '1.2.0';
+const latestExtensionVersion = '1.4.2';
 const extensionUrl =
     'https://chromewebstore.google.com/detail/asbplayer-language-learni/hkledmpjpaehamkiehglnbelcpdflcab';
 const mp3WorkerFactory = () => new Worker(new URL('../../audio-clip/mp3-encoder-worker.ts', import.meta.url));
@@ -228,9 +228,13 @@ function App({ origin, logoUrl, settings, extension, fetcher, onSettingsChanged,
     const drawerRatio = videoFrameRef.current ? 0.2 : 0.3;
     const minDrawerSize = videoFrameRef.current ? 150 : 300;
     const drawerWidth = Math.max(minDrawerSize, width * drawerRatio);
-    const { copyHistoryItems, refreshCopyHistory, deleteCopyHistoryItem, saveCopyHistoryItem } = useCopyHistory(
-        settings.miningHistoryStorageLimit
-    );
+    const {
+        copyHistoryItems,
+        refreshCopyHistory,
+        deleteCopyHistoryItem,
+        saveCopyHistoryItem,
+        deleteAllCopyHistoryItems,
+    } = useCopyHistory(settings.miningHistoryStorageLimit);
     const copyHistoryItemsRef = useRef<CopyHistoryItem[]>([]);
     copyHistoryItemsRef.current = copyHistoryItems;
     const [copyHistoryOpen, setCopyHistoryOpen] = useState<boolean>(false);
@@ -518,13 +522,6 @@ function App({ origin, logoUrl, settings, extension, fetcher, onSettingsChanged,
         setDisableKeyEvents(ankiDialogOpen);
     }, [ankiDialogOpen]);
 
-    const handleDeleteCopyHistoryItem = useCallback(
-        (item: CopyHistoryItem) => {
-            deleteCopyHistoryItem(item);
-        },
-        [deleteCopyHistoryItem]
-    );
-
     const handleUnloadVideo = useCallback(
         (videoFileUrl: string) => {
             if (videoFileUrl !== sources.videoFileUrl) {
@@ -1179,7 +1176,8 @@ function App({ origin, logoUrl, settings, extension, fetcher, onSettingsChanged,
                             open={effectiveCopyHistoryOpen}
                             drawerWidth={drawerWidth}
                             onClose={handleCloseCopyHistory}
-                            onDelete={handleDeleteCopyHistoryItem}
+                            onDelete={deleteCopyHistoryItem}
+                            onDeleteAll={deleteAllCopyHistoryItems}
                             onClipAudio={handleClipAudio}
                             onDownloadImage={handleDownloadImage}
                             onDownloadSectionAsSrt={handleDownloadCopyHistorySectionAsSrt}

common/app/components/CopyHistory.tsx

@@ -15,6 +15,7 @@ interface CopyHistoryProps {
     forceShowDownloadOptions?: boolean;
     onClose: () => void;
     onDelete: (item: CopyHistoryItem) => void;
+    onDeleteAll: () => void;
     onAnki: (item: CopyHistoryItem) => void;
     onSelect?: (item: CopyHistoryItem) => void;
     onClipAudio: (item: CopyHistoryItem) => void;

common/app/components/CopyHistoryList.tsx

@@ -2,6 +2,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { makeStyles } from '@material-ui/core/styles';
 import { timeDurationDisplay } from '../services/util';
+import Button from '@material-ui/core/Button';
 import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction';
 import Grid from '@material-ui/core/Grid';
 import IconButton from '@material-ui/core/IconButton';
@@ -10,6 +11,7 @@ import ListItem from '@material-ui/core/ListItem';
 import ListItemIcon from '@material-ui/core/ListItemIcon';
 import ListItemText from '@material-ui/core/ListItemText';
 import Popover from '@material-ui/core/Popover';
+import DeleteIcon from '@material-ui/icons/Delete';
 import MoreVertIcon from '@material-ui/icons/MoreVert';
 import NoteAddIcon from '@material-ui/icons/NoteAdd';
 import SaveAltIcon from '@material-ui/icons/SaveAlt';
@@ -25,6 +27,7 @@ interface CopyHistoryListProps {
     items: CopyHistoryItem[];
     onClose: () => void;
     onDelete: (item: CopyHistoryItem) => void;
+    onDeleteAll: () => void;
     onAnki: (item: CopyHistoryItem) => void;
     onSelect?: (item: CopyHistoryItem) => void;
     onClipAudio: (item: CopyHistoryItem) => void;
@@ -34,11 +37,18 @@ interface CopyHistoryListProps {
 
 const useStyles = makeStyles((theme) => ({
     listContainer: {
-        position: 'relative',
+        display: 'flex',
         height: '100%',
+        flexDirection: 'column',
         overflowY: 'auto',
         overflowX: 'hidden',
     },
+    list: {
+        flexGrow: 1,
+    },
+    clearButton: {
+        margin: theme.spacing(2),
+    },
     listItem: {
         '&:hover': {
             backgroundColor: theme.palette.action.hover,
@@ -217,6 +227,7 @@ export default function CopyHistoryList({
     onClipAudio,
     onDownloadImage,
     onDelete,
+    onDeleteAll,
     onDownloadSectionAsSrt,
     onAnki,
 }: CopyHistoryListProps) {
@@ -336,7 +347,16 @@ export default function CopyHistoryList({
 
         content = (
             <div className={classes.listContainer}>
-                <List>{elements}</List>
+                <List className={classes.list}>{elements}</List>
+                <Button
+                    variant="contained"
+                    color="secondary"
+                    className={classes.clearButton}
+                    startIcon={<DeleteIcon />}
+                    onClick={onDeleteAll}
+                >
+                    {t('copyHistory.deleteAll')}
+                </Button>
             </div>
         );
     } else {

common/app/components/SettingsDialog.tsx

@@ -81,6 +81,8 @@ export default function SettingsDialog({
                     extensionSupportsSidePanel={extension.supportsSidePanel}
                     extensionSupportsOrderableAnkiFields={extension.supportsOrderableAnkiFields}
                     extensionSupportsTrackSpecificSettings={extension.supportsTrackSpecificSettings}
+                    extensionSupportsSubtitlesWidthSetting={extension.supportsSubtitlesWidthSetting}
+                    extensionSupportsPauseOnHover={extension.supportsPauseOnHover}
                     insideApp
                     chromeKeyBinds={extension.extensionCommands}
                     onOpenChromeExtensionShortcuts={extension.openShortcuts}