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

0.13.1-7 Fix Series

Browse Source
This commit is contained in:
mboehmlaender
2026-04-14 13:28:03 +00:00
parent 9297a84eea
commit c89a93ed05
17 changed files with 174 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Bildschirmfoto 2026-04-12 um 20.43.33.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 MiB

Bildschirmfoto 2026-04-12 um 20.45.16.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 MiB

Bildschirmfoto 2026-04-12 um 21.03.46.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 MiB

Bildschirmfoto 2026-04-12 um 21.11.19.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 MiB

backend/package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "ripster-backend",
"version": "0.13.1-6",
"version": "0.13.1-7",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "ripster-backend",
"version": "0.13.1-6",
"version": "0.13.1-7",
"dependencies": {
"archiver": "^7.0.1",
"cors": "^2.8.5",
backend/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "ripster-backend",
"version": "0.13.1-6",
"version": "0.13.1-7",
"private": true,
"type": "commonjs",
"scripts": {
backend/src/services/historyService.js
+63 -15
View File
@@ -2356,6 +2356,14 @@ function normalizeJobIdValue(value) {
return Math.trunc(parsed);
}
function isSeriesContainerRow(row) {
return String(row?.job_kind || '').trim().toLowerCase() === 'dvd_series_container';
}
function isSeriesChildRow(row) {
return String(row?.job_kind || '').trim().toLowerCase() === 'dvd_series_child';
}
function normalizeArchiveTarget(value) {
const raw = String(value || '').trim().toLowerCase();
if (raw === 'raw') {
@@ -4771,6 +4779,11 @@ class HistoryService {
if (!entry.isDirectory() || isHiddenDirectoryName(entry.name)) {
continue;
}
if (/^incomplete_/i.test(String(entry.name || '').trim())) {
// Incomplete RAW folders represent unfinished rips and are intentionally
// not re-importable from /database.
continue;
}
const rawPath = path.join(rawDir, entry.name);
const normalizedPath = normalizeComparablePath(rawPath);
@@ -5765,6 +5778,12 @@ class HistoryService {
const pending = [normalizedJobId];
const visited = new Set();
const parentRow = normalizeJobIdValue(primary?.parent_job_id) !== null
? byId.get(normalizeJobIdValue(primary?.parent_job_id))
: null;
const isPrimarySeriesChild = isSeriesChildRow(primary)
|| (parentRow && isSeriesContainerRow(parentRow));
const isPrimarySeriesContainer = isSeriesContainerRow(primary);
const enqueue = (value) => {
const id = normalizeJobIdValue(value);
if (!id || visited.has(id)) {
@@ -5785,8 +5804,10 @@ class HistoryService {
continue;
}
enqueue(row.parent_job_id);
enqueue(parseSourceJobIdFromPlan(row.encode_plan_json));
if (!(isPrimarySeriesChild || isPrimarySeriesContainer)) {
enqueue(row.parent_job_id);
enqueue(parseSourceJobIdFromPlan(row.encode_plan_json));
}
for (const childId of (childrenByParent.get(currentId) || [])) {
enqueue(childId);
@@ -5795,7 +5816,7 @@ class HistoryService {
enqueue(childId);
}
if (includeLogLinks) {
if (includeLogLinks && !(isPrimarySeriesChild || isPrimarySeriesContainer)) {
try {
const processLog = await this.readProcessLogLines(currentId, { includeAll: true });
const linkedJobIds = parseRetryLinkedJobIdsFromLogLines(processLog.lines);
@@ -5808,6 +5829,25 @@ class HistoryService {
}
}
if (isPrimarySeriesChild && parentRow && isSeriesContainerRow(parentRow)) {
const parentId = normalizeJobIdValue(parentRow?.id);
if (parentId) {
const remainingChildren = rows.filter((row) => {
const rowId = normalizeJobIdValue(row?.id);
if (!rowId) {
return false;
}
if (normalizeJobIdValue(row?.parent_job_id) !== parentId) {
return false;
}
return !visited.has(rowId);
});
if (remainingChildren.length === 0) {
visited.add(parentId);
}
}
}
return Array.from(visited)
.map((id) => byId.get(id))
.filter(Boolean)
@@ -6849,16 +6889,23 @@ class HistoryService {
const includeRelated = Boolean(options?.includeRelated);
if (!includeRelated) {
const existing = await this.getJobById(jobId);
const resolved = await this.getJobByIdOrReplacement(jobId);
const existing = resolved?.job || null;
const normalizedJobId = normalizeJobIdValue(resolved?.resolvedJobId || jobId);
if (!existing) {
const error = new Error('Job nicht gefunden.');
error.statusCode = 404;
throw error;
}
if (!normalizedJobId) {
const error = new Error('Ungültige Job-ID.');
error.statusCode = 400;
throw error;
}
let fileSummary = null;
if (fileTarget !== 'none') {
const preview = await this.getJobDeletePreview(jobId, { includeRelated: false });
const preview = await this.getJobDeletePreview(normalizedJobId, { includeRelated: false });
fileSummary = this._deletePathsFromPreview(preview, fileTarget, {
selectedMoviePaths: options?.selectedMoviePaths
});
@@ -6869,7 +6916,7 @@ class HistoryService {
'SELECT state, active_job_id FROM pipeline_state WHERE id = 1'
);
const isActivePipelineJob = Number(pipelineRow?.active_job_id || 0) === Number(jobId);
const isActivePipelineJob = Number(pipelineRow?.active_job_id || 0) === Number(normalizedJobId);
const runningStates = new Set(['ANALYZING', 'RIPPING', 'MEDIAINFO_CHECK', 'ENCODING', 'CD_ANALYZING', 'CD_RIPPING', 'CD_ENCODING']);
if (isActivePipelineJob && runningStates.has(String(pipelineRow?.state || ''))) {
@@ -6904,23 +6951,23 @@ class HistoryService {
updated_at = CURRENT_TIMESTAMP
WHERE id = 1 AND active_job_id = ?
`,
[jobId]
[normalizedJobId]
);
}
await db.run('DELETE FROM jobs WHERE id = ?', [jobId]);
await db.run('DELETE FROM jobs WHERE id = ?', [normalizedJobId]);
await db.exec('COMMIT');
} catch (error) {
await db.exec('ROLLBACK');
throw error;
}
await this.closeProcessLog(jobId);
this._deleteProcessLogFile(jobId);
thumbnailService.deleteThumbnail(jobId);
await this.closeProcessLog(normalizedJobId);
this._deleteProcessLogFile(normalizedJobId);
thumbnailService.deleteThumbnail(normalizedJobId);
logger.warn('job:deleted', {
jobId,
jobId: normalizedJobId,
fileTarget,
includeRelated: false,
pipelineStateReset: isActivePipelineJob,
@@ -6934,15 +6981,16 @@ class HistoryService {
return {
deleted: true,
jobId,
jobId: normalizedJobId,
fileTarget,
includeRelated: false,
deletedJobIds: [Number(jobId)],
deletedJobIds: [Number(normalizedJobId)],
fileSummary
};
}
const normalizedJobId = normalizeJobIdValue(jobId);
const resolved = await this.getJobByIdOrReplacement(jobId);
const normalizedJobId = normalizeJobIdValue(resolved?.resolvedJobId || jobId);
const preview = await this.getJobDeletePreview(normalizedJobId, { includeRelated: true });
const deleteJobIds = Array.isArray(preview?.relatedJobs)
? preview.relatedJobs
backend/src/services/pipelineService.js
+8 -2
View File
@@ -20984,7 +20984,7 @@ class PipelineService extends EventEmitter {
const shouldAutoRecoverEncode = normalizedStage === 'ENCODING'
&& hasConfirmedPlan
&& (!isCancelled || resolvedMediaProfile === 'converter');
&& resolvedMediaProfile !== 'audiobook';
if (shouldAutoRecoverEncode) {
try {
const recoveryReasonLabel = isCancelled ? 'Abbruch' : 'Fehler';
@@ -22782,7 +22782,13 @@ class PipelineService extends EventEmitter {
);
newRawPath = nextRaw.rawDir;
} else {
const rawBaseDir = path.dirname(currentRawPath);
const rawStorage = resolveSeriesAwareRawStorage(
settings || {},
mediaProfile,
selectedMetadata,
mkInfo?.analyzeContext || null
);
const rawBaseDir = String(rawStorage?.rawBaseDir || '').trim() || path.dirname(currentRawPath);
const newMetadataBase = buildRawMetadataBase({
title: job.title || job.detected_title || null,
year: job.year || null,
frontend/package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "ripster-frontend",
"version": "0.13.1-6",
"version": "0.13.1-7",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "ripster-frontend",
"version": "0.13.1-6",
"version": "0.13.1-7",
"dependencies": {
"primeicons": "^7.0.0",
"primereact": "^10.9.2",
frontend/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "ripster-frontend",
"version": "0.13.1-6",
"version": "0.13.1-7",
"private": true,
"type": "module",
"scripts": {
frontend/src/components/ConverterJobCard.jsx
+2 -2
View File
@@ -940,9 +940,9 @@ function InlineConfig({ job, plan, onStarted, onDeleted, onCancelled, onInputsCh
{isVideo && (
<div className="converter-job-card-actions" style={{ marginTop: 0 }}>
<Button
label="OMDb neu zuordnen"
label="Metadaten neu zuweisen"
icon="pi pi-search"
severity="secondary"
severity="info"
outlined
size="small"
onClick={() => setMetadataDialogVisible(true)}
frontend/src/components/PipelineStatusCard.jsx
+29 -7
View File
@@ -1130,6 +1130,7 @@ export default function PipelineStatusCard({
onRetry,
onDeleteJob,
onInputsChanged,
jobRow,
isQueued = false,
busy
}) {
@@ -1141,6 +1142,21 @@ export default function PipelineStatusCard({
const contextJobId = normalizeJobId(pipeline?.context?.jobId);
const retryJobId = explicitJobId || contextJobId;
const queueLocked = Boolean(isQueued && retryJobId);
const orphanSource = String(
jobRow?.makemkvInfo?.source
|| pipeline?.context?.source
|| pipeline?.context?.importSource
|| ''
).trim().toLowerCase();
const isOrphanImport = orphanSource === 'orphan_raw_import';
const isOrphanCancelled = isOrphanImport && (state === 'ERROR' || state === 'CANCELLED');
const ripCompleted = Boolean(
Number(jobRow?.rip_successful || jobRow?.ripSuccessful || pipeline?.context?.ripSuccessful || 0) === 1
|| jobRow?.raw_path
|| pipeline?.context?.rawPath
|| jobRow?.makemkvInfo?.rawPath
|| String(jobRow?.makemkvInfo?.status || '').trim().toUpperCase() === 'SUCCESS'
);
const selectedMetadata = pipeline?.context?.selectedMetadata || null;
const mediaInfoReview = pipeline?.context?.mediaInfoReview || null;
const playlistAnalysis = pipeline?.context?.playlistAnalysis || null;
@@ -1789,6 +1805,11 @@ export default function PipelineStatusCard({
&& retryJobId
&& pipeline?.context?.canRestartEncodeFromLastSettings
);
const canCancelReview = Boolean(
!running
&& retryJobId
&& (state === 'READY_TO_ENCODE' || state === 'WAITING_FOR_USER_DECISION')
);
const canRestartReviewFromRaw = Boolean(
retryJobId
&& !running
@@ -2852,7 +2873,7 @@ export default function PipelineStatusCard({
/>
)}
{(state === 'METADATA_SELECTION' || state === 'WAITING_FOR_USER_DECISION')
{(state === 'METADATA_SELECTION' || state === 'WAITING_FOR_USER_DECISION' || isOrphanCancelled)
&& retryJobId
&& typeof onOpenMetadata === 'function'
&& !(jobMediaProfile === 'converter' && !selectedMetadata?.imdbId) ? (
@@ -2882,11 +2903,12 @@ export default function PipelineStatusCard({
&& state !== 'DISC_DETECTED'
&& retryJobId
&& typeof onReassignOmdb === 'function'
&& !isOrphanCancelled
&& !(jobMediaProfile === 'converter' && state === 'READY_TO_START' && !selectedMetadata?.imdbId) ? (
<Button
label="OMDb neu zuordnen"
label="Metadaten neu zuweisen"
icon="pi pi-search"
severity="secondary"
severity="info"
size="small"
onClick={() => onReassignOmdb?.(retryJobId)}
loading={busy}
@@ -2986,7 +3008,7 @@ export default function PipelineStatusCard({
/>
) : null}
{running && (
{(running || canCancelReview) && (
<Button
label="Abbrechen"
icon="pi pi-stop"
@@ -3041,7 +3063,7 @@ export default function PipelineStatusCard({
)
) : null}
{(state === 'ERROR' || state === 'CANCELLED') && retryJobId && (
{(state === 'ERROR' || state === 'CANCELLED') && retryJobId && !isOrphanCancelled && !ripCompleted && (
<Button
label="Retry Rippen"
icon="pi pi-refresh"
@@ -3051,7 +3073,7 @@ export default function PipelineStatusCard({
/>
)}
{(state === 'ERROR' || state === 'CANCELLED') ? (
{(state === 'ERROR' || state === 'CANCELLED') && !isOrphanCancelled && !ripCompleted ? (
<Button
label="Disk-Analyse neu starten"
icon="pi pi-search"
@@ -3062,7 +3084,7 @@ export default function PipelineStatusCard({
) : null}
</>
)}
{retryJobId && typeof onDeleteJob === 'function' ? (
{!running && retryJobId && typeof onDeleteJob === 'function' ? (
<Button
label="Job löschen"
icon="pi pi-trash"
frontend/src/pages/ConverterPage.jsx
+1
View File
@@ -1279,6 +1279,7 @@ function ConverterVideoJobCard({
<PipelineStatusCard
jobId={jobId}
jobRow={job}
pipeline={pipeline}
onOpenMetadata={onOpenMetadata}
onReassignOmdb={onReassignOmdb}
frontend/src/pages/DatabasePage.jsx
+2 -3
View File
@@ -76,10 +76,9 @@ export default function DatabasePage() {
: (newJobId ? `Historieneintrag #${newJobId} erstellt.` : 'Historieneintrag wurde erstellt.'),
life: 3500
});
// Jump to the Ripper view immediately after creating a job from /database.
navigate('/ripper');
await loadOrphans();
if (activationStarted) {
navigate('/ripper');
}
} catch (error) {
toastRef.current?.show({
severity: 'error',
frontend/src/pages/RipperPage.jsx
+60 -25
View File
@@ -64,6 +64,20 @@ function normalizeDrivePath(value) {
return String(value || '').trim();
}
function getPathBaseName(value) {
const normalized = String(value || '').trim().replace(/[\\]+/g, '/');
if (!normalized) {
return '';
}
const segments = normalized.split('/').filter(Boolean);
return segments[segments.length - 1] || '';
}
function isIncompleteRawPath(rawPath) {
const baseName = getPathBaseName(rawPath);
return /^incomplete_/i.test(baseName);
}
function formatPercent(value, digits = 1) {
const parsed = Number(value);
if (!Number.isFinite(parsed)) {
@@ -1643,27 +1657,7 @@ export default function RipperPage({
latestCancelledJob = await fetchLatestCancelledJob();
}
}
const latestStatus = String(
latestCancelledJob?.status
|| latestCancelledJob?.last_state
|| ''
).trim().toUpperCase();
const autoPreparedForRestart = cancelledState === 'ENCODING' && latestStatus === 'READY_TO_ENCODE';
if (cancelledState === 'ENCODING' && cancelledJobId && !autoPreparedForRestart) {
setCancelCleanupDialog({
visible: true,
jobId: cancelledJobId,
target: 'movie',
path: latestCancelledJob?.output_path || cancelledJob?.output_path || null
});
} else if (cancelledState === 'RIPPING' && cancelledJobId) {
setCancelCleanupDialog({
visible: true,
jobId: cancelledJobId,
target: 'raw',
path: latestCancelledJob?.raw_path || cancelledJob?.raw_path || null
});
}
// No post-cancel cleanup dialog here; encode/rip cleanup is handled by settings or retry flows.
} catch (error) {
showError(error);
} finally {
@@ -1939,13 +1933,20 @@ export default function RipperPage({
return;
}
const job = ripperJobs.find((item) => normalizeJobId(item?.id) === normalizedJobId) || null;
const ripSuccessful = Number(job?.rip_successful || 0) === 1;
const deleteIncompleteRaw = !ripSuccessful && isIncompleteRawPath(job?.raw_path);
const deleteTarget = deleteIncompleteRaw ? 'raw' : 'none';
const title = String(job?.title || job?.detected_title || `Job #${normalizedJobId}`).trim();
const confirmed = await confirmModal({
header: 'Job löschen',
message:
`Job #${normalizedJobId} wirklich löschen?\n` +
`${title}\n\n` +
'Hinweis: Dateien bleiben erhalten. Das zugeordnete Laufwerk wird freigegeben und auf Leerzustand zurückgesetzt.',
(deleteIncompleteRaw
? 'Hinweis: Unvollständiges RAW wird gelöscht. Für einen neuen Versuch bitte das Laufwerk erneut analysieren.'
: 'Hinweis: Dateien bleiben erhalten. Vollständiges RAW ist anschließend über /database wiederherstellbar.') +
'\nZugehörige Einträge (z.B. Serien-Container oder Folgejobs) werden ebenfalls entfernt.' +
'\nDas zugeordnete Laufwerk wird freigegeben und auf Leerzustand zurückgesetzt.',
acceptLabel: 'Löschen',
rejectLabel: 'Abbrechen',
danger: true
@@ -1969,8 +1970,8 @@ export default function RipperPage({
await wait(250);
}
}
await api.deleteJobEntry(normalizedJobId, 'none', {
includeRelated: false,
await api.deleteJobEntry(normalizedJobId, deleteTarget, {
includeRelated: true,
resetDriveState: true,
keepDetectedDevice: false
});
@@ -2207,7 +2208,40 @@ export default function RipperPage({
setBusy(true);
try {
if (metadataDialogReassignMode) {
await api.assignJobOmdb(payload.jobId, payload);
const providerRaw = String(payload?.metadataProvider || '').trim().toLowerCase();
const nextWorkflowKind = String(
payload?.workflowKind
|| (providerRaw === 'tmdb' ? 'series' : (providerRaw === 'omdb' ? 'film' : ''))
|| ''
).trim().toLowerCase();
const reassignJob = ripperJobs.find((item) => normalizeJobId(item?.id) === normalizeJobId(payload?.jobId)) || null;
const currentWorkflowKind = String(
reassignJob?.makemkvInfo?.analyzeContext?.selectedMetadata?.workflowKind
|| reassignJob?.makemkvInfo?.analyzeContext?.workflowKind
|| reassignJob?.makemkvInfo?.selectedMetadata?.workflowKind
|| effectiveMetadataDialogContext?.selectedMetadata?.workflowKind
|| ''
).trim().toLowerCase();
const currentProvider = String(
reassignJob?.makemkvInfo?.analyzeContext?.metadataProvider
|| reassignJob?.makemkvInfo?.selectedMetadata?.metadataProvider
|| effectiveMetadataDialogContext?.metadataProvider
|| ''
).trim().toLowerCase();
const shouldRestartReview = Boolean(
nextWorkflowKind
&& currentWorkflowKind
&& nextWorkflowKind !== currentWorkflowKind
) || Boolean(
currentProvider
&& providerRaw
&& currentProvider !== providerRaw
);
if (shouldRestartReview) {
await api.selectMetadata(payload);
} else {
await api.assignJobOmdb(payload.jobId, payload);
}
} else {
await api.selectMetadata(payload);
}
@@ -3051,6 +3085,7 @@ export default function RipperPage({
{!isCdJob && !isAudiobookJob ? (
<PipelineStatusCard
jobId={jobId}
jobRow={job}
pipeline={pipelineForJob}
onAnalyze={handleAnalyze}
onReanalyze={handleReanalyze}
package-lock.json
Generated
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "ripster",
"version": "0.13.1-6",
"version": "0.13.1-7",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "ripster",
"version": "0.13.1-6",
"version": "0.13.1-7",
"devDependencies": {
"concurrently": "^9.1.2"
}
package.json
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "ripster",
"private": true,
"version": "0.13.1-6",
"version": "0.13.1-7",
"scripts": {
"dev": "concurrently \"npm run dev --prefix backend\" \"npm run dev --prefix frontend\"",
"dev:backend": "npm run dev --prefix backend",