Fix copy progress, remove v2.0.0, fix subtitle default naming, enforce strict no-upcoding on audio

LocalFlowPlugins/utility/copyToWorkDir/1.0.0/index.js

@@ -2,12 +2,13 @@
 
 const path = require('path');
 const fs   = require('fs');
+const { copyWithProgress } = require('../../../../FlowHelpers/1.0.0/copyWithProgress');
 
 /* eslint-disable no-param-reassign */
 
 /**
  * copyToWorkDir
- * Copies the source file to the worker's local workDir before processing.
+ * Copies the source file into the worker's local workDir before processing.
  *
  * Use this plugin BEFORE any transcode/extract plugin when:
  *   - The source file lives on a network share / mapped drive
@@ -15,21 +16,20 @@ const fs   = require('fs');
  *   - The network path is slow or unreliable during long encodes
  *
  * Flow:
- *   1. Copies source → workDir/<basename>_old<ext>  (streams, no RAM load)
+ *   1. Copies source -> workDir/<basename>_old<ext> (streamed with real-time progress)
  *   2. Updates outputFileObj._id to the local copy path
  *   3. Downstream plugins operate on the local copy
- *   4. Tdarr replaces the original with the final output as usual
+ *   4. Tdarr replaces the original with the final output via replaceOriginalFile
  */
 
 const details = () => ({
   name: 'Copy Source to Work Dir',
   description:
-    'Copies the source file into the worker local workDir before processing. '
-    + 'Use before transcode plugins when the source is on a slow network share '
-    + 'to avoid I/O bottleneck during encode. '
-    + 'The local copy is used by all subsequent plugins in this flow.',
+    'Copies the source file into the worker local workDir using a streamed, verified copy '
+    + 'with real-time progress, speed, and ETA tracking. Use before transcode plugins '
+    + 'when the source is on a network share to avoid I/O bottlenecks during encoding.',
   style: { borderColor: '#607D8B' },
-  tags: 'utility',
+  tags: 'utility,copy,progress',
   isStartPlugin: false,
   pType: '',
   requiresVersion: '2.11.01',
@@ -55,27 +55,35 @@ const details = () => ({
   ],
 });
 
-// ─── Plugin ───────────────────────────────────────────────────────────────────
-
 const plugin = async (args) => {
-  const { jobLog, inputFileObj, variables, workDir } = args;
+  const { jobLog, inputFileObj, variables, workDir, updateWorker } = args;
 
   const inputFile = inputFileObj._id;
   const ext       = path.extname(inputFile);
   const baseName  = path.basename(inputFile, ext);
   const localCopy = path.join(workDir, `${baseName}_old${ext}`);
+  const skipIfLocal = (args.inputs.skipIfLocal || 'true') === 'true';
 
   jobLog(`[copyToWorkDir] Source : ${inputFile}\n`);
   jobLog(`[copyToWorkDir] WorkDir: ${workDir}\n`);
 
-  // ── Skip only if file is already located inside workDir ──────────────────
-  const skipIfLocal = (args.inputs.skipIfLocal || 'true') === 'true';
-  if (skipIfLocal && inputFile.startsWith(workDir)) {
+  // Skip if source file is already inside workDir
+  const relativeInput = path.relative(path.resolve(workDir), path.resolve(inputFile));
+  if (
+    skipIfLocal
+    && relativeInput !== '..'
+    && !relativeInput.startsWith(`..${path.sep}`)
+    && !path.isAbsolute(relativeInput)
+  ) {
     jobLog('[copyToWorkDir] Source file is already inside workDir — skipping copy.\n');
     return { outputNumber: 1, outputFileObj: inputFileObj, variables };
   }
 
-  // ── Preserve original library paths for downstream plugins ──────────────
+  if (!fs.existsSync(inputFile)) {
+    throw new Error(`[copyToWorkDir] Source file not found: ${inputFile}`);
+  }
+
+  // Preserve original library paths for downstream plugins
   if (!variables.originalLibraryFile) {
     variables.originalLibraryFile = inputFile;
     variables.originalLibraryDir  = path.dirname(inputFile);
@@ -83,43 +91,16 @@ const plugin = async (args) => {
   variables.workDirSourceBaseName = baseName;
   variables.workDirCopyApplied = 'true';
 
-  // ── Copy using streams (no RAM spike for large files) ────────────────────
-  const sourceSize = fs.statSync(inputFile).size;
-  const sourceSizeMb = (sourceSize / 1024 / 1024).toFixed(1);
-  jobLog(`[copyToWorkDir] Copying ${sourceSizeMb} MB to: ${localCopy}\n`);
-
-  const startMs = Date.now();
-  let copiedBytes = 0;
-  let nextProgressPercent = 10;
-
-  await new Promise((resolve, reject) => {
-    const rd = fs.createReadStream(inputFile);
-    const wr = fs.createWriteStream(localCopy);
-
-    rd.on('error', reject);
-    wr.on('error', reject);
-    wr.on('finish', resolve);
-    rd.on('data', (chunk) => {
-      copiedBytes += chunk.length;
-      if (sourceSize <= 0) return;
-
-      const percent = Math.floor((copiedBytes / sourceSize) * 100);
-      if (percent < nextProgressPercent) return;
-
-      const elapsedSeconds = Math.max((Date.now() - startMs) / 1000, 0.1);
-      const copiedMb = (copiedBytes / 1024 / 1024).toFixed(1);
-      const speedMbPerSecond = (copiedBytes / 1024 / 1024 / elapsedSeconds).toFixed(1);
-      jobLog(`[copyToWorkDir] Progress: ${Math.min(percent, 100)}% (${copiedMb}/${sourceSizeMb} MB, ${speedMbPerSecond} MB/s)\n`);
-      nextProgressPercent = (Math.floor(percent / 10) + 1) * 10;
-    });
-    rd.pipe(wr);
+  jobLog(`[copyToWorkDir] Copying ${inputFile} to ${localCopy}\n`);
+  await copyWithProgress({
+    source: inputFile,
+    destination: localCopy,
+    jobLog,
+    updateWorker,
+    updateProgress: args.updateProgress,
+    label: 'copyToWorkDir',
   });
 
-  const elapsed = ((Date.now() - startMs) / 1000).toFixed(1);
-  const sizeMb  = (fs.statSync(localCopy).size / 1024 / 1024).toFixed(1);
-  jobLog(`[copyToWorkDir] Done: ${sizeMb} MB copied in ${elapsed}s\n`);
-
-  // Return updated inputFileObj pointing to the local copy
   return {
     outputNumber: 1,
     outputFileObj: { ...inputFileObj, _id: localCopy },

LocalFlowPlugins/utility/copyToWorkDir/2.0.0/index.js

@@ -1,70 +0,0 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const { copyWithProgress } = require('../../../../FlowHelpers/1.0.0/copyWithProgress');
-
-const details = () => ({
-  name: 'Copy Source to Work Dir (Progress)',
-  description:
-    'Copies the source file into the worker local workDir using a streamed, verified copy '
-    + 'with progress updates. Use before transcode plugins for files on network shares.',
-  style: { borderColor: '#607D8B' },
-  tags: 'utility,copy,progress',
-  isStartPlugin: false,
-  pType: '',
-  requiresVersion: '2.11.01',
-  sidebarPosition: 0,
-  icon: 'faCopy',
-  inputs: [
-    {
-      label: 'Skip if already local',
-      name: 'skipIfLocal',
-      type: 'boolean',
-      defaultValue: 'true',
-      inputUI: { type: 'dropdown', options: ['true', 'false'] },
-      tooltip: 'Skip when the source is already inside workDir.',
-    },
-  ],
-  outputs: [{ number: 1, tooltip: 'File is ready in workDir — continue to next plugin' }],
-});
-
-const plugin = async (args) => {
-  const { jobLog, inputFileObj, variables, workDir } = args;
-  const inputFile = inputFileObj._id;
-  const ext = path.extname(inputFile);
-  const baseName = path.basename(inputFile, ext);
-  const localCopy = path.join(workDir, `${baseName}_old${ext}`);
-  const skipIfLocal = (args.inputs.skipIfLocal || 'true') === 'true';
-
-  const relativeInput = path.relative(path.resolve(workDir), path.resolve(inputFile));
-  if (skipIfLocal && relativeInput !== '..' && !relativeInput.startsWith(`..${path.sep}`)
-      && !path.isAbsolute(relativeInput)) {
-    jobLog('[copyToWorkDir] Source file is already inside workDir — skipping copy.\n');
-    return { outputNumber: 1, outputFileObj: inputFileObj, variables };
-  }
-  if (!fs.existsSync(inputFile)) throw new Error(`[copyToWorkDir] Source file not found: ${inputFile}`);
-
-  variables.originalLibraryFile = variables.originalLibraryFile || inputFile;
-  variables.originalLibraryDir = variables.originalLibraryDir || path.dirname(inputFile);
-  variables.workDirSourceBaseName = baseName;
-  variables.workDirCopyApplied = 'true';
-
-  jobLog(`[copyToWorkDir] Copying ${inputFile} to ${localCopy}\n`);
-  await copyWithProgress({
-    source: inputFile,
-    destination: localCopy,
-    jobLog,
-    updateProgress: args.updateProgress,
-    label: 'copyToWorkDir',
-  });
-
-  return {
-    outputNumber: 1,
-    outputFileObj: { ...inputFileObj, _id: localCopy },
-    variables,
-  };
-};
-
-module.exports.details = details;
-module.exports.plugin = plugin;

LocalFlowPlugins/utility/finalizeMedia/1.0.0/index.js

@@ -35,9 +35,16 @@ const normalizeSubtitleParts = (parts) => {
   const normalized = [];
   for (const part of parts) {
     const value = part.toLowerCase();
-    if (LANGUAGE_CODES[value]) normalized.push(LANGUAGE_CODES[value]);
-    else if (!normalized.includes(value)) normalized.push(value);
+    if (LANGUAGE_CODES[value]) {
+      normalized.push(LANGUAGE_CODES[value]);
+    } else if (value === 'default') {
+      // Discard 'default'; it will only be re-added below if it is ita + forced
+      continue;
+    } else if (!normalized.includes(value)) {
+      normalized.push(value);
+    }
   }
+  // Only ita.forced can be marked as default; default must be removed from all other subtitles
   if (normalized.includes('ita') && normalized.includes('forced')
       && !normalized.includes('default')) {
     normalized.splice(normalized.indexOf('forced') + 1, 0, 'default');
@@ -151,9 +158,10 @@ const plugin = async (args) => {
   }
 
   for (const item of metadata) {
+    const isItaForced = item.language === 'ita' && item.forced;
     const expected = `${mediaBaseName}.${item.language}`
       + (item.forced ? '.forced' : '')
-      + (item.forced || item.default ? '.default' : '')
+      + (isItaForced ? '.default' : '')
       + (item.sdh ? '.sdh' : '') + '.srt';
     if (!fs.existsSync(path.join(finalDir, expected))) {
       jobLog(`[finalizeMedia] WARNING: Expected subtitle sidecar is missing: ${expected}\n`);

LocalFlowPlugins/utility/replaceOriginalFile/1.0.0/index.js

@@ -1,15 +1,18 @@
 'use strict';
 
 const path = require('path');
-const fs = require('fs');
+const fs   = require('fs');
+const { copyWithProgress } = require('../../../../FlowHelpers/1.0.0/copyWithProgress');
+
+/* eslint-disable no-param-reassign */
 
 const details = () => ({
   name: 'Replace Original File',
   description:
-    'Copies the processed file to the original library path, verifies the copy, '
-    + 'and atomically replaces the original with rollback if replacement fails.',
+    'Copies the processed file to the original library path with streamed progress, '
+    + 'size verification, an atomic rename, and rollback if replacement fails.',
   style: { borderColor: '#FF9800' },
-  tags: 'utility,replace',
+  tags: 'utility,replace,progress',
   isStartPlugin: false,
   pType: '',
   requiresVersion: '2.11.01',
@@ -25,22 +28,13 @@ const details = () => ({
       tooltip: 'Delete the processed file after it has replaced the original.',
     },
   ],
-  outputs: [{ number: 1, tooltip: 'Original file replaced — continue to next plugin' }],
+  outputs: [
+    { number: 1, tooltip: 'Original file replaced — continue to next plugin' },
+  ],
 });
 
-const copyAndVerify = (source, destination) => {
-  fs.copyFileSync(source, destination);
-  const sourceSize = fs.statSync(source).size;
-  const destinationSize = fs.statSync(destination).size;
-  if (sourceSize !== destinationSize) {
-    throw new Error(
-      `Copy size mismatch: expected ${sourceSize} bytes, got ${destinationSize}`,
-    );
-  }
-};
-
 const plugin = async (args) => {
-  const { inputFileObj, variables, jobLog } = args;
+  const { inputFileObj, variables, jobLog, updateWorker } = args;
   const source = inputFileObj._id;
   const configuredDestination = variables.originalLibraryFile || args.originalLibraryFile;
   const destination = typeof configuredDestination === 'string'
@@ -69,14 +63,28 @@ const plugin = async (args) => {
   let installed = false;
 
   try {
-    if (fs.existsSync(temporary)) fs.unlinkSync(temporary);
-    copyAndVerify(source, temporary);
+    if (fs.existsSync(temporary)) {
+      fs.unlinkSync(temporary);
+    }
+
+    jobLog(`[replaceOriginalFile] Copying processed file to temporary destination: ${temporary}\n`);
+    await copyWithProgress({
+      source,
+      destination: temporary,
+      jobLog,
+      updateWorker,
+      updateProgress: args.updateProgress,
+      label: 'replaceOriginalFile',
+    });
 
     if (fs.existsSync(destination)) {
-      if (fs.existsSync(backup)) fs.unlinkSync(backup);
+      if (fs.existsSync(backup)) {
+        fs.unlinkSync(backup);
+      }
       fs.renameSync(destination, backup);
       backupCreated = true;
     }
+
     fs.renameSync(temporary, destination);
     installed = true;
 
@@ -87,6 +95,7 @@ const plugin = async (args) => {
         jobLog(`[replaceOriginalFile] WARNING: Could not remove backup ${backup}: ${error.message}\n`);
       }
     }
+
     if ((args.inputs.deleteSource || 'true') === 'true') {
       try {
         fs.unlinkSync(source);
@@ -102,9 +111,11 @@ const plugin = async (args) => {
       variables,
     };
   } catch (error) {
-    if (fs.existsSync(temporary)) fs.unlinkSync(temporary);
+    if (fs.existsSync(temporary)) {
+      try { fs.unlinkSync(temporary); } catch (_) { /* ignore */ }
+    }
     if (backupCreated && !installed && !fs.existsSync(destination)) {
-      fs.renameSync(backup, destination);
+      try { fs.renameSync(backup, destination); } catch (_) { /* ignore */ }
     }
     throw new Error(`[replaceOriginalFile] Replacement failed: ${error.message}`);
   }

LocalFlowPlugins/utility/replaceOriginalFile/2.0.0/index.js

@@ -1,99 +0,0 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const { copyWithProgress } = require('../../../../FlowHelpers/1.0.0/copyWithProgress');
-
-const details = () => ({
-  name: 'Replace Original File (Progress)',
-  description:
-    'Copies the processed file to the original library path with streamed progress, '
-    + 'size verification, an atomic rename, and rollback if replacement fails.',
-  style: { borderColor: '#FF9800' },
-  tags: 'utility,replace,progress',
-  isStartPlugin: false,
-  pType: '',
-  requiresVersion: '2.11.01',
-  sidebarPosition: 1,
-  icon: 'faExchangeAlt',
-  inputs: [
-    {
-      label: 'Delete processed work file',
-      name: 'deleteSource',
-      type: 'boolean',
-      defaultValue: 'true',
-      inputUI: { type: 'dropdown', options: ['true', 'false'] },
-      tooltip: 'Delete the processed file after it has replaced the original.',
-    },
-  ],
-  outputs: [{ number: 1, tooltip: 'Original file replaced — continue to next plugin' }],
-});
-
-const plugin = async (args) => {
-  const { inputFileObj, variables, jobLog } = args;
-  const source = inputFileObj._id;
-  const configuredDestination = variables.originalLibraryFile || args.originalLibraryFile;
-  const destination = typeof configuredDestination === 'string'
-    ? configuredDestination
-    : configuredDestination && configuredDestination._id;
-  if (!destination || typeof destination !== 'string') {
-    throw new Error('[replaceOriginalFile] No original library path is available');
-  }
-  if (!fs.existsSync(source)) throw new Error(`[replaceOriginalFile] Processed file not found: ${source}`);
-  if (path.resolve(source) === path.resolve(destination)) {
-    jobLog('[replaceOriginalFile] Processed file is already at the original path — skipping.\n');
-    return { outputNumber: 1, outputFileObj: inputFileObj, variables };
-  }
-
-  const destinationDir = path.dirname(destination);
-  if (!fs.existsSync(destinationDir)) {
-    throw new Error(`[replaceOriginalFile] Destination directory does not exist: ${destinationDir}`);
-  }
-
-  const temporary = `${destination}.tdarr.tmp`;
-  const backup = `${destination}.partial.old`;
-  let backupCreated = false;
-  let installed = false;
-  try {
-    if (fs.existsSync(temporary)) fs.unlinkSync(temporary);
-    await copyWithProgress({
-      source,
-      destination: temporary,
-      jobLog,
-      updateProgress: args.updateProgress,
-      label: 'replaceOriginalFile',
-    });
-
-    if (fs.existsSync(destination)) {
-      if (fs.existsSync(backup)) fs.unlinkSync(backup);
-      fs.renameSync(destination, backup);
-      backupCreated = true;
-    }
-    fs.renameSync(temporary, destination);
-    installed = true;
-
-    if (backupCreated) {
-      try {
-        fs.unlinkSync(backup);
-      } catch (error) {
-        jobLog(`[replaceOriginalFile] WARNING: Could not remove backup ${backup}: ${error.message}\n`);
-      }
-    }
-    if ((args.inputs.deleteSource || 'true') === 'true') {
-      try {
-        fs.unlinkSync(source);
-      } catch (error) {
-        jobLog(`[replaceOriginalFile] WARNING: Could not delete processed file ${source}: ${error.message}\n`);
-      }
-    }
-    jobLog(`[replaceOriginalFile] Replaced original file: ${destination}\n`);
-    return { outputNumber: 1, outputFileObj: { ...inputFileObj, _id: destination }, variables };
-  } catch (error) {
-    if (fs.existsSync(temporary)) fs.unlinkSync(temporary);
-    if (backupCreated && !installed && !fs.existsSync(destination)) fs.renameSync(backup, destination);
-    throw new Error(`[replaceOriginalFile] Replacement failed: ${error.message}`);
-  }
-};
-
-module.exports.details = details;
-module.exports.plugin = plugin;