michael/ripster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixxes + Skriptketten

Browse Source
This commit is contained in:
mboehmlaender
2026-03-05 20:46:39 +00:00
parent 6836892907
commit afca677b1c
14 changed files with 1785 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
frontend/src/components/MediaInfoReviewPanel.jsx
View File

@@ -486,14 +486,21 @@ function resolveAudioEncoderPreviewLabel(track, encoderToken, copyMask, fallback
: [];
let canCopy = false;
let effectiveCodec = sourceCodec;
if (explicitCopyCodec) {
canCopy = Boolean(sourceCodec && sourceCodec === explicitCopyCodec);
} else if (sourceCodec && normalizedCopyMask.length > 0) {
canCopy = normalizedCopyMask.includes(sourceCodec);
// DTS-HD MA contains an embedded DTS core. When dtshd is not in the copy
// mask but dts is, HandBrake will extract and copy the DTS core layer.
if (!canCopy && sourceCodec === 'dtshd' && normalizedCopyMask.includes('dts')) {
canCopy = true;
effectiveCodec = 'dts';
}
}
if (canCopy) {
return `Copy (${sourceCodec || track?.format || 'Quelle'})`;
return `Copy (${effectiveCodec || track?.format || 'Quelle'})`;
}
const fallback = String(fallbackEncoder || DEFAULT_AUDIO_FALLBACK_PREVIEW).trim().toLowerCase() || DEFAULT_AUDIO_FALLBACK_PREVIEW;
@@ -684,7 +691,21 @@ export default function MediaInfoReviewPanel({
onAddPostEncodeScript = null,
onChangePostEncodeScript = null,
onRemovePostEncodeScript = null,
onReorderPostEncodeScript = null
onReorderPostEncodeScript = null,
availablePreScripts = [],
selectedPreEncodeScriptIds = [],
allowPreScriptSelection = false,
onAddPreEncodeScript = null,
onChangePreEncodeScript = null,
onRemovePreEncodeScript = null,
availableChains = [],
selectedPreEncodeChainIds = [],
selectedPostEncodeChainIds = [],
allowChainSelection = false,
onAddPreEncodeChain = null,
onRemovePreEncodeChain = null,
onAddPostEncodeChain = null,
onRemovePostEncodeChain = null
}) {
if (!review) {
return <p>Keine Mediainfo-Daten vorhanden.</p>;
@@ -759,6 +780,136 @@ export default function MediaInfoReviewPanel({
</div>
) : null}
{/* Pre-Encode Scripts */}
{(allowPreScriptSelection || normalizeScriptIdList(selectedPreEncodeScriptIds).length > 0) ? (
<div className="post-script-box">
<h4>Pre-Encode Scripte (optional)</h4>
{(Array.isArray(availablePreScripts) ? availablePreScripts : []).length === 0 ? (
<small>Keine Scripte konfiguriert. In den Settings unter "Scripte" anlegen.</small>
) : null}
{normalizeScriptIdList(selectedPreEncodeScriptIds).length === 0 ? (
<small>Keine Pre-Encode Scripte ausgewählt.</small>
) : null}
{normalizeScriptIdList(selectedPreEncodeScriptIds).map((scriptId, rowIndex) => {
const preCatalog = (Array.isArray(availablePreScripts) ? availablePreScripts : [])
.map((item) => ({ id: normalizeScriptId(item?.id), name: String(item?.name || '') }))
.filter((item) => item.id !== null);
const preById = new Map(preCatalog.map((item) => [item.id, item]));
const script = preById.get(scriptId) || null;
const selectedElsewhere = new Set(
normalizeScriptIdList(selectedPreEncodeScriptIds).filter((_, i) => i !== rowIndex).map((id) => String(id))
);
const options = preCatalog.map((item) => ({
label: item.name,
value: item.id,
disabled: selectedElsewhere.has(String(item.id))
}));
return (
<div key={`pre-script-row-${rowIndex}-${scriptId}`} className={`post-script-row${allowPreScriptSelection ? ' editable' : ''}`}>
{allowPreScriptSelection ? (
<>
<Dropdown
value={scriptId}
options={options}
optionLabel="label"
optionValue="value"
optionDisabled="disabled"
onChange={(event) => onChangePreEncodeScript?.(rowIndex, event.value)}
className="full-width"
/>
<Button
icon="pi pi-times"
severity="danger"
outlined
onClick={() => onRemovePreEncodeScript?.(rowIndex)}
/>
</>
) : (
<small>{`${rowIndex + 1}. ${script?.name || `Script #${scriptId}`}`}</small>
)}
</div>
);
})}
{allowPreScriptSelection && (Array.isArray(availablePreScripts) ? availablePreScripts : []).length > normalizeScriptIdList(selectedPreEncodeScriptIds).length ? (
<Button
label="Pre-Script hinzufügen"
icon="pi pi-plus"
severity="secondary"
outlined
onClick={() => onAddPreEncodeScript?.()}
/>
) : null}
<small>Diese Scripte werden vor dem Encoding ausgeführt. Bei Fehler wird der Encode abgebrochen.</small>
</div>
) : null}
{/* Chain Selections */}
{(allowChainSelection || selectedPreEncodeChainIds.length > 0 || selectedPostEncodeChainIds.length > 0) ? (
<div className="post-script-box">
<h4>Skriptketten (optional)</h4>
{(Array.isArray(availableChains) ? availableChains : []).length === 0 ? (
<small>Keine Skriptketten konfiguriert. In den Settings unter "Skriptketten" anlegen.</small>
) : null}
{(Array.isArray(availableChains) ? availableChains : []).length > 0 ? (
<div className="chain-selection-groups">
<div className="chain-selection-group">
<strong>Pre-Encode Ketten</strong>
{selectedPreEncodeChainIds.length === 0 ? <small>Keine ausgewählt.</small> : null}
{selectedPreEncodeChainIds.map((chainId, index) => {
const chain = (Array.isArray(availableChains) ? availableChains : []).find((c) => Number(c.id) === chainId);
return (
<div key={`pre-chain-${index}-${chainId}`} className="post-script-row editable">
<small>{`${index + 1}. ${chain?.name || `Kette #${chainId}`}`}</small>
{allowChainSelection ? (
<Button icon="pi pi-times" severity="danger" outlined onClick={() => onRemovePreEncodeChain?.(index)} />
) : null}
</div>
);
})}
{allowChainSelection ? (
<Dropdown
value={null}
options={(Array.isArray(availableChains) ? availableChains : [])
.filter((c) => !selectedPreEncodeChainIds.includes(Number(c.id)))
.map((c) => ({ label: c.name, value: c.id }))}
onChange={(e) => onAddPreEncodeChain?.(e.value)}
placeholder="Kette hinzufügen..."
className="chain-add-dropdown"
/>
) : null}
</div>
<div className="chain-selection-group">
<strong>Post-Encode Ketten</strong>
{selectedPostEncodeChainIds.length === 0 ? <small>Keine ausgewählt.</small> : null}
{selectedPostEncodeChainIds.map((chainId, index) => {
const chain = (Array.isArray(availableChains) ? availableChains : []).find((c) => Number(c.id) === chainId);
return (
<div key={`post-chain-${index}-${chainId}`} className="post-script-row editable">
<small>{`${index + 1}. ${chain?.name || `Kette #${chainId}`}`}</small>
{allowChainSelection ? (
<Button icon="pi pi-times" severity="danger" outlined onClick={() => onRemovePostEncodeChain?.(index)} />
) : null}
</div>
);
})}
{allowChainSelection ? (
<Dropdown
value={null}
options={(Array.isArray(availableChains) ? availableChains : [])
.filter((c) => !selectedPostEncodeChainIds.includes(Number(c.id)))
.map((c) => ({ label: c.name, value: c.id }))}
onChange={(e) => onAddPostEncodeChain?.(e.value)}
placeholder="Kette hinzufügen..."
className="chain-add-dropdown"
/>
) : null}
</div>
</div>
) : null}
</div>
) : null}
<div className="post-script-box">
<h4>Post-Encode Scripte (optional)</h4>
{scriptCatalog.length === 0 ? (

114
frontend/src/components/PipelineStatusCard.jsx
View File

@@ -224,16 +224,21 @@ export default function PipelineStatusCard({
const [settingsMap, setSettingsMap] = useState({});
const [presetDisplayMap, setPresetDisplayMap] = useState({});
const [scriptCatalog, setScriptCatalog] = useState([]);
const [chainCatalog, setChainCatalog] = useState([]);
const [selectedPostEncodeScriptIds, setSelectedPostEncodeScriptIds] = useState([]);
const [selectedPreEncodeScriptIds, setSelectedPreEncodeScriptIds] = useState([]);
const [selectedPostEncodeChainIds, setSelectedPostEncodeChainIds] = useState([]);
const [selectedPreEncodeChainIds, setSelectedPreEncodeChainIds] = useState([]);
useEffect(() => {
let cancelled = false;
const loadSettings = async () => {
try {
const [settingsResponse, presetsResponse, scriptsResponse] = await Promise.allSettled([
const [settingsResponse, presetsResponse, scriptsResponse, chainsResponse] = await Promise.allSettled([
api.getSettings(),
api.getHandBrakePresets(),
api.getScripts()
api.getScripts(),
api.getScriptChains()
]);
if (!cancelled) {
const categories = settingsResponse.status === 'fulfilled'
@@ -253,12 +258,17 @@ export default function PipelineStatusCard({
name: item?.name
}))
);
const chains = chainsResponse.status === 'fulfilled'
? (Array.isArray(chainsResponse.value?.chains) ? chainsResponse.value.chains : [])
: [];
setChainCatalog(chains.map((item) => ({ id: item?.id, name: item?.name })));
}
} catch (_error) {
if (!cancelled) {
setSettingsMap({});
setPresetDisplayMap({});
setScriptCatalog([]);
setChainCatalog([]);
}
}
};
@@ -275,6 +285,17 @@ export default function PipelineStatusCard({
setSelectedPostEncodeScriptIds(
normalizeScriptIdList(mediaInfoReview?.postEncodeScriptIds || [])
);
setSelectedPreEncodeScriptIds(
normalizeScriptIdList(mediaInfoReview?.preEncodeScriptIds || [])
);
setSelectedPostEncodeChainIds(
(Array.isArray(mediaInfoReview?.postEncodeChainIds) ? mediaInfoReview.postEncodeChainIds : [])
.map(Number).filter((id) => Number.isFinite(id) && id > 0)
);
setSelectedPreEncodeChainIds(
(Array.isArray(mediaInfoReview?.preEncodeChainIds) ? mediaInfoReview.preEncodeChainIds : [])
.map(Number).filter((id) => Number.isFinite(id) && id > 0)
);
}, [mediaInfoReview?.encodeInputTitleId, mediaInfoReview?.generatedAt, retryJobId]);
useEffect(() => {
@@ -434,10 +455,16 @@ export default function PipelineStatusCard({
}
: null;
const selectedPostScriptIds = normalizeScriptIdList(selectedPostEncodeScriptIds);
const selectedPreScriptIds = normalizeScriptIdList(selectedPreEncodeScriptIds);
const normalizeChainIdList = (raw) =>
(Array.isArray(raw) ? raw : []).map(Number).filter((id) => Number.isFinite(id) && id > 0);
return {
encodeTitleId,
selectedTrackSelection,
selectedPostScriptIds
selectedPostScriptIds,
selectedPreScriptIds,
selectedPostChainIds: normalizeChainIdList(selectedPostEncodeChainIds),
selectedPreChainIds: normalizeChainIdList(selectedPreEncodeChainIds)
};
};
@@ -530,13 +557,19 @@ export default function PipelineStatusCard({
const {
encodeTitleId,
selectedTrackSelection,
selectedPostScriptIds
selectedPostScriptIds,
selectedPreScriptIds,
selectedPostChainIds,
selectedPreChainIds
} = buildSelectedTrackSelectionForCurrentTitle();
await onStart(retryJobId, {
ensureConfirmed: true,
selectedEncodeTitleId: encodeTitleId,
selectedTrackSelection,
selectedPostEncodeScriptIds: selectedPostScriptIds
selectedPostEncodeScriptIds: selectedPostScriptIds,
selectedPreEncodeScriptIds: selectedPreScriptIds,
selectedPostEncodeChainIds: selectedPostChainIds,
selectedPreEncodeChainIds: selectedPreChainIds
});
}}
loading={busy}
@@ -809,6 +842,77 @@ export default function PipelineStatusCard({
return next;
});
}}
availablePreScripts={scriptCatalog}
selectedPreEncodeScriptIds={selectedPreEncodeScriptIds}
allowPreScriptSelection={state === 'READY_TO_ENCODE' && !reviewConfirmed && !queueLocked}
onAddPreEncodeScript={() => {
setSelectedPreEncodeScriptIds((prev) => {
const normalizedCurrent = normalizeScriptIdList(prev);
const selectedSet = new Set(normalizedCurrent.map((id) => String(id)));
const nextCandidate = (Array.isArray(scriptCatalog) ? scriptCatalog : [])
.map((item) => normalizeScriptId(item?.id))
.find((id) => id !== null && !selectedSet.has(String(id)));
if (nextCandidate === undefined || nextCandidate === null) {
return normalizedCurrent;
}
return [...normalizedCurrent, nextCandidate];
});
}}
onChangePreEncodeScript={(rowIndex, nextScriptId) => {
setSelectedPreEncodeScriptIds((prev) => {
const normalizedCurrent = normalizeScriptIdList(prev);
if (!Number.isFinite(Number(rowIndex)) || rowIndex < 0 || rowIndex >= normalizedCurrent.length) {
return normalizedCurrent;
}
const normalizedScriptId = normalizeScriptId(nextScriptId);
if (normalizedScriptId === null) {
return normalizedCurrent;
}
if (normalizedCurrent.some((id, idx) => idx !== rowIndex && String(id) === String(normalizedScriptId))) {
return normalizedCurrent;
}
const next = [...normalizedCurrent];
next[rowIndex] = normalizedScriptId;
return next;
});
}}
onRemovePreEncodeScript={(rowIndex) => {
setSelectedPreEncodeScriptIds((prev) => {
const normalizedCurrent = normalizeScriptIdList(prev);
if (!Number.isFinite(Number(rowIndex)) || rowIndex < 0 || rowIndex >= normalizedCurrent.length) {
return normalizedCurrent;
}
return normalizedCurrent.filter((_, idx) => idx !== rowIndex);
});
}}
availableChains={chainCatalog}
selectedPreEncodeChainIds={selectedPreEncodeChainIds}
selectedPostEncodeChainIds={selectedPostEncodeChainIds}
allowChainSelection={state === 'READY_TO_ENCODE' && !reviewConfirmed && !queueLocked}
onAddPreEncodeChain={(chainId) => {
setSelectedPreEncodeChainIds((prev) => {
const id = Number(chainId);
if (!Number.isFinite(id) || id <= 0 || prev.includes(id)) {
return prev;
}
return [...prev, id];
});
}}
onRemovePreEncodeChain={(index) => {
setSelectedPreEncodeChainIds((prev) => prev.filter((_, i) => i !== index));
}}
onAddPostEncodeChain={(chainId) => {
setSelectedPostEncodeChainIds((prev) => {
const id = Number(chainId);
if (!Number.isFinite(id) || id <= 0 || prev.includes(id)) {
return prev;
}
return [...prev, id];
});
}}
onRemovePostEncodeChain={(index) => {
setSelectedPostEncodeChainIds((prev) => prev.filter((_, i) => i !== index));
}}
/>
</div>
) : null}