0.15.0-1 merger

This commit is contained in:
michael committed 2026-04-22 20:32:47 +00:00
1 parent 1f0a357abf
commit 120a9e6ad1
16 files changed
+728 -197

No files matched your search

+291 -158
View File
@@ -545,6 +545,15 @@ function isMultipartMergeJob(job) {
return resolveJobKindRaw(job) === 'multipart_movie_merge';
}
function getMergeAwareStatusLabel(job, status, options = {}) {
const queued = Boolean(options?.queued);
const normalizedStatus = normalizeStatus(status);
if (!queued && isMultipartMergeJob(job) && normalizedStatus === 'ENCODING') {
return 'Merging';
}
return getStatusLabel(status, options);
}
function extractMultipartMergeSources(job) {
const encodePlan = getEncodePlan(job) || {};
const sourceItems = Array.isArray(encodePlan?.sourceItems) ? encodePlan.sourceItems : [];
@@ -1158,6 +1167,8 @@ export default function RipperPage({
const [ripperJobs, setRipperJobs] = useState([]);
const [multipartMergePreviewByJobId, setMultipartMergePreviewByJobId] = useState({});
const [multipartMergePreviewLoadingByJobId, setMultipartMergePreviewLoadingByJobId] = useState({});
const [multipartMergeLiveLogByJobId, setMultipartMergeLiveLogByJobId] = useState({});
const [multipartMergeLiveLogLoadingByJobId, setMultipartMergeLiveLogLoadingByJobId] = useState({});
const [expandedJobId, setExpandedJobId] = useState(undefined);
const [activationBytesDialog, setActivationBytesDialog] = useState({ visible: false, checksum: null, jobId: null });
const [activationBytesInput, setActivationBytesInput] = useState('');
@@ -1270,6 +1281,17 @@ export default function RipperPage({
if (!ripperStatuses.has(normalizedStatus)) {
return false;
}
if (isMultipartMergeJob(job)) {
const mergeToolStatus = String(job?.handbrakeInfo?.status || '').trim().toUpperCase();
const mergeCompleted = Boolean(
normalizedStatus === 'FINISHED'
|| job?.encodeSuccess
|| mergeToolStatus === 'SUCCESS'
);
if (mergeCompleted) {
return false;
}
}
if (normalizedStatus !== 'CANCELLED') {
return true;
}
@@ -1506,6 +1528,80 @@ export default function RipperPage({
void loadMultipartMergePreview(normalizedExpanded, { force: false, silent: true });
}, [expandedJobId, ripperJobs]);
useEffect(() => {
const normalizedExpanded = normalizeJobId(expandedJobId);
if (!normalizedExpanded) {
return undefined;
}
const expandedJob = ripperJobs.find((job) => normalizeJobId(job?.id) === normalizedExpanded) || null;
if (!expandedJob || !isMultipartMergeJob(expandedJob)) {
return undefined;
}
const expandedStatus = String(expandedJob?.status || expandedJob?.last_state || '').trim().toUpperCase();
if (expandedStatus !== 'ENCODING') {
setMultipartMergeLiveLogLoadingByJobId((prev) => ({
...prev,
[normalizedExpanded]: false
}));
return undefined;
}
let cancelled = false;
const refresh = async () => {
setMultipartMergeLiveLogLoadingByJobId((prev) => ({
...prev,
[normalizedExpanded]: true
}));
try {
const response = await api.getJob(normalizedExpanded, {
includeLiveLog: true,
lite: true,
logTailLines: 400
});
if (cancelled) {
return;
}
const liveJob = response?.job && typeof response.job === 'object'
? response.job
: null;
setMultipartMergeLiveLogByJobId((prev) => ({
...prev,
[normalizedExpanded]: String(liveJob?.log || '').trim()
}));
} catch (_error) {
if (_error?.status === 404) {
cancelled = true;
setMultipartMergeLiveLogByJobId((prev) => ({
...prev,
[normalizedExpanded]: ''
}));
void loadRipperJobs();
return;
}
if (!cancelled) {
setMultipartMergeLiveLogByJobId((prev) => ({
...prev,
[normalizedExpanded]: ''
}));
}
} finally {
if (!cancelled) {
setMultipartMergeLiveLogLoadingByJobId((prev) => ({
...prev,
[normalizedExpanded]: false
}));
}
}
};
void refresh();
const interval = setInterval(refresh, 2500);
return () => {
cancelled = true;
clearInterval(interval);
};
}, [expandedJobId, ripperJobs]);
const pipelineByJobId = useMemo(() => {
const map = new Map();
for (const job of ripperJobs) {
@@ -3154,7 +3250,7 @@ export default function RipperPage({
}
const normalizedStatus = normalizeStatus(job?.status);
const isQueued = queuedJobIdSet.has(jobId);
const statusBadgeValue = getStatusLabel(job?.status, { queued: isQueued });
const statusBadgeValue = getMergeAwareStatusLabel(job, job?.status, { queued: isQueued });
const statusBadgeSeverity = getStatusSeverity(normalizedStatus, { queued: isQueued });
const isExpanded = normalizeJobId(expandedJobId) === jobId;
const isCurrentSession = jobId === currentPipelineJobId && state !== 'IDLE';
@@ -3281,6 +3377,11 @@ export default function RipperPage({
const multipartMergePreviewLoading = Boolean(
isMultipartMerge && multipartMergePreviewLoadingByJobId[jobId]
);
const multipartMergeLiveLog = String(multipartMergeLiveLogByJobId[jobId] || '').trim();
const multipartMergeLiveLogLoading = Boolean(
isMultipartMerge && multipartMergeLiveLogLoadingByJobId[jobId]
);
const isMultipartMergeRunning = isMultipartMerge && normalizedStatus === 'ENCODING';
const multipartMergeCommandPreview = String(multipartMergePreview?.command?.preview || '').trim();
const multipartMergeChapterEntries = Array.isArray(multipartMergePreview?.chapters?.entries)
? multipartMergePreview.chapters.entries
@@ -3396,156 +3497,186 @@ export default function RipperPage({
{!isCdJob && !isAudiobookJob ? (
isMultipartMerge ? (
<div className="multipart-merge-panel">
<div className="multipart-merge-head">
<strong>Merge-Quellen</strong>
<small>Drag-and-Drop ändert die Reihenfolge der Disc-Dateien.</small>
</div>
{hasMultipartMergeSources ? (
<div className="multipart-merge-list">
{multipartMergeSources.map((source, sourceIndex) => {
const sourceKey = `${jobId}-${source.sourceJobId}-${sourceIndex}`;
const canReorder = !busyJobIds.has(jobId)
&& !processingStates.includes(normalizedStatus)
&& multipartMergeSources.length > 1;
return (
<div
key={sourceKey}
className="multipart-merge-item"
draggable={canReorder}
onDragStart={() => {
if (!canReorder) return;
setDraggingMergeSource({ jobId, sourceJobId: source.sourceJobId });
}}
onDragEnd={() => setDraggingMergeSource(null)}
onDragOver={(event) => {
if (!canReorder) return;
if (!draggingMergeSource || draggingMergeSource.jobId !== jobId) return;
event.preventDefault();
}}
onDrop={(event) => {
if (!canReorder) return;
if (!draggingMergeSource || draggingMergeSource.jobId !== jobId) return;
event.preventDefault();
const draggedId = normalizeJobId(draggingMergeSource.sourceJobId);
const targetId = normalizeJobId(source.sourceJobId);
if (!draggedId || !targetId || draggedId === targetId) {
setDraggingMergeSource(null);
return;
}
const currentOrder = multipartMergeSources
.map((item) => normalizeJobId(item.sourceJobId))
.filter(Boolean);
const fromIndex = currentOrder.findIndex((id) => id === draggedId);
const toIndex = currentOrder.findIndex((id) => id === targetId);
if (fromIndex < 0 || toIndex < 0 || fromIndex === toIndex) {
setDraggingMergeSource(null);
return;
}
const nextOrder = [...currentOrder];
const [moved] = nextOrder.splice(fromIndex, 1);
nextOrder.splice(toIndex, 0, moved);
setDraggingMergeSource(null);
handleReorderMultipartMergeSources(jobId, nextOrder);
}}
>
<div className="multipart-merge-item-meta">
<Tag value={`#${sourceIndex + 1}`} severity="contrast" />
<Tag value={source.discNumber ? `Disc ${source.discNumber}` : 'Disc ?'} severity="info" />
<Tag value={`Job #${source.sourceJobId}`} severity="secondary" />
</div>
<div className="multipart-merge-item-text">
<strong>{source.fileName || source.outputPath}</strong>
<small>{source.outputPath}</small>
</div>
</div>
);
})}
</div>
) : (
<p className="muted-inline">Noch keine Merge-Quellen gefunden.</p>
)}
<div className="multipart-merge-preview">
<div className="multipart-merge-preview-head">
<strong>Merge Vorschau</strong>
<Button
icon="pi pi-refresh"
text
severity="secondary"
aria-label="Merge-Vorschau aktualisieren"
onClick={() => loadMultipartMergePreview(jobId, { force: true, silent: false })}
disabled={busyJobIds.has(jobId) || multipartMergePreviewLoading}
/>
</div>
{multipartMergePreviewLoading ? (
<small className="muted-inline">Vorschau wird aktualisiert ...</small>
) : null}
<div className="multipart-merge-preview-section">
<strong>1. CLI-Befehl</strong>
{multipartMergeCommandPreview ? (
<code className="multipart-merge-command-preview">{multipartMergeCommandPreview}</code>
) : (
<small className="muted-inline">Noch keine Vorschau verfügbar.</small>
)}
</div>
<div className="multipart-merge-preview-section">
<strong>2. Kapitel (gesamt)</strong>
{multipartMergeChapterEntries.length > 0 ? (
<div className="multipart-merge-chapter-list">
{multipartMergeChapterEntries.map((entry) => (
<div key={`merge-chapter-${jobId}-${entry.index}`} className="multipart-merge-chapter-item">
<small>#{entry.index}</small>
<small>{entry.startClock || entry.start || '-'}</small>
<span>{entry.title || '-'}</span>
</div>
))}
</div>
) : (
<small className="muted-inline">Keine berechnete Kapitel-Gesamtliste verfügbar.</small>
)}
</div>
<div className="multipart-merge-preview-section">
<strong>3. Erwartete Medieninfos (nach Merge)</strong>
<div className="multipart-merge-track-columns">
<div className="multipart-merge-track-column">
<small className="multipart-merge-track-heading">Audio</small>
{multipartMergeAudioTracks.length > 0 ? (
<div className="multipart-merge-track-list">
{multipartMergeAudioTracks.map((track) => (
<small key={`merge-audio-${jobId}-${track.order || track.streamIndex}`}>
{formatMergeTrackSummary(track, 'Audio')}
</small>
))}
</div>
) : (
<small className="muted-inline">Keine Audio-Infos.</small>
)}
</div>
<div className="multipart-merge-track-column">
<small className="multipart-merge-track-heading">Untertitel</small>
{multipartMergeSubtitleTracks.length > 0 ? (
<div className="multipart-merge-track-list">
{multipartMergeSubtitleTracks.map((track) => (
<small key={`merge-sub-${jobId}-${track.order || track.streamIndex}`}>
{formatMergeTrackSummary(track, 'UT')}
</small>
))}
</div>
) : (
<small className="muted-inline">Keine Untertitel-Infos.</small>
)}
</div>
{!isMultipartMergeRunning ? (
<>
<div className="multipart-merge-head">
<strong>Merge-Quellen</strong>
<small>Drag-and-Drop ändert die Reihenfolge der Disc-Dateien.</small>
</div>
{multipartMergePreview?.media?.available ? (
<small className={multipartMergeMediaAligned ? 'muted-inline' : 'error-text'}>
{multipartMergeMediaAligned
? 'Track-Layout über alle Quellen konsistent.'
: `Achtung: Track-Layout unterscheidet sich zwischen Quellen (${multipartMergeMediaMismatchCount} Abweichung(en)).`}
</small>
{hasMultipartMergeSources ? (
<div className="multipart-merge-list">
{multipartMergeSources.map((source, sourceIndex) => {
const sourceKey = `${jobId}-${source.sourceJobId}-${sourceIndex}`;
const canReorder = !busyJobIds.has(jobId)
&& !processingStates.includes(normalizedStatus)
&& multipartMergeSources.length > 1;
return (
<div
key={sourceKey}
className="multipart-merge-item"
draggable={canReorder}
onDragStart={() => {
if (!canReorder) return;
setDraggingMergeSource({ jobId, sourceJobId: source.sourceJobId });
}}
onDragEnd={() => setDraggingMergeSource(null)}
onDragOver={(event) => {
if (!canReorder) return;
if (!draggingMergeSource || draggingMergeSource.jobId !== jobId) return;
event.preventDefault();
}}
onDrop={(event) => {
if (!canReorder) return;
if (!draggingMergeSource || draggingMergeSource.jobId !== jobId) return;
event.preventDefault();
const draggedId = normalizeJobId(draggingMergeSource.sourceJobId);
const targetId = normalizeJobId(source.sourceJobId);
if (!draggedId || !targetId || draggedId === targetId) {
setDraggingMergeSource(null);
return;
}
const currentOrder = multipartMergeSources
.map((item) => normalizeJobId(item.sourceJobId))
.filter(Boolean);
const fromIndex = currentOrder.findIndex((id) => id === draggedId);
const toIndex = currentOrder.findIndex((id) => id === targetId);
if (fromIndex < 0 || toIndex < 0 || fromIndex === toIndex) {
setDraggingMergeSource(null);
return;
}
const nextOrder = [...currentOrder];
const [moved] = nextOrder.splice(fromIndex, 1);
nextOrder.splice(toIndex, 0, moved);
setDraggingMergeSource(null);
handleReorderMultipartMergeSources(jobId, nextOrder);
}}
>
<div className="multipart-merge-item-meta">
<Tag value={`#${sourceIndex + 1}`} severity="contrast" />
<Tag value={source.discNumber ? `Disc ${source.discNumber}` : 'Disc ?'} severity="info" />
<Tag value={`Job #${source.sourceJobId}`} severity="secondary" />
</div>
<div className="multipart-merge-item-text">
<strong>{source.fileName || source.outputPath}</strong>
<small>{source.outputPath}</small>
</div>
</div>
);
})}
</div>
) : (
<small className="muted-inline">Stream-Vergleich noch nicht verfügbar.</small>
<p className="muted-inline">Noch keine Merge-Quellen gefunden.</p>
)}
</>
) : null}
{isMultipartMergeRunning ? (
<>
<div className="status-row multipart-merge-running-head">
<Tag value="Merging" severity="warning" />
<span>{String(pipelineForJob?.statusText || '').trim() || 'Merge läuft'}</span>
</div>
<div className="progress-wrap multipart-merge-running-progress">
<ProgressBar
value={clampedProgress}
showValue
displayValueTemplate={() => progressLabel}
/>
<small>
{etaLabel ? `${progressLabel} | ETA ${etaLabel}` : progressLabel}
</small>
</div>
<div className="live-log-block multipart-merge-live-log">
<h4>Aktueller Merge-Log</h4>
<pre className="log-box">
{multipartMergeLiveLog
|| (multipartMergeLiveLogLoading ? 'Live-Log wird geladen ...' : 'Noch keine Log-Ausgabe vorhanden.')}
</pre>
</div>
</>
) : (
<div className="multipart-merge-preview">
<div className="multipart-merge-preview-head">
<strong>Merge Vorschau</strong>
<Button
icon="pi pi-refresh"
text
severity="secondary"
aria-label="Merge-Vorschau aktualisieren"
onClick={() => loadMultipartMergePreview(jobId, { force: true, silent: false })}
disabled={busyJobIds.has(jobId) || multipartMergePreviewLoading}
/>
</div>
{multipartMergePreviewLoading ? (
<small className="muted-inline">Vorschau wird aktualisiert ...</small>
) : null}
<div className="multipart-merge-preview-section">
<strong>1. CLI-Befehl</strong>
{multipartMergeCommandPreview ? (
<code className="multipart-merge-command-preview">{multipartMergeCommandPreview}</code>
) : (
<small className="muted-inline">Noch keine Vorschau verfügbar.</small>
)}
</div>
<div className="multipart-merge-preview-section">
<strong>2. Kapitel (gesamt)</strong>
{multipartMergeChapterEntries.length > 0 ? (
<div className="multipart-merge-chapter-list">
{multipartMergeChapterEntries.map((entry) => (
<div key={`merge-chapter-${jobId}-${entry.index}`} className="multipart-merge-chapter-item">
<small>#{entry.index}</small>
<small>{entry.startClock || entry.start || '-'}</small>
<span>{entry.title || '-'}</span>
</div>
))}
</div>
) : (
<small className="muted-inline">Keine berechnete Kapitel-Gesamtliste verfügbar.</small>
)}
</div>
<div className="multipart-merge-preview-section">
<strong>3. Erwartete Medieninfos (nach Merge)</strong>
<div className="multipart-merge-track-columns">
<div className="multipart-merge-track-column">
<small className="multipart-merge-track-heading">Audio</small>
{multipartMergeAudioTracks.length > 0 ? (
<div className="multipart-merge-track-list">
{multipartMergeAudioTracks.map((track) => (
<small key={`merge-audio-${jobId}-${track.order || track.streamIndex}`}>
{formatMergeTrackSummary(track, 'Audio')}
</small>
))}
</div>
) : (
<small className="muted-inline">Keine Audio-Infos.</small>
)}
</div>
<div className="multipart-merge-track-column">
<small className="multipart-merge-track-heading">Untertitel</small>
{multipartMergeSubtitleTracks.length > 0 ? (
<div className="multipart-merge-track-list">
{multipartMergeSubtitleTracks.map((track) => (
<small key={`merge-sub-${jobId}-${track.order || track.streamIndex}`}>
{formatMergeTrackSummary(track, 'UT')}
</small>
))}
</div>
) : (
<small className="muted-inline">Keine Untertitel-Infos.</small>
)}
</div>
</div>
{multipartMergePreview?.media?.available ? (
<small className={multipartMergeMediaAligned ? 'muted-inline' : 'error-text'}>
{multipartMergeMediaAligned
? 'Track-Layout über alle Quellen konsistent.'
: `Achtung: Track-Layout unterscheidet sich zwischen Quellen (${multipartMergeMediaMismatchCount} Abweichung(en)).`}
</small>
) : (
<small className="muted-inline">Stream-Vergleich noch nicht verfügbar.</small>
)}
</div>
</div>
</div>
)}
<div className="multipart-merge-actions">
{(normalizedStatus === 'READY_TO_START' || normalizedStatus === 'READY_TO_ENCODE') ? (
<Button
@@ -3575,14 +3706,16 @@ export default function RipperPage({
disabled={busyJobIds.has(jobId)}
/>
) : null}
<Button
label="Job löschen"
icon="pi pi-trash"
severity="danger"
outlined
onClick={() => handleDeleteRipperJob(jobId)}
disabled={busyJobIds.has(jobId)}
/>
{!isMultipartMergeRunning ? (
<Button
label="Job löschen"
icon="pi pi-trash"
severity="danger"
outlined
onClick={() => handleDeleteRipperJob(jobId)}
disabled={busyJobIds.has(jobId)}
/>
) : null}
</div>
</div>
) : (
@@ -3753,7 +3886,7 @@ export default function RipperPage({
{item.hasChains ? <i className="pi pi-link queue-job-tag" title="Skriptketten hinterlegt" /> : null}
</strong>
{item.subtitle ? <small>{item.subtitle}</small> : null}
<small>#{item.jobId} | {getStatusLabel(item.status)}</small>
<small>#{item.jobId} | {getMergeAwareStatusLabel(item, item.status)}</small>
{clampedQueueProgress > 0 && (
<ProgressBar value={clampedQueueProgress} style={{ height: '5px' }} showValue={false} />
)}
@@ -3794,7 +3927,7 @@ export default function RipperPage({
{item.hasScripts ? <i className="pi pi-code queue-job-tag" title="Skripte hinterlegt" /> : null}
{item.hasChains ? <i className="pi pi-link queue-job-tag" title="Skriptketten hinterlegt" /> : null}
</strong>
<small>{getStatusLabel(item.status)}</small>
<small>{getMergeAwareStatusLabel(item, item.status)}</small>
</div>
{hasScriptSummary ? (
<button
@@ -3870,7 +4003,7 @@ export default function RipperPage({
{item.hasChains ? <i className="pi pi-link queue-job-tag" title="Skriptketten hinterlegt" /> : null}
</strong>
{item.subtitle ? <small>{item.subtitle}</small> : null}
<small>{item.position || '-'} | #{item.jobId} | {item.actionLabel || item.action || '-'} | {getStatusLabel(item.status)}</small>
<small>{item.position || '-'} | #{item.jobId} | {item.actionLabel || item.action || '-'} | {getMergeAwareStatusLabel(item, item.status)}</small>
</>
)}
</div>