0.12.0-16 misc fixes

backend/src/services/cdRipService.js

@@ -381,6 +381,35 @@ async function runProcessTracked({
   }
 }
 
+/**
+ * Returns sorted plain WAV filenames (not .cdda.wav) in rawWavDir.
+ * Used as fallback when track01.cdda.wav files are absent (e.g. orphan imports with artist-title WAV files).
+ */
+function getSortedPlainWavFiles(rawWavDir) {
+  try {
+    return fs.readdirSync(rawWavDir)
+      .filter((f) => /\.wav$/i.test(f) && !/\.cdda\.wav$/i.test(f))
+      .sort((a, b) => a.localeCompare(b, undefined, { sensitivity: 'base' }));
+  } catch (_) {
+    return [];
+  }
+}
+
+/**
+ * Resolves the WAV file path for a given track position.
+ * Primary: track01.cdda.wav (cdparanoia format)
+ * Fallback: Nth sorted plain WAV file (for orphan imports with artist-title filenames)
+ */
+function resolveTrackWavFile(rawWavDir, position, sortedPlainWavFiles) {
+  const cddaPath = path.join(rawWavDir, `track${String(position).padStart(2, '0')}.cdda.wav`);
+  if (fs.existsSync(cddaPath)) return cddaPath;
+  if (Array.isArray(sortedPlainWavFiles) && sortedPlainWavFiles.length >= position && position >= 1) {
+    const fallback = path.join(rawWavDir, sortedPlainWavFiles[position - 1]);
+    if (fs.existsSync(fallback)) return fallback;
+  }
+  return cddaPath;
+}
+
 /**
  * Rip and encode a CD.
  *
@@ -458,10 +487,12 @@ async function ripAndEncode(options) {
   const encodePercentSpan = Math.max(0, 100 - encodePercentStart);
 
   // ── Phase 1: Rip each selected track to WAV ──────────────────────────────
+  const _sortedPlainWavFiles = skipRip ? getSortedPlainWavFiles(rawWavDir) : null;
+
   if (skipRip) {
     // Encode-only: WAV-Dateien müssen bereits vorhanden sein
     for (const track of tracksToRip) {
-      const wavFile = path.join(rawWavDir, `track${String(track.position).padStart(2, '0')}.cdda.wav`);
+      const wavFile = resolveTrackWavFile(rawWavDir, track.position, _sortedPlainWavFiles);
       if (!fs.existsSync(wavFile)) {
         throw new Error(`Encode-only: WAV-Datei fehlt für Track ${track.position} (${wavFile})`);
       }
@@ -550,7 +581,7 @@ async function ripAndEncode(options) {
     for (let i = 0; i < tracksToRip.length; i++) {
       assertNotCancelled(isCancelled);
       const track = tracksToRip[i];
-      const wavFile = path.join(rawWavDir, `track${String(track.position).padStart(2, '0')}.cdda.wav`);
+      const wavFile = resolveTrackWavFile(rawWavDir, track.position, _sortedPlainWavFiles);
       const { outFile } = buildOutputFilePath(outputDir, track, meta, 'wav', outputTemplate);
       onProgress && onProgress({
         phase: 'encode',
@@ -582,7 +613,7 @@ async function ripAndEncode(options) {
   for (let i = 0; i < tracksToRip.length; i++) {
     assertNotCancelled(isCancelled);
     const track = tracksToRip[i];
-    const wavFile = path.join(rawWavDir, `track${String(track.position).padStart(2, '0')}.cdda.wav`);
+    const wavFile = resolveTrackWavFile(rawWavDir, track.position, _sortedPlainWavFiles);
 
     if (!fs.existsSync(wavFile)) {
       throw new Error(`WAV-Datei nicht gefunden für Track ${track.position}: ${wavFile}`);