0.12.0-4 DVD Plugin

2026-03-21 19:12:58 +00:00
parent e99cdf1895
commit c0350644b9
11 changed files with 446 additions and 192 deletions
@@ -147,12 +147,30 @@ class VideoDiscPlugin extends SourcePlugin {
    });

    const scanLines = [];
-    const runInfo = await _runCommandCaptured({
-      cmd: scanConfig.cmd,
-      args: scanConfig.args,
-      onStdoutLine: (line) => scanLines.push(line),
-      context: { jobId: job?.id, source: `${this.id}Plugin.review` }
-    });
+    const runCommandFn = typeof ctx.extra?.runCommand === 'function' ? ctx.extra.runCommand : null;
+    const reviewStage = String(ctx.extra?.reviewStage || 'MEDIAINFO_CHECK').trim().toUpperCase() || 'MEDIAINFO_CHECK';
+    const reviewSource = String(ctx.extra?.reviewSource || 'HANDBRAKE_SCAN').trim().toUpperCase() || 'HANDBRAKE_SCAN';
+    const reviewSilent = Boolean(ctx.extra?.reviewSilent);
+    let runInfo;
+    if (runCommandFn) {
+      runInfo = await runCommandFn({
+        jobId: job?.id,
+        stage: reviewStage,
+        source: reviewSource,
+        cmd: scanConfig.cmd,
+        args: scanConfig.args,
+        collectLines: scanLines,
+        collectStderrLines: false,
+        silent: reviewSilent
+      });
+    } else {
+      runInfo = await _runCommandCaptured({
+        cmd: scanConfig.cmd,
+        args: scanConfig.args,
+        onStdoutLine: (line) => scanLines.push(line),
+        context: { jobId: job?.id, source: `${this.id}Plugin.review` }
+      });
+    }

    ctx.logger.info(`${this.id}:review:scan-done`, {
      jobId: job?.id,
@@ -315,16 +333,35 @@ class VideoDiscPlugin extends SourcePlugin {

    ctx.emitProgress(0, `${this.name}: Encoding läuft …`);

-    const runInfo = await _spawnAndWait({
-      cmd: handBrakeConfig.cmd,
-      args: handBrakeConfig.args,
-      jobId: job?.id,
-      progressParser: parseHandBrakeProgress,
-      onProgress: (pct, statusText) => ctx.emitProgress(Math.round(pct), statusText || `${this.name}: Encoding ${pct}%`),
-      isCancelled,
-      onProcessHandle,
-      context: { jobId: job?.id, source: `${this.id}Plugin.encode`, stage: 'ENCODING' }
-    });
+    const runCommandFn = typeof ctx.extra?.runCommand === 'function' ? ctx.extra.runCommand : null;
+    const encodeSource = String(ctx.extra?.encodeSource || 'HANDBRAKE').trim().toUpperCase() || 'HANDBRAKE';
+    const encodeStage = String(ctx.extra?.encodeStage || 'ENCODING').trim().toUpperCase() || 'ENCODING';
+    const encodeParser = typeof ctx.extra?.progressParser === 'function'
+      ? ctx.extra.progressParser
+      : parseHandBrakeProgress;
+
+    let runInfo;
+    if (runCommandFn) {
+      runInfo = await runCommandFn({
+        jobId: job?.id,
+        stage: encodeStage,
+        source: encodeSource,
+        cmd: handBrakeConfig.cmd,
+        args: handBrakeConfig.args,
+        parser: encodeParser
+      });
+    } else {
+      runInfo = await _spawnAndWait({
+        cmd: handBrakeConfig.cmd,
+        args: handBrakeConfig.args,
+        jobId: job?.id,
+        progressParser: parseHandBrakeProgress,
+        onProgress: (pct, statusText) => ctx.emitProgress(Math.round(pct), statusText || `${this.name}: Encoding ${pct}%`),
+        isCancelled,
+        onProcessHandle,
+        context: { jobId: job?.id, source: `${this.id}Plugin.encode`, stage: 'ENCODING' }
+      });
+    }

    ctx.logger.info(`${this.id}:encode:done`, {
      jobId: job?.id,