Fix media

common-utils

@@ -1 +1 @@
-Subproject commit 017243cdd3557fe8e78c195b79bdce52b17f5b92
+Subproject commit f3193e64265d3e62a078f03e22b136a049c0b1d6

server-plugins/crop.js

@@ -8,6 +8,10 @@ export class CropPlugin extends Plugin {
     super(name, options);
   }
 
+  mediaPathFlatten(mediaPath) {
+    return path.join('public', path.basename(mediaPath));
+  }
+
   async applyPrerender(originalManuscript, jobId) {
     const transcript = originalManuscript.transcript || [];
     const targetWidth = +this.options.width || +this.options.targetWidth || 1080;
@@ -18,10 +22,17 @@ export class CropPlugin extends Plugin {
       if (!item.mediaAbsPaths || !item.mediaAbsPaths.length) continue;
       for (let mediaObj of item.mediaAbsPaths) {
         try {
-          const mediaPath = mediaObj.path;
+          let mediaPath = mediaObj.path;
           if (!mediaPath || !fs.existsSync(mediaPath)) {
-            this.log(`Media path does not exist: ${mediaPath}`);
-            continue;
+            const flattenedPath = this.mediaPathFlatten(mediaPath);
+            if (fs.existsSync(flattenedPath)) {
+              mediaObj.path = flattenedPath;
+              mediaPath = flattenedPath;
+              this.log(`Using flattened media path: ${flattenedPath}`);
+            } else {
+              this.log(`Media path does not exist: ${mediaPath}. Trying at flattened path: ${flattenedPath} failed.`);
+              continue;
+            }
           }
 
           const meta = await FFMpegUtils.getMediaMetadata(mediaPath);

utils/bubble/Bubble.js

@@ -273,10 +273,26 @@ class BubbleMaker {
    * Apply template defaults to a bubble config for a given video size.
    */
   _applyTemplate(bubble, vw, vh) {
-    if (!bubble || !bubble.templateName) return bubble;
-    const tpl = BaseBubbleTemplates[bubble.templateName];
+    if (!bubble) return bubble;
+
+    let templateName = bubble.templateName;
+    let tpl = templateName ? BaseBubbleTemplates[templateName] : null;
+    if (!tpl) {
+      const entries = Object.entries(BaseBubbleTemplates || {});
+      const hasMedia = !!(bubble.mediaAbsPaths || bubble.mediaAbsPath || bubble.mediaAbs);
+      const hasText = !!bubble.bubbleText;
+      const fallback = hasMedia
+        ? entries.find(([name]) => name.toLowerCase().includes('media'))
+        : (hasText ? entries.find(([name]) => !name.toLowerCase().includes('media')) : null);
+      if (fallback) {
+        templateName = fallback[0];
+        tpl = fallback[1];
+      }
+    }
     if (!tpl) return bubble;
+
     let b = _.merge({}, tpl, bubble);
+    if (!b.templateName && templateName) b.templateName = templateName;
     if (!b.animExtra) {
       if (tpl.mediaAbsPath && tpl.mediaAbsPath.animExtra) b.animExtra = tpl.mediaAbsPath.animExtra;
       else if (tpl.mediaAbsPaths && Array.isArray(tpl.mediaAbsPaths) && tpl.mediaAbsPaths[0] && tpl.mediaAbsPaths[0].animExtra) {
@@ -326,22 +342,21 @@ class BubbleMaker {
 
       let overlayMeta;
       try { overlayMeta = await FFMpegUtils.getMediaMetadata(overlayPath); } catch (e) { overlayMeta = null; }
-      if (overlayMeta && overlayMeta.video && overlayMeta.video.width) {
-        const ar = overlayMeta.video.width / overlayMeta.video.height;
-        if (extra.size === 'full') {
-          const maxW = Math.round(vw * (1 - 2 * padX / 100));
-          const maxH = Math.round(vh * (1 - 2 * padY / 100));
-          if (ar > maxW / maxH) { oh = maxH; ow = Math.round(maxH * ar); }
-          else { ow = maxW; oh = Math.round(maxW / ar); }
-          if (ow < maxW) ow = maxW;
-          if (oh < maxH) oh = maxH;
+      if (extra.size === 'full') {
+        const maxW = Math.max(1, Math.round(vw * (1 - 2 * padX / 100)));
+        ow = maxW;
+        if (overlayMeta && overlayMeta.video && overlayMeta.video.width && overlayMeta.video.height) {
+          const ar = overlayMeta.video.width / overlayMeta.video.height;
+          oh = Math.max(1, Math.round(ow / ar));
         } else {
-          if (!ow) ow = Math.round(vw * 0.30);
-          if (!oh) oh = Math.round(ow / ar);
+          oh = Math.max(1, Math.round(vh * (1 - 2 * padY / 100)));
         }
+      } else if (overlayMeta && overlayMeta.video && overlayMeta.video.width && overlayMeta.video.height) {
+        const ar = overlayMeta.video.width / overlayMeta.video.height;
+        if (!ow) ow = Math.round(vw * 0.30);
+        if (!oh) oh = Math.round(ow / ar);
       } else if (!oh) {
-        if (extra.size === 'full') { oh = Math.round(vh * (1 - 2 * padY / 100)); ow = Math.round(vw * (1 - 2 * padX / 100)); }
-        else oh = Math.round((ow || Math.round(vw * 0.30)) * 0.75);
+        oh = Math.round((ow || Math.round(vw * 0.30)) * 0.75);
       }
       if (!ow) ow = Math.round(vw * 0.30);
       if (!oh) oh = Math.round(ow * 0.75);
@@ -416,22 +431,21 @@ class BubbleMaker {
 
       let overlayMeta;
       try { overlayMeta = await FFMpegUtils.getMediaMetadata(overlayPath); } catch (e) { overlayMeta = null; }
-      if (overlayMeta && overlayMeta.video && overlayMeta.video.width) {
-        const ar = overlayMeta.video.width / overlayMeta.video.height;
-        if (extra.size === 'full') {
-          const maxW = Math.round(vw * (1 - 2 * padX / 100));
-          const maxH = Math.round(vh * (1 - 2 * padY / 100));
-          if (ar > maxW / maxH) { oh = maxH; ow = Math.round(maxH * ar); }
-          else { ow = maxW; oh = Math.round(maxW / ar); }
-          if (ow < maxW) ow = maxW;
-          if (oh < maxH) oh = maxH;
+      if (extra.size === 'full') {
+        const maxW = Math.max(1, Math.round(vw * (1 - 2 * padX / 100)));
+        ow = maxW;
+        if (overlayMeta && overlayMeta.video && overlayMeta.video.width && overlayMeta.video.height) {
+          const ar = overlayMeta.video.width / overlayMeta.video.height;
+          oh = Math.max(1, Math.round(ow / ar));
         } else {
-          if (!ow) ow = Math.round(vw * 0.30);
-          if (!oh) oh = Math.round(ow / ar);
+          oh = Math.max(1, Math.round(vh * (1 - 2 * padY / 100)));
         }
+      } else if (overlayMeta && overlayMeta.video && overlayMeta.video.width && overlayMeta.video.height) {
+        const ar = overlayMeta.video.width / overlayMeta.video.height;
+        if (!ow) ow = Math.round(vw * 0.30);
+        if (!oh) oh = Math.round(ow / ar);
       } else if (!oh) {
-        if (extra.size === 'full') { oh = Math.round(vh * (1 - 2 * padY / 100)); ow = Math.round(vw * (1 - 2 * padX / 100)); }
-        else oh = Math.round((ow || Math.round(vw * 0.30)) * 0.75);
+        oh = Math.round((ow || Math.round(vw * 0.30)) * 0.75);
       }
       if (!ow) ow = Math.round(vw * 0.30);
       if (!oh) oh = Math.round(ow * 0.75);