0.12.0-16 misc fixes

backend/src/utils/files.js

@@ -44,13 +44,26 @@ function sanitizeFileNameWithExtension(input) {
 }
 
 function renderTemplate(template, values) {
-  return String(template || '${title} (${year})').replace(/\$\{([^}]+)\}/g, (_, key) => {
-    const val = values[key.trim()];
+  const rawSource = String(template || '${title} (${year})');
+  const resolveToken = (rawKey) => {
+    const key = String(rawKey || '').trim();
+    const val = values[key];
     if (val === undefined || val === null || val === '') {
       return 'unknown';
     }
     return String(val);
-  });
+  };
+
+  const source = (
+    /[{}]/.test(rawSource)
+      ? rawSource
+      : rawSource.replace(/\b(trackNr|trackNumber|artist|album|title|year)\b/g, '{$1}')
+  );
+
+  // Support both ${key} and legacy {key} placeholders (+ recovered bare tokens).
+  return source
+    .replace(/\$\{([^}]+)\}/g, (_m, key) => resolveToken(key))
+    .replace(/\{([^{}$]+)\}/g, (_m, key) => resolveToken(key));
 }
 
 function findLargestMediaFile(dirPath, extensions = ['.mkv', '.mp4']) {