fluncle 0.82.0 → 0.84.0

package/bin/fluncle.mjs

@@ -462,26 +462,6 @@ 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 mixcloudSections(members) {
   return members.filter((member) => member.startMs != null).sort((a, b) => a.startMs - b.startMs).map((member) => ({
     artist: member.artists.join(", "),
@@ -558,7 +538,7 @@ function parseVersion(version) {
 var currentVersion;
 var init_version = __esm(() => {
   init_output();
-  currentVersion = "0.82.0".trim() ? "0.82.0".trim() : "0.1.0";
+  currentVersion = "0.84.0".trim() ? "0.84.0".trim() : "0.1.0";
 });
 
 // src/update-notifier.ts
@@ -2466,7 +2446,7 @@ function parseVersion2(version) {
 var currentVersion2, latestReleaseUrl = "https://api.github.com/repos/mauricekleine/fluncle/releases/latest";
 var init_version2 = __esm(() => {
   init_output();
-  currentVersion2 = "0.82.0".trim() ? "0.82.0".trim() : "0.1.0";
+  currentVersion2 = "0.84.0".trim() ? "0.84.0".trim() : "0.1.0";
 });
 
 // ../../packages/registry/src/index.ts
@@ -3925,7 +3905,7 @@ async function recordingGetCommand(id, options = {}) {
     return;
   }
   console.log(formatRecordingSummary(recording));
-  console.log(`  r2Key: ${recording.r2Key}`);
+  console.log(`  r2Key: ${recording.r2Key ?? "— (no set video)"}`);
   for (const cue of recording.tracklist) {
     const at = cue.startMs === undefined ? "—" : `${(cue.startMs / 1000).toFixed(1)}s`;
     console.log(`  ${at}  ${cue.artists.join(", ")} — ${cue.title}`);
@@ -4271,135 +4251,32 @@ var init_mixtapes2 = __esm(() => {
 var exports_clips = {};
 __export(exports_clips, {
   setVideoUrl: () => setVideoUrl,
-  resolveClipSansFontFile: () => resolveClipSansFontFile,
-  resolveClipFontFile: () => resolveClipFontFile,
-  escapeDrawtextValue: () => escapeDrawtextValue,
   clipsListCommand: () => clipsListCommand,
   clipFootageKey: () => clipFootageKey,
   clipCutFilterComplex: () => clipCutFilterComplex,
   clipCutFfmpegArgs: () => clipCutFfmpegArgs,
   clipCutCommand: () => clipCutCommand,
-  brandDrawtext: () => brandDrawtext,
   MAX_CLIP_BYTES: () => MAX_CLIP_BYTES,
   CLIP_WIDTH: () => CLIP_WIDTH,
-  CLIP_TITLE_SIZE: () => CLIP_TITLE_SIZE,
-  CLIP_TITLE_COLOR: () => CLIP_TITLE_COLOR,
-  CLIP_SHARP_BORDERW: () => CLIP_SHARP_BORDERW,
-  CLIP_SAFE_BOTTOM: () => CLIP_SAFE_BOTTOM,
   CLIP_MAXRATE: () => CLIP_MAXRATE,
-  CLIP_MARGIN_X: () => CLIP_MARGIN_X,
-  CLIP_LINE_GAP: () => CLIP_LINE_GAP,
   CLIP_HEIGHT: () => CLIP_HEIGHT,
-  CLIP_HALO_FEATHER_SIGMA: () => CLIP_HALO_FEATHER_SIGMA,
-  CLIP_HALO_CORE_SIGMA: () => CLIP_HALO_CORE_SIGMA,
-  CLIP_HALO_COLOR: () => CLIP_HALO_COLOR,
   CLIP_CRF: () => CLIP_CRF,
-  CLIP_COORDINATE_SIZE: () => CLIP_COORDINATE_SIZE,
-  CLIP_COORDINATE_COLOR: () => CLIP_COORDINATE_COLOR,
   CLIP_BUFSIZE: () => CLIP_BUFSIZE,
-  CLIP_AUDIO_BITRATE: () => CLIP_AUDIO_BITRATE,
-  BOX_CLIP_SANS_FONT_FILE: () => BOX_CLIP_SANS_FONT_FILE,
-  BOX_CLIP_FONT_FILE: () => BOX_CLIP_FONT_FILE
+  CLIP_AUDIO_BITRATE: () => CLIP_AUDIO_BITRATE
 });
 import { randomUUID as randomUUID2 } from "node:crypto";
-import { existsSync as existsSync5, rmSync as rmSync3, statSync as statSync4 } from "node:fs";
+import { rmSync as rmSync3, statSync as statSync4 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
 import { join as join5 } from "node:path";
 function clipFootageKey(clipId) {
   return `${clipId}/footage.mp4`;
 }
-function resolveFontFile(envVar, bakedPath) {
-  const explicit = process.env[envVar];
-  if (explicit) {
-    return explicit;
-  }
-  return existsSync5(bakedPath) ? bakedPath : undefined;
-}
-function resolveClipFontFile() {
-  return resolveFontFile("CLIP_FONT_FILE", BOX_CLIP_FONT_FILE);
-}
-function resolveClipSansFontFile() {
-  return resolveFontFile("CLIP_SANS_FONT_FILE", BOX_CLIP_SANS_FONT_FILE);
-}
 function setVideoUrl(logId) {
   return `${FOUND_BASE3}/${encodeURIComponent(logId)}/set.mp4`;
 }
-function escapeDrawtextValue(text) {
-  return text.replace(/\\/g, "\\\\").replace(/:/g, "\\:").replace(/,/g, "\\,").replace(/%/g, "\\%").replace(/'/g, "'\\''");
-}
-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}` : "";
-  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 logId = options.logId?.trim();
-  const hasCoordinate = Boolean(logId);
-  const coordinateBox = Math.round(CLIP_COORDINATE_SIZE * 1.18);
-  const titleBottomOffset = hasCoordinate ? CLIP_SAFE_BOTTOM + coordinateBox + CLIP_LINE_GAP : CLIP_SAFE_BOTTOM;
-  const titleY = `h-${titleBottomOffset}-th`;
-  const titleLines = resolveTitleLines(options, titleY);
-  const coordinate2 = hasCoordinate ? {
-    fontFile: options.oxaniumFontFile,
-    size: CLIP_COORDINATE_SIZE,
-    text: `fluncle://${logId}`,
-    x: CLIP_MARGIN_X,
-    y: `h-${CLIP_SAFE_BOTTOM}-th`
-  } : undefined;
-  const haloGlyphs = [
-    ...titleLines.map((line) => brandDrawtext({ ...line, color: CLIP_HALO_COLOR })),
-    ...coordinate2 ? [brandDrawtext({ ...coordinate2, color: CLIP_HALO_COLOR })] : []
-  ].join(",");
-  const sharpGlyphs = [
-    ...titleLines.map((line) => brandDrawtext({ ...line, borderw: CLIP_SHARP_BORDERW, color: CLIP_TITLE_COLOR })),
-    ...coordinate2 ? [
-      brandDrawtext({
-        ...coordinate2,
-        borderw: CLIP_SHARP_BORDERW,
-        color: CLIP_COORDINATE_COLOR
-      })
-    ] : []
-  ].join(",");
-  return [
-    `[0:v]${crop},setsar=1[base]`,
-    `color=c=black@0:s=${CLIP_WIDTH}x${CLIP_HEIGHT},format=rgba,${haloGlyphs}[ink]`,
-    `[ink]split[ink1][ink2]`,
-    `[ink1]gblur=sigma=${CLIP_HALO_CORE_SIGMA}[core]`,
-    `[ink2]gblur=sigma=${CLIP_HALO_FEATHER_SIGMA}[feather]`,
-    `[base][feather]overlay=0:0[b1]`,
-    `[b1][core]overlay=0:0[b2]`,
-    `[b2]${sharpGlyphs}[out]`
-  ].join(";");
+  return `[0:v]crop=ih*9/16:ih:${xOffset}:0,scale=${CLIP_WIDTH}:${CLIP_HEIGHT},setsar=1[out]`;
 }
 function clipCutFfmpegArgs(options) {
   const inSeconds = (options.inMs / 1000).toFixed(3);
@@ -4463,15 +4340,7 @@ async function resolveClipSource(clip) {
       throw new CliError2("recording_not_staged", `Recording ${clip.recordingId} has no staged set video`);
     }
     return {
-      logId: recording.logId,
-      members: recording.tracklist.map((cue) => ({
-        artists: cue.artists,
-        startMs: cue.startMs,
-        title: cue.title
-      })),
-      setDurationMs: recording.durationMs ?? 0,
-      setUrl: `${FOUND_BASE3}/${recording.r2Key.split("/").map(encodeURIComponent).join("/")}`,
-      title: recording.title
+      setUrl: `${FOUND_BASE3}/${recording.r2Key.split("/").map(encodeURIComponent).join("/")}`
     };
   }
   if (!clip.mixtapeId) {
@@ -4485,13 +4354,7 @@ async function resolveClipSource(clip) {
   if (!mixtape.setVideoAt) {
     throw new CliError2("set_not_staged", `Mixtape ${mixtape.logId} has no staged set video — run \`distribute --set-video\` first`);
   }
-  return {
-    logId: mixtape.logId,
-    members: mixtape.members,
-    setDurationMs: mixtape.durationMs ?? 0,
-    setUrl: setVideoUrl(mixtape.logId),
-    title: mixtape.title
-  };
+  return { setUrl: setVideoUrl(mixtape.logId) };
 }
 async function clipCutCommand(clipId, onProgress = () => {}) {
   const clips = await clipsListCommand();
@@ -4503,18 +4366,12 @@ async function clipCutCommand(clipId, onProgress = () => {}) {
   await assertFfmpeg2();
   const outputPath = join5(tmpdir2(), `fluncle-clip-${randomUUID2()}.mp4`);
   try {
-    onProgress(`Clip ${clipId}: cutting [${clip.inMs}–${clip.outMs}ms]${source.logId ? ` from ${source.logId}` : ""}…`);
+    onProgress(`Clip ${clipId}: cutting [${clip.inMs}–${clip.outMs}ms]…`);
     await runClipCut({
       inMs: clip.inMs,
-      logId: source.logId,
-      members: source.members,
       outMs: clip.outMs,
       outputPath,
-      oxaniumFontFile: resolveClipFontFile(),
-      sansFontFile: resolveClipSansFontFile(),
-      setDurationMs: source.setDurationMs,
       setUrl: source.setUrl,
-      title: source.title,
       xOffset: clip.xOffset
     });
     const sizeBytes = statSync4(outputPath).size;
@@ -4529,7 +4386,6 @@ async function clipCutCommand(clipId, onProgress = () => {}) {
     return {
       clipId,
       key: presign.key,
-      logId: source.logId,
       sizeBytes,
       url: `${FOUND_BASE3}/${presign.key}`
     };
@@ -4573,9 +4429,8 @@ async function runClipCut(options) {
     throw new CliError2("ffmpeg_failed", `ffmpeg failed to cut the clip${detail ? `: ${detail}` : ""}`);
   }
 }
-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 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;
 var init_clips = __esm(() => {
-  init_util();
   init_api();
   init_output();
   MAX_CLIP_BYTES = 100 * 1024 * 1024;
@@ -4592,7 +4447,7 @@ __export(exports_recordings2, {
   recordingDeleteCommand: () => recordingDeleteCommand2,
   recordingCreateCommand: () => recordingCreateCommand2
 });
-import { existsSync as existsSync6, readFileSync as readFileSync5 } from "node:fs";
+import { existsSync as existsSync5, readFileSync as readFileSync5 } from "node:fs";
 async function recordingGet2(id) {
   const response = await adminApiGet(`/api/admin/recordings/${encodeURIComponent(id)}`);
   return response.recording;
@@ -4625,7 +4480,7 @@ async function recordingGetCommand2(id, options = {}) {
     return;
   }
   console.log(formatRecordingSummary2(recording));
-  console.log(`  r2Key: ${recording.r2Key}`);
+  console.log(`  r2Key: ${recording.r2Key ?? "— (no set video)"}`);
   for (const cue of recording.tracklist) {
     const at = cue.startMs === undefined ? "—" : `${(cue.startMs / 1000).toFixed(1)}s`;
     console.log(`  ${at}  ${cue.artists.join(", ")} — ${cue.title}`);
@@ -4639,7 +4494,7 @@ async function recordingCreateCommand2(options = {}) {
   if (!options.video) {
     throw new CliError2("missing_video", "A recording needs a --video <file> to stage");
   }
-  if (!existsSync6(options.video)) {
+  if (!existsSync5(options.video)) {
     throw new CliError2("file_not_found", `Set-video master not found: ${options.video}`);
   }
   const created = await adminApiPost("/api/admin/recordings", {
@@ -4672,7 +4527,7 @@ async function recordingUpdateCommand2(id, options = {}) {
     body.recordedAt = options.recordedAt;
   }
   if (options.tracklistFile !== undefined) {
-    if (!existsSync6(options.tracklistFile)) {
+    if (!existsSync5(options.tracklistFile)) {
       throw new CliError2("file_not_found", `Tracklist file not found: ${options.tracklistFile}`);
     }
     try {
@@ -4729,7 +4584,7 @@ __export(exports_newsletter, {
   newsletterDraftCommand: () => newsletterDraftCommand,
   newsletterDeleteCommand: () => newsletterDeleteCommand
 });
-import { existsSync as existsSync7, readFileSync as readFileSync6 } from "node:fs";
+import { existsSync as existsSync6, readFileSync as readFileSync6 } from "node:fs";
 function buildBody3(options, { requireContent }) {
   const body = {};
   if (options.contentFile !== undefined) {
@@ -4749,7 +4604,7 @@ function buildBody3(options, { requireContent }) {
   return body;
 }
 function readContentFile(filePath) {
-  if (!existsSync7(filePath)) {
+  if (!existsSync6(filePath)) {
     throw new CliError2("file_not_found", `Content file not found: ${filePath}`);
   }
   const text = readFileSync6(filePath, "utf-8");
@@ -5387,7 +5242,7 @@ var init_format2 = __esm(() => {
 });
 
 // src/cli.ts
-import { existsSync as existsSync8, readFileSync as readFileSync7 } from "fs";
+import { existsSync as existsSync7, readFileSync as readFileSync7 } from "fs";
 import path2 from "path";
 
 // ../../node_modules/commander/lib/error.js
@@ -8100,7 +7955,7 @@ async function runTrackVideo(idOrLogId, options, trackVideoCommand2) {
       return;
     }
     const candidate = path2.join(dir, name);
-    return existsSync8(candidate) ? candidate : undefined;
+    return existsSync7(candidate) ? candidate : undefined;
   };
   const resolveFile = (explicit, name) => {
     if (explicit) {

package/package.json

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