fluncle 0.76.0 → 0.78.0

package/bin/fluncle.mjs

@@ -482,6 +482,20 @@ function resolveClipTracks(options) {
     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(", "),
+    song: member.title,
+    start_time: Math.floor(member.startMs / 1000)
+  }));
+}
+function mixcloudSectionFields(sections) {
+  return sections.flatMap((section, index) => [
+    [`sections-${index}-artist`, section.artist],
+    [`sections-${index}-song`, section.song],
+    [`sections-${index}-start_time`, String(section.start_time)]
+  ]);
+}
 function baseTitleMatches(findingTitle, candidateTitle) {
   const want = new Set(tokenize(stripVersionSuffix(findingTitle)));
   const have = new Set(tokenize(stripVersionSuffix(candidateTitle)));
@@ -544,7 +558,7 @@ function parseVersion(version) {
 var currentVersion;
 var init_version = __esm(() => {
   init_output();
-  currentVersion = "0.76.0".trim() ? "0.76.0".trim() : "0.1.0";
+  currentVersion = "0.78.0".trim() ? "0.78.0".trim() : "0.1.0";
 });
 
 // src/update-notifier.ts
@@ -1029,6 +1043,7 @@ var init_mixtape_api = __esm(() => {
 // src/commands/mixtape-youtube.ts
 var exports_mixtape_youtube = {};
 __export(exports_mixtape_youtube, {
+  resyncYoutube: () => resyncYoutube,
   publishYoutubeCommand: () => publishYoutubeCommand,
   nextOffset: () => nextOffset,
   distributeYoutube: () => distributeYoutube,
@@ -1084,6 +1099,10 @@ async function publishYoutubeCommand(idOrLogId) {
   const response = await adminApiPost(`/api/admin/mixtapes/${encodeURIComponent(mixtapeId)}/youtube/publish`);
   return { url: response.url };
 }
+async function resyncYoutube(mixtapeId) {
+  const response = await adminApiPost(`/api/admin/mixtapes/${encodeURIComponent(mixtapeId)}/youtube/resync`);
+  return { url: response.url, videoId: response.videoId };
+}
 async function authYoutubeCommand() {
   const response = await adminApiGet("/api/admin/youtube/auth/start");
   console.log(`Open this YouTube authorization URL:
@@ -1189,8 +1208,8 @@ var init_mixtape_youtube = __esm(() => {
 // src/commands/mixtape-mixcloud.ts
 var exports_mixtape_mixcloud = {};
 __export(exports_mixtape_mixcloud, {
+  resyncMixcloud: () => resyncMixcloud,
   mixtapeDescription: () => mixtapeDescription,
-  mixcloudSections: () => mixcloudSections,
   distributeMixcloud: () => distributeMixcloud,
   authMixcloudCommand: () => authMixcloudCommand
 });
@@ -1218,10 +1237,8 @@ async function distributeMixcloud(mixtapeId, audioPath, onProgress, unlisted = f
     form.append(`tags-${index}-tag`, tag);
   }
   const sections = mixcloudSections(mixtape.members);
-  for (const [index, section] of sections.entries()) {
-    form.append(`sections-${index}-artist`, section.artist);
-    form.append(`sections-${index}-song`, section.song);
-    form.append(`sections-${index}-start_time`, String(section.start_time));
+  for (const [name, value] of mixcloudSectionFields(sections)) {
+    form.append(name, value);
   }
   if (unlisted) {
     form.append("unlisted", "1");
@@ -1253,6 +1270,10 @@ async function distributeMixcloud(mixtapeId, audioPath, onProgress, unlisted = f
   });
   return { url };
 }
+async function resyncMixcloud(mixtapeId) {
+  const response = await adminApiPost(`/api/admin/mixtapes/${encodeURIComponent(mixtapeId)}/mixcloud/resync`);
+  return { url: response.url };
+}
 async function authMixcloudCommand() {
   const response = await adminApiGet("/api/admin/mixcloud/auth/start");
   console.log(`Open this Mixcloud authorization URL:
@@ -1276,13 +1297,6 @@ ${breadcrumb}` : breadcrumb;
 
 ${breadcrumb}` : breadcrumb;
 }
-function mixcloudSections(members) {
-  return members.filter((member) => typeof member.startMs === "number").sort((a, b) => a.startMs - b.startMs).map((member) => ({
-    artist: member.artists.join(", "),
-    song: member.title,
-    start_time: Math.floor(member.startMs / 1000)
-  }));
-}
 function mixtapeTags(_mixtape) {
   return ["Drum & Bass", "Fluncle"];
 }
@@ -1327,6 +1341,7 @@ function throwMixcloudError(status, body) {
 }
 var MIXCLOUD_API = "https://api.mixcloud.com", DESCRIPTION_MAX = 1000, PICTURE_MAX_BYTES, COVER_BASE = "https://www.fluncle.com/api/mixtape-cover";
 var init_mixtape_mixcloud = __esm(() => {
+  init_util();
   init_api();
   init_output();
   init_mixtape_api();
@@ -1509,6 +1524,7 @@ var exports_mixtapes = {};
 __export(exports_mixtapes, {
   mixtapesCommand: () => mixtapesCommand,
   mixtapeUpdateCommand: () => mixtapeUpdateCommand,
+  mixtapeResyncCommand: () => mixtapeResyncCommand,
   mixtapePublishCommand: () => mixtapePublishCommand,
   mixtapeMembersCommand: () => mixtapeMembersCommand,
   mixtapeListCommand: () => mixtapeListCommand,
@@ -1615,6 +1631,44 @@ async function mixtapeDistributeCommand(idOrLogId, options, onProgress = () => {
   }
   return { logId, mixtapeId, results };
 }
+async function mixtapeResyncCommand(idOrLogId, options, onProgress = () => {}) {
+  const mixtape = await mixtapeGetCommand(idOrLogId);
+  if (!mixtape.id) {
+    throw new CliError2("mixtape_not_found", `No mixtape with id or log id ${idOrLogId}`);
+  }
+  if (!mixtape.logId) {
+    throw new CliError2("mixtape_no_log_id", "The mixtape isn't published yet — distribute it before re-syncing.");
+  }
+  const mixtapeId = mixtape.id;
+  const explicit = Boolean(options.youtube) || Boolean(options.mixcloud);
+  let doYoutube = Boolean(options.youtube);
+  let doMixcloud = Boolean(options.mixcloud);
+  if (!explicit) {
+    const social = await adminApiGet(`/api/admin/mixtapes/${encodeURIComponent(mixtapeId)}/social`);
+    const platforms = new Set(social.posts.map((post) => post.platform));
+    doYoutube = platforms.has("youtube");
+    doMixcloud = platforms.has("mixcloud");
+    if (!doYoutube && !doMixcloud) {
+      throw new CliError2("mixtape_not_distributed", "The mixtape has no YouTube or Mixcloud link to re-sync.");
+    }
+  }
+  const results = [];
+  if (doYoutube) {
+    onProgress("YouTube: re-syncing description + chapters…");
+    const { resyncYoutube: resyncYoutube2 } = await Promise.resolve().then(() => (init_mixtape_youtube(), exports_mixtape_youtube));
+    const result = await resyncYoutube2(mixtapeId);
+    results.push({ platform: "youtube", url: result.url });
+    onProgress(`YouTube: ${result.url}`);
+  }
+  if (doMixcloud) {
+    onProgress("Mixcloud: re-syncing sections…");
+    const { resyncMixcloud: resyncMixcloud2 } = await Promise.resolve().then(() => (init_mixtape_mixcloud(), exports_mixtape_mixcloud));
+    const result = await resyncMixcloud2(mixtapeId);
+    results.push({ platform: "mixcloud", url: result.url });
+    onProgress(`Mixcloud: ${result.url}`);
+  }
+  return { logId: mixtape.logId, mixtapeId, results };
+}
 async function probeDurationMs(filePath) {
   try {
     const proc = Bun.spawn(["ffprobe", "-v", "error", "-show_entries", "format=duration", "-of", "csv=p=0", filePath], { stderr: "ignore", stdout: "pipe" });
@@ -2401,7 +2455,7 @@ function parseVersion2(version) {
 var currentVersion2, latestReleaseUrl = "https://api.github.com/repos/mauricekleine/fluncle/releases/latest";
 var init_version2 = __esm(() => {
   init_output();
-  currentVersion2 = "0.76.0".trim() ? "0.76.0".trim() : "0.1.0";
+  currentVersion2 = "0.78.0".trim() ? "0.78.0".trim() : "0.1.0";
 });
 
 // ../../packages/registry/src/index.ts
@@ -3626,6 +3680,7 @@ var init_preview_archive = __esm(() => {
 // src/commands/mixtape-youtube.ts
 var exports_mixtape_youtube2 = {};
 __export(exports_mixtape_youtube2, {
+  resyncYoutube: () => resyncYoutube2,
   publishYoutubeCommand: () => publishYoutubeCommand2,
   nextOffset: () => nextOffset2,
   distributeYoutube: () => distributeYoutube2,
@@ -3681,6 +3736,10 @@ async function publishYoutubeCommand2(idOrLogId) {
   const response = await adminApiPost(`/api/admin/mixtapes/${encodeURIComponent(mixtapeId)}/youtube/publish`);
   return { url: response.url };
 }
+async function resyncYoutube2(mixtapeId) {
+  const response = await adminApiPost(`/api/admin/mixtapes/${encodeURIComponent(mixtapeId)}/youtube/resync`);
+  return { url: response.url, videoId: response.videoId };
+}
 async function authYoutubeCommand2() {
   const response = await adminApiGet("/api/admin/youtube/auth/start");
   console.log(`Open this YouTube authorization URL:
@@ -3788,6 +3847,7 @@ var exports_mixtapes2 = {};
 __export(exports_mixtapes2, {
   mixtapesCommand: () => mixtapesCommand2,
   mixtapeUpdateCommand: () => mixtapeUpdateCommand2,
+  mixtapeResyncCommand: () => mixtapeResyncCommand2,
   mixtapePublishCommand: () => mixtapePublishCommand2,
   mixtapeMembersCommand: () => mixtapeMembersCommand2,
   mixtapeListCommand: () => mixtapeListCommand,
@@ -3894,6 +3954,44 @@ async function mixtapeDistributeCommand2(idOrLogId, options, onProgress = () =>
   }
   return { logId, mixtapeId, results };
 }
+async function mixtapeResyncCommand2(idOrLogId, options, onProgress = () => {}) {
+  const mixtape = await mixtapeGetCommand(idOrLogId);
+  if (!mixtape.id) {
+    throw new CliError2("mixtape_not_found", `No mixtape with id or log id ${idOrLogId}`);
+  }
+  if (!mixtape.logId) {
+    throw new CliError2("mixtape_no_log_id", "The mixtape isn't published yet — distribute it before re-syncing.");
+  }
+  const mixtapeId = mixtape.id;
+  const explicit = Boolean(options.youtube) || Boolean(options.mixcloud);
+  let doYoutube = Boolean(options.youtube);
+  let doMixcloud = Boolean(options.mixcloud);
+  if (!explicit) {
+    const social = await adminApiGet(`/api/admin/mixtapes/${encodeURIComponent(mixtapeId)}/social`);
+    const platforms = new Set(social.posts.map((post) => post.platform));
+    doYoutube = platforms.has("youtube");
+    doMixcloud = platforms.has("mixcloud");
+    if (!doYoutube && !doMixcloud) {
+      throw new CliError2("mixtape_not_distributed", "The mixtape has no YouTube or Mixcloud link to re-sync.");
+    }
+  }
+  const results = [];
+  if (doYoutube) {
+    onProgress("YouTube: re-syncing description + chapters…");
+    const { resyncYoutube: resyncYoutube3 } = await Promise.resolve().then(() => (init_mixtape_youtube(), exports_mixtape_youtube));
+    const result = await resyncYoutube3(mixtapeId);
+    results.push({ platform: "youtube", url: result.url });
+    onProgress(`YouTube: ${result.url}`);
+  }
+  if (doMixcloud) {
+    onProgress("Mixcloud: re-syncing sections…");
+    const { resyncMixcloud: resyncMixcloud2 } = await Promise.resolve().then(() => (init_mixtape_mixcloud(), exports_mixtape_mixcloud));
+    const result = await resyncMixcloud2(mixtapeId);
+    results.push({ platform: "mixcloud", url: result.url });
+    onProgress(`Mixcloud: ${result.url}`);
+  }
+  return { logId: mixtape.logId, mixtapeId, results };
+}
 async function probeDurationMs2(filePath) {
   try {
     const proc = Bun.spawn(["ffprobe", "-v", "error", "-show_entries", "format=duration", "-of", "csv=p=0", filePath], { stderr: "ignore", stdout: "pipe" });
@@ -4480,8 +4578,8 @@ var init_auth = __esm(() => {
 // src/commands/mixtape-mixcloud.ts
 var exports_mixtape_mixcloud2 = {};
 __export(exports_mixtape_mixcloud2, {
+  resyncMixcloud: () => resyncMixcloud2,
   mixtapeDescription: () => mixtapeDescription2,
-  mixcloudSections: () => mixcloudSections2,
   distributeMixcloud: () => distributeMixcloud2,
   authMixcloudCommand: () => authMixcloudCommand2
 });
@@ -4508,11 +4606,9 @@ async function distributeMixcloud2(mixtapeId, audioPath, onProgress, unlisted =
   for (const [index, tag] of mixtapeTags2(mixtape).entries()) {
     form.append(`tags-${index}-tag`, tag);
   }
-  const sections = mixcloudSections2(mixtape.members);
-  for (const [index, section] of sections.entries()) {
-    form.append(`sections-${index}-artist`, section.artist);
-    form.append(`sections-${index}-song`, section.song);
-    form.append(`sections-${index}-start_time`, String(section.start_time));
+  const sections = mixcloudSections(mixtape.members);
+  for (const [name, value] of mixcloudSectionFields(sections)) {
+    form.append(name, value);
   }
   if (unlisted) {
     form.append("unlisted", "1");
@@ -4544,6 +4640,10 @@ async function distributeMixcloud2(mixtapeId, audioPath, onProgress, unlisted =
   });
   return { url };
 }
+async function resyncMixcloud2(mixtapeId) {
+  const response = await adminApiPost(`/api/admin/mixtapes/${encodeURIComponent(mixtapeId)}/mixcloud/resync`);
+  return { url: response.url };
+}
 async function authMixcloudCommand2() {
   const response = await adminApiGet("/api/admin/mixcloud/auth/start");
   console.log(`Open this Mixcloud authorization URL:
@@ -4567,13 +4667,6 @@ ${breadcrumb}` : breadcrumb;
 
 ${breadcrumb}` : breadcrumb;
 }
-function mixcloudSections2(members) {
-  return members.filter((member) => typeof member.startMs === "number").sort((a, b) => a.startMs - b.startMs).map((member) => ({
-    artist: member.artists.join(", "),
-    song: member.title,
-    start_time: Math.floor(member.startMs / 1000)
-  }));
-}
 function mixtapeTags2(_mixtape) {
   return ["Drum & Bass", "Fluncle"];
 }
@@ -4618,6 +4711,7 @@ function throwMixcloudError2(status, body) {
 }
 var MIXCLOUD_API2 = "https://api.mixcloud.com", DESCRIPTION_MAX2 = 1000, PICTURE_MAX_BYTES2, COVER_BASE2 = "https://www.fluncle.com/api/mixtape-cover";
 var init_mixtape_mixcloud2 = __esm(() => {
+  init_util();
   init_api();
   init_output();
   init_mixtape_api();
@@ -7295,6 +7389,10 @@ function addAdminCommands(program2) {
     const { publishYoutubeCommand: publishYoutubeCommand3 } = await Promise.resolve().then(() => (init_mixtape_youtube2(), exports_mixtape_youtube2));
     await runMixtapePublishYoutube(idOrLogId, options, publishYoutubeCommand3);
   });
+  adminMixtapes.command("resync").description("Re-push a published mixtape's YouTube chapters + Mixcloud sections from its current cues (no re-upload)").argument("[idOrLogId]").option("--youtube", "Only re-sync YouTube").option("--mixcloud", "Only re-sync Mixcloud").option("--json", "Print JSON", false).allowExcessArguments().action(async (idOrLogId, options) => {
+    const { mixtapeResyncCommand: mixtapeResyncCommand3 } = await Promise.resolve().then(() => (init_mixtapes(), exports_mixtapes));
+    await runMixtapeResync(idOrLogId, options, mixtapeResyncCommand3);
+  });
   const adminClips = configureCommand(admin.command("clips").description("Mixtape clip (Fluncle Studio) commands"));
   adminClips.action(() => {
     adminClips.outputHelp();
@@ -7854,6 +7952,21 @@ async function runMixtapePublishYoutube(idOrLogId, options, publishYoutubeComman
   }
   console.log(`YouTube video is now public: ${result.url}`);
 }
+async function runMixtapeResync(idOrLogId, options, mixtapeResyncCommand3) {
+  if (!idOrLogId) {
+    throw new Error("Missing mixtape id. Usage: fluncle admin mixtapes resync <idOrLogId>");
+  }
+  const onProgress = options.json ? () => {} : (message) => console.log(message);
+  const result = await mixtapeResyncCommand3(idOrLogId, options, onProgress);
+  if (options.json) {
+    printJson(result);
+    return;
+  }
+  const links = result.results.map((r) => `  ${r.platform}: ${r.url}`).join(`
+`);
+  console.log(`Re-synced ${result.logId} (fluncle://${result.logId}).
+${links}`);
+}
 async function runMixtapeDelete(id, options, mixtapeDeleteCommand3) {
   if (!id) {
     throw new Error("Missing mixtape id. Usage: fluncle admin mixtapes delete <id> --yes");

package/package.json

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