fluncle 0.77.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.77.0".trim() ? "0.77.0".trim() : "0.1.0";
+  currentVersion = "0.78.0".trim() ? "0.78.0".trim() : "0.1.0";
 });
 
 // src/update-notifier.ts
@@ -1196,9 +1210,6 @@ var exports_mixtape_mixcloud = {};
 __export(exports_mixtape_mixcloud, {
   resyncMixcloud: () => resyncMixcloud,
   mixtapeDescription: () => mixtapeDescription,
-  mixcloudSections: () => mixcloudSections,
-  mixcloudSectionFields: () => mixcloudSectionFields,
-  mixcloudEditUrl: () => mixcloudEditUrl,
   distributeMixcloud: () => distributeMixcloud,
   authMixcloudCommand: () => authMixcloudCommand
 });
@@ -1259,34 +1270,9 @@ async function distributeMixcloud(mixtapeId, audioPath, onProgress, unlisted = f
   });
   return { url };
 }
-async function resyncMixcloud(mixtapeId, onProgress) {
-  const token = await fetchMixcloudToken();
-  const mixtape = await mixtapeGetCommand(mixtapeId);
-  const sections = mixcloudSections(mixtape.members);
-  if (sections.length === 0) {
-    throw new CliError2("mixcloud_no_cues", "No cued members to sync — mark cues on the mixtape first.");
-  }
-  const social = await adminApiGet(`/api/admin/mixtapes/${encodeURIComponent(mixtapeId)}/social`);
-  const mixcloud = social.posts.find((post) => post.platform === "mixcloud");
-  const key = mixcloud?.externalId;
-  if (!key) {
-    throw new CliError2("mixcloud_not_distributed", "No Mixcloud cloudcast to re-sync — distribute the mixtape first.");
-  }
-  const form = new FormData;
-  for (const [name, value] of mixcloudSectionFields(sections)) {
-    form.append(name, value);
-  }
-  onProgress?.(`Mixcloud: re-syncing ${sections.length} sections (no re-upload)…`);
-  const response = await fetch(`${mixcloudEditUrl(key)}?access_token=${encodeURIComponent(token)}`, { body: form, method: "POST" });
-  const text = await response.text();
-  if (!response.ok) {
-    throwMixcloudError(response.status, text);
-  }
-  const result = parseUploadResult(text);
-  if (!result.success) {
-    throw new CliError2("mixcloud_edit_rejected", `Mixcloud rejected the section edit: ${result.message ?? text.slice(0, 300)}`);
-  }
-  return { url: mixcloud?.url ?? `https://www.mixcloud.com${key}` };
+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");
@@ -1311,25 +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 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 mixcloudEditUrl(key) {
-  const withLeading = key.startsWith("/") ? key : `/${key}`;
-  const path2 = withLeading.endsWith("/") ? withLeading : `${withLeading}/`;
-  return `${MIXCLOUD_API}/upload${path2}edit/`;
-}
 function mixtapeTags(_mixtape) {
   return ["Drum & Bass", "Fluncle"];
 }
@@ -1374,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();
@@ -1695,7 +1663,7 @@ async function mixtapeResyncCommand(idOrLogId, options, onProgress = () => {}) {
   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, onProgress);
+    const result = await resyncMixcloud2(mixtapeId);
     results.push({ platform: "mixcloud", url: result.url });
     onProgress(`Mixcloud: ${result.url}`);
   }
@@ -2487,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.77.0".trim() ? "0.77.0".trim() : "0.1.0";
+  currentVersion2 = "0.78.0".trim() ? "0.78.0".trim() : "0.1.0";
 });
 
 // ../../packages/registry/src/index.ts
@@ -4018,7 +3986,7 @@ async function mixtapeResyncCommand2(idOrLogId, options, onProgress = () => {})
   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, onProgress);
+    const result = await resyncMixcloud2(mixtapeId);
     results.push({ platform: "mixcloud", url: result.url });
     onProgress(`Mixcloud: ${result.url}`);
   }
@@ -4612,9 +4580,6 @@ var exports_mixtape_mixcloud2 = {};
 __export(exports_mixtape_mixcloud2, {
   resyncMixcloud: () => resyncMixcloud2,
   mixtapeDescription: () => mixtapeDescription2,
-  mixcloudSections: () => mixcloudSections2,
-  mixcloudSectionFields: () => mixcloudSectionFields2,
-  mixcloudEditUrl: () => mixcloudEditUrl2,
   distributeMixcloud: () => distributeMixcloud2,
   authMixcloudCommand: () => authMixcloudCommand2
 });
@@ -4641,8 +4606,8 @@ 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 [name, value] of mixcloudSectionFields2(sections)) {
+  const sections = mixcloudSections(mixtape.members);
+  for (const [name, value] of mixcloudSectionFields(sections)) {
     form.append(name, value);
   }
   if (unlisted) {
@@ -4675,34 +4640,9 @@ async function distributeMixcloud2(mixtapeId, audioPath, onProgress, unlisted =
   });
   return { url };
 }
-async function resyncMixcloud2(mixtapeId, onProgress) {
-  const token = await fetchMixcloudToken2();
-  const mixtape = await mixtapeGetCommand(mixtapeId);
-  const sections = mixcloudSections2(mixtape.members);
-  if (sections.length === 0) {
-    throw new CliError2("mixcloud_no_cues", "No cued members to sync — mark cues on the mixtape first.");
-  }
-  const social = await adminApiGet(`/api/admin/mixtapes/${encodeURIComponent(mixtapeId)}/social`);
-  const mixcloud = social.posts.find((post) => post.platform === "mixcloud");
-  const key = mixcloud?.externalId;
-  if (!key) {
-    throw new CliError2("mixcloud_not_distributed", "No Mixcloud cloudcast to re-sync — distribute the mixtape first.");
-  }
-  const form = new FormData;
-  for (const [name, value] of mixcloudSectionFields2(sections)) {
-    form.append(name, value);
-  }
-  onProgress?.(`Mixcloud: re-syncing ${sections.length} sections (no re-upload)…`);
-  const response = await fetch(`${mixcloudEditUrl2(key)}?access_token=${encodeURIComponent(token)}`, { body: form, method: "POST" });
-  const text = await response.text();
-  if (!response.ok) {
-    throwMixcloudError2(response.status, text);
-  }
-  const result = parseUploadResult2(text);
-  if (!result.success) {
-    throw new CliError2("mixcloud_edit_rejected", `Mixcloud rejected the section edit: ${result.message ?? text.slice(0, 300)}`);
-  }
-  return { url: mixcloud?.url ?? `https://www.mixcloud.com${key}` };
+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");
@@ -4727,25 +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 mixcloudSectionFields2(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 mixcloudEditUrl2(key) {
-  const withLeading = key.startsWith("/") ? key : `/${key}`;
-  const path2 = withLeading.endsWith("/") ? withLeading : `${withLeading}/`;
-  return `${MIXCLOUD_API2}/upload${path2}edit/`;
-}
 function mixtapeTags2(_mixtape) {
   return ["Drum & Bass", "Fluncle"];
 }
@@ -4790,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();

package/package.json

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