Skip to content

The swiss army knife of lossless video/audio editing

Suggest common keys when adding file/track metadata

Claudee736604d5674
diff --git a/src/renderer/src/StreamsSelector.tsx b/src/renderer/src/StreamsSelector.tsx
index 74879931..241ca93f 100644
--- a/src/renderer/src/StreamsSelector.tsx
+++ b/src/renderer/src/StreamsSelector.tsx
@@ -37,6 +37,10 @@ interface EditingStream {
path: string;
}
+// Common metadata keys (as named by ffmpeg) to suggest when adding metadata
+const fileMetadataKeySuggestions = ['title', 'artist', 'album_artist', 'album', 'composer', 'genre', 'date', 'track', 'comment', 'description', 'copyright', 'creation_time'];
+const streamMetadataKeySuggestions = ['title', 'language', 'handler_name', 'comment', 'creation_time'];
+
const getStreamDispositionsObj = (stream: FFprobeStream) => ((stream && stream.disposition) || {});
const getStreamParams = ({ paramsByFile, filePath, streamId }: { paramsByFile: ParamsByFile, filePath: string, streamId: number }) => (
@@ -229,7 +233,7 @@ const EditFileDialog = memo(({ editingFile, allFilesMeta, paramsByFile, setParam
<div style={{ marginTop: '.5em' }}>
{enableMetadata && (
<Tabs.Content value="metadata">
- <TagEditor existingTags={existingMetadata} customTags={fileParams?.metadata} editingTag={editingKey} setEditingTag={setEditingKey} onTagsChange={onMetadataChange} onTagReset={onMetadataReset} addTagTitle={t('Add metadata')} tagInfo={tagInfo} canDeleteExisting />
+ <TagEditor existingTags={existingMetadata} customTags={fileParams?.metadata} editingTag={editingKey} setEditingTag={setEditingKey} onTagsChange={onMetadataChange} onTagReset={onMetadataReset} addTagTitle={t('Add metadata')} tagInfo={tagInfo} keySuggestions={fileMetadataKeySuggestions} canDeleteExisting />
</Tabs.Content>
)}
@@ -318,7 +322,7 @@ const EditStreamDialog = memo(({ editingStream: { streamId: editingStreamId, pat
<div style={{ marginTop: '.5em' }}>
<Tabs.Content value="metadata">
- <TagEditor existingTags={existingMetadata} customTags={streamParams?.metadata} editingTag={editingKey} setEditingTag={setEditingKey} onTagsChange={onMetadataChange} onTagReset={onMetadataReset} addTagTitle={t('Add metadata')} tagInfo={tagInfo} canDeleteExisting />
+ <TagEditor existingTags={existingMetadata} customTags={streamParams?.metadata} editingTag={editingKey} setEditingTag={setEditingKey} onTagsChange={onMetadataChange} onTagReset={onMetadataReset} addTagTitle={t('Add metadata')} tagInfo={tagInfo} keySuggestions={streamMetadataKeySuggestions} canDeleteExisting />
</Tabs.Content>
{editingStream != null && (
diff --git a/src/renderer/src/components/SuggestionTextField.tsx b/src/renderer/src/components/SuggestionTextField.tsx
index 66f974db..0a65e172 100644
--- a/src/renderer/src/components/SuggestionTextField.tsx
+++ b/src/renderer/src/components/SuggestionTextField.tsx
@@ -1,4 +1,5 @@
import type { ComponentProps } from 'react';
+import { useImperativeHandle, useRef } from 'react';
import { DropdownMenu, IconButton, TextField } from '@radix-ui/themes';
import { FaChevronDown } from 'react-icons/fa';
@@ -9,20 +10,24 @@ export interface Suggestion {
}
// A text field with a dropdown of suggested values (Radix Themes has no combobox)
-export default function SuggestionTextField({ suggestions, onValueChange, ...props }: Omit<ComponentProps<typeof TextField.Root>, 'onChange'> & {
+export default function SuggestionTextField({ ref, suggestions, onValueChange, disabled, ...props }: Omit<ComponentProps<typeof TextField.Root>, 'onChange'> & {
suggestions: Suggestion[],
onValueChange: (value: string) => void,
}) {
+ const inputRef = useRef<HTMLInputElement>(null);
+ useImperativeHandle(ref, () => inputRef.current!);
+
return (
// eslint-disable-next-line react/jsx-props-no-spreading
- <TextField.Root {...props} onChange={(e) => onValueChange(e.target.value)}>
+ <TextField.Root {...props} ref={inputRef} disabled={disabled} onChange={(e) => onValueChange(e.target.value)}>
{suggestions.length > 0 && (
<TextField.Slot side="right">
<DropdownMenu.Root>
- <DropdownMenu.Trigger>
+ <DropdownMenu.Trigger disabled={disabled}>
<IconButton type="button" size="1" variant="ghost" color="gray"><FaChevronDown /></IconButton>
</DropdownMenu.Trigger>
- <DropdownMenu.Content size="1" style={{ maxHeight: '20em' }}>
+ {/* Focus the input (not the trigger) after selecting, so that Enter submits */}
+ <DropdownMenu.Content size="1" style={{ maxHeight: '20em' }} onCloseAutoFocus={(e) => { e.preventDefault(); inputRef.current?.focus(); }}>
{suggestions.map(({ value, label }) => (
<DropdownMenu.Item key={value} onSelect={() => onValueChange(value)}>{label ?? value}</DropdownMenu.Item>
))}
diff --git a/src/renderer/src/components/TagEditor.tsx b/src/renderer/src/components/TagEditor.tsx
index 311402c4..45361d86 100644
--- a/src/renderer/src/components/TagEditor.tsx
+++ b/src/renderer/src/components/TagEditor.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
import invariant from 'tiny-invariant';
import { motion } from 'motion/react';
import { FaCheck, FaClipboard, FaClipboardList, FaEdit, FaInfo, FaPlus, FaTrash, FaUndo } from 'react-icons/fa';
-import { IconButton, Tooltip, Button, TextField } from '@radix-ui/themes';
+import { IconButton, Tooltip, Button } from '@radix-ui/themes';
import type { SegmentTags } from '../types';
import { segmentTagsSchema } from '../types';
@@ -28,7 +28,7 @@ export type TagInfo = Record<string, {
validate?: (value: string) => string | undefined,
}>;
-function TagEditor({ existingTags = emptyObject, customTags = emptyObject, editingTag, setEditingTag, onTagsChange, onTagReset, addTagTitle, tagInfo, canDeleteExisting }: {
+function TagEditor({ existingTags = emptyObject, customTags = emptyObject, editingTag, setEditingTag, onTagsChange, onTagReset, addTagTitle, tagInfo, keySuggestions, canDeleteExisting }: {
existingTags?: SegmentTags,
customTags?: SegmentTags | undefined,
editingTag: string | undefined,
@@ -37,6 +37,7 @@ function TagEditor({ existingTags = emptyObject, customTags = emptyObject, editi
onTagReset: (tag: string) => void,
addTagTitle: string,
tagInfo?: TagInfo,
+ keySuggestions?: string[],
canDeleteExisting?: boolean,
}) {
const { t } = useTranslation();
@@ -130,6 +131,8 @@ function TagEditor({ existingTags = emptyObject, customTags = emptyObject, editi
const editingTagError = editingTag != null && editingTagVal ? tagInfo?.[editingTag]?.validate?.(editingTagVal) : undefined;
+ const availableKeySuggestions = useMemo(() => (keySuggestions ?? []).filter((key) => effectiveTags[key] == null).map((value) => ({ value })), [effectiveTags, keySuggestions]);
+
const canAdd = !newTagKey && (editingTag == null || effectiveTags[editingTag] == null);
function renderValue({ isDeletedExisting, value, thisTagCustom }: {
@@ -208,7 +211,7 @@ function TagEditor({ existingTags = emptyObject, customTags = emptyObject, editi
{editingTagError && <Warning style={{ marginBottom: '1em' }}>{editingTagError}</Warning>}
<form onSubmit={onAddSubmit} style={{ opacity: canAdd ? undefined : 0.5, marginBottom: '1em', display: 'flex', alignItems: 'center' }}>
- <TextField.Root ref={ref} disabled={!canAdd} value={newTagKeyInput} onChange={(e) => setNewTagKeyInput(e.target.value)} placeholder={addTagTitle} style={{ marginRight: '1em' }} />
+ <SuggestionTextField ref={ref} disabled={!canAdd} value={newTagKeyInput} onValueChange={setNewTagKeyInput} suggestions={availableKeySuggestions} placeholder={addTagTitle} style={{ marginRight: '1em' }} />
<IconButton size="2" type="submit" disabled={!canAdd} title={addTagTitle} onClick={add}><FaPlus /></IconButton>
</form>