fluncle 0.75.0 → 0.76.0

package/bin/fluncle.mjs

@@ -462,6 +462,26 @@ function versionMatches(findingTitle, candidateTitle) {
   }
   return !candidateIsRemix;
 }
+function trackLabel(artists, title) {
+  const joined = artists.join(", ");
+  return joined && title ? `${joined} — ${title}` : joined || title;
+}
+function resolveClipTracks(options) {
+  const { inMs, members, outMs, setDurationMs } = options;
+  const cued = members.filter((member) => member.startMs != null).sort((a, b) => a.startMs - b.startMs);
+  if (cued.length === 0) {
+    return [];
+  }
+  const lastIndex = cued.length - 1;
+  return cued.filter((member, index) => {
+    const lo = index === 0 ? Math.min(member.startMs, inMs) : member.startMs;
+    const hi = index === lastIndex ? Math.max(setDurationMs, outMs) : cued[index + 1]?.startMs ?? Number.POSITIVE_INFINITY;
+    return lo < outMs && inMs < hi;
+  }).map((member) => ({
+    label: trackLabel(member.artists, member.title),
+    startMs: member.startMs
+  }));
+}
 function baseTitleMatches(findingTitle, candidateTitle) {
   const want = new Set(tokenize(stripVersionSuffix(findingTitle)));
   const have = new Set(tokenize(stripVersionSuffix(candidateTitle)));
@@ -524,7 +544,7 @@ function parseVersion(version) {
 var currentVersion;
 var init_version = __esm(() => {
   init_output();
-  currentVersion = "0.75.0".trim() ? "0.75.0".trim() : "0.1.0";
+  currentVersion = "0.76.0".trim() ? "0.76.0".trim() : "0.1.0";
 });
 
 // src/update-notifier.ts
@@ -2381,7 +2401,7 @@ function parseVersion2(version) {
 var currentVersion2, latestReleaseUrl = "https://api.github.com/repos/mauricekleine/fluncle/releases/latest";
 var init_version2 = __esm(() => {
   init_output();
-  currentVersion2 = "0.75.0".trim() ? "0.75.0".trim() : "0.1.0";
+  currentVersion2 = "0.76.0".trim() ? "0.76.0".trim() : "0.1.0";
 });
 
 // ../../packages/registry/src/index.ts
@@ -4035,20 +4055,42 @@ function brandDrawtext(options) {
   const value = escapeDrawtextValue(options.text);
   const font = options.fontFile ? `:fontfile='${options.fontFile}'` : "";
   const border = options.borderw && options.borderw > 0 ? `:borderw=${options.borderw}:bordercolor=${CLIP_HALO_COLOR}` : "";
-  return `drawtext=text='${value}'${font}:` + `fontcolor=${options.color}:fontsize=${options.size}:` + `x=${options.x}:y=${options.y}${border}`;
+  const enable = options.enable ? `:enable='${options.enable}'` : "";
+  return `drawtext=text='${value}'${font}:` + `fontcolor=${options.color}:fontsize=${options.size}:` + `x=${options.x}:y=${options.y}${border}${enable}`;
+}
+function resolveTitleLines(options, y) {
+  const inMs = options.inMs ?? 0;
+  const outMs = options.outMs ?? 0;
+  const clipDur = Math.max(0, (outMs - inMs) / 1000);
+  const base = { fontFile: options.sansFontFile, size: CLIP_TITLE_SIZE, x: CLIP_MARGIN_X, y };
+  const resolved = options.members && options.members.length > 0 ? resolveClipTracks({
+    inMs,
+    members: options.members,
+    outMs,
+    setDurationMs: options.setDurationMs ?? 0
+  }) : [];
+  if (resolved.length === 0) {
+    return [{ ...base, text: options.title }];
+  }
+  const clamp = (seconds) => Math.min(Math.max(seconds, 0), clipDur);
+  return resolved.map((track, index) => {
+    const relStart = clamp((track.startMs - inMs) / 1000);
+    const next = resolved[index + 1];
+    const relEnd = next ? clamp((next.startMs - inMs) / 1000) : clipDur;
+    return {
+      ...base,
+      enable: `between(t,${relStart.toFixed(3)},${relEnd.toFixed(3)})`,
+      text: track.label
+    };
+  });
 }
 function clipCutFilterComplex(options) {
   const xOffset = Math.max(0, Math.round(options.xOffset));
   const crop = `crop=ih*9/16:ih:${xOffset}:0,scale=${CLIP_WIDTH}:${CLIP_HEIGHT}`;
   const coordinateBox = Math.round(CLIP_COORDINATE_SIZE * 1.18);
   const titleBottomOffset = CLIP_SAFE_BOTTOM + coordinateBox + CLIP_LINE_GAP;
-  const title = {
-    fontFile: options.sansFontFile,
-    size: CLIP_TITLE_SIZE,
-    text: options.title,
-    x: CLIP_MARGIN_X,
-    y: `h-${titleBottomOffset}-th`
-  };
+  const titleY = `h-${titleBottomOffset}-th`;
+  const titleLines = resolveTitleLines(options, titleY);
   const coordinate2 = {
     fontFile: options.oxaniumFontFile,
     size: CLIP_COORDINATE_SIZE,
@@ -4057,11 +4099,11 @@ function clipCutFilterComplex(options) {
     y: `h-${CLIP_SAFE_BOTTOM}-th`
   };
   const haloGlyphs = [
-    brandDrawtext({ ...title, color: CLIP_HALO_COLOR }),
+    ...titleLines.map((line) => brandDrawtext({ ...line, color: CLIP_HALO_COLOR })),
     brandDrawtext({ ...coordinate2, color: CLIP_HALO_COLOR })
   ].join(",");
   const sharpGlyphs = [
-    brandDrawtext({ ...title, borderw: CLIP_SHARP_BORDERW, color: CLIP_TITLE_COLOR }),
+    ...titleLines.map((line) => brandDrawtext({ ...line, borderw: CLIP_SHARP_BORDERW, color: CLIP_TITLE_COLOR })),
     brandDrawtext({ ...coordinate2, borderw: CLIP_SHARP_BORDERW, color: CLIP_COORDINATE_COLOR })
   ].join(",");
   return [
@@ -4148,10 +4190,12 @@ async function clipCutCommand(clipId, onProgress = () => {}) {
     await runClipCut({
       inMs: clip.inMs,
       logId: mixtape.logId,
+      members: mixtape.members,
       outMs: clip.outMs,
       outputPath,
       oxaniumFontFile: resolveClipFontFile(),
       sansFontFile: resolveClipSansFontFile(),
+      setDurationMs: mixtape.durationMs ?? 0,
       setUrl,
       title: mixtape.title,
       xOffset: clip.xOffset
@@ -4214,6 +4258,7 @@ async function runClipCut(options) {
 }
 var FOUND_BASE3 = "https://found.fluncle.com", CLIP_WIDTH = 1080, CLIP_HEIGHT = 1920, CLIP_CRF = 21, CLIP_MAXRATE = "10M", CLIP_BUFSIZE = "20M", CLIP_AUDIO_BITRATE = "192k", MAX_CLIP_BYTES, CLIP_TITLE_COLOR = "0xf4ead7", CLIP_COORDINATE_COLOR = "0xb7ab95", CLIP_HALO_COLOR = "0x090a0b", CLIP_HALO_CORE_SIGMA = 3, CLIP_HALO_FEATHER_SIGMA = 9, CLIP_SHARP_BORDERW = 1, CLIP_MARGIN_X = 96, CLIP_SAFE_BOTTOM = 230, CLIP_LINE_GAP = 10, CLIP_TITLE_SIZE = 40, CLIP_COORDINATE_SIZE = 22, BOX_CLIP_FONT_FILE = "/opt/fonts/Oxanium-SemiBold.ttf", BOX_CLIP_SANS_FONT_FILE = "/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf";
 var init_clips = __esm(() => {
+  init_util();
   init_api();
   init_output();
   MAX_CLIP_BYTES = 100 * 1024 * 1024;

package/package.json

@@ -31,5 +31,5 @@
     "url": "git+https://github.com/mauricekleine/fluncle.git"
   },
   "type": "module",
-  "version": "0.75.0"
+  "version": "0.76.0"
 }