fluncle 0.125.0 → 0.127.0

package/bin/fluncle.mjs

@@ -462,6 +462,10 @@ function versionMatches(findingTitle, candidateTitle) {
   }
   return !candidateIsRemix;
 }
+function r2PublicUrl(base, key) {
+  const path2 = key.split("/").map(encodeURIComponent).join("/");
+  return `${base}/${path2}`;
+}
 function mixcloudSections(members) {
   return members.filter((member) => member.startMs != null).sort((a, b) => a.startMs - b.startMs).map((member) => ({
     artist: member.artists.join(", "),
@@ -557,7 +561,7 @@ function parseVersion(version) {
 var currentVersion;
 var init_version = __esm(() => {
   init_output();
-  currentVersion = "0.125.0".trim() ? "0.125.0".trim() : "0.1.0";
+  currentVersion = "0.127.0".trim() ? "0.127.0".trim() : "0.1.0";
 });
 
 // src/update-notifier.ts
@@ -2185,7 +2189,7 @@ function parseVersion2(version) {
 var currentVersion2, latestReleaseUrl = "https://api.github.com/repos/mauricekleine/fluncle/releases/latest";
 var init_version2 = __esm(() => {
   init_output();
-  currentVersion2 = "0.125.0".trim() ? "0.125.0".trim() : "0.1.0";
+  currentVersion2 = "0.127.0".trim() ? "0.127.0".trim() : "0.1.0";
 });
 
 // ../../packages/registry/src/index.ts
@@ -3753,6 +3757,9 @@ async function previewArchiveBackfillCommand(options) {
       if (result.archived.length >= (options.limit ?? Number.POSITIVE_INFINITY)) {
         break;
       }
+      if (track.type === "mixtape") {
+        continue;
+      }
       if (!track.logId) {
         result.skipped.push({ reason: "no_log_id", trackId: track.trackId });
         continue;
@@ -4571,7 +4578,7 @@ async function resolveClipSource(clip) {
     throw new CliError2("recording_not_staged", `Recording ${clip.recordingId} has no staged set video`);
   }
   return {
-    setUrl: `${FOUND_BASE3}/${recording.r2Key.split("/").map(encodeURIComponent).join("/")}`
+    setUrl: r2PublicUrl(FOUND_BASE3, recording.r2Key)
   };
 }
 async function clipCutCommand(clipId, onProgress = () => {}) {
@@ -4649,6 +4656,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;
 var init_clips = __esm(() => {
+  init_util();
   init_api();
   init_output();
   MAX_CLIP_BYTES = 100 * 1024 * 1024;
@@ -8337,6 +8345,12 @@ async function runTrackNote(idOrLogId, options, trackNoteCommand2) {
   console.log(`Authored the note for ${result.logId}:`);
   console.log(`  ${result.note}`);
 }
+function printSweepJson(payload, failedCount) {
+  printJson({ ...payload, failedCount, ok: failedCount === 0 });
+  if (failedCount > 0) {
+    process.exitCode = 1;
+  }
+}
 async function runMigratePreviewArchive(options, migratePreviewArchiveCommand2) {
   const limit = options.limit === undefined ? 50 : Number.parseInt(options.limit, 10);
   if (!Number.isInteger(limit) || limit < 1) {
@@ -8385,7 +8399,7 @@ async function runMigratePreviewArchive(options, migratePreviewArchiveCommand2)
     cursor = result.nextCursor;
   }
   if (options.json) {
-    printJson({
+    printSweepJson({
       blocked,
       copied,
       copiedCount: copied.length,
@@ -8393,13 +8407,11 @@ async function runMigratePreviewArchive(options, migratePreviewArchiveCommand2)
       deletedCount: deleted.length,
       dryRun,
       failed,
-      failedCount: failed.length,
       mode,
-      ok: true,
       remaining,
       skipped,
       skippedCount: skipped.length
-    });
+    }, failed.length);
     return;
   }
   if (blocked) {
@@ -8418,6 +8430,9 @@ async function runMigratePreviewArchive(options, migratePreviewArchiveCommand2)
   for (const item of failed) {
     console.log(`  FAILED ${item.trackId}: ${item.error}`);
   }
+  if (failed.length > 0) {
+    process.exitCode = 1;
+  }
 }
 async function runPreviewArchiveBackfill(options, previewArchiveBackfillCommand2) {
   const limit = options.limit === undefined ? undefined : Number.parseInt(options.limit, 10);
@@ -8429,7 +8444,7 @@ async function runPreviewArchiveBackfill(options, previewArchiveBackfillCommand2
     limit
   });
   if (options.json) {
-    printJson({ ok: true, ...result });
+    printSweepJson({ ...result }, result.failed.length);
     return;
   }
   const verb = result.dryRun ? "Would archive" : "Archived";
@@ -8438,6 +8453,9 @@ async function runPreviewArchiveBackfill(options, previewArchiveBackfillCommand2
   for (const item of result.archived) {
     console.log(`  ${item.logId}: ${item.source}`);
   }
+  if (result.failed.length > 0) {
+    process.exitCode = 1;
+  }
 }
 async function runBackfillLastfm(options, backfillLastfmCommand2) {
   const limit = parseListLimit(options.limit);
@@ -8468,17 +8486,15 @@ async function runBackfillLastfm(options, backfillLastfmCommand2) {
     cursor = result.nextCursor;
   }
   if (options.json) {
-    printJson({
+    printSweepJson({
       dryRun,
       failed,
-      failedCount: failed.length,
       loved,
       lovedCount: loved.length,
-      ok: true,
       rateLimited: throttled,
       skipped,
       skippedCount: skipped.length
-    });
+    }, failed.length);
     return;
   }
   const verb = dryRun ? "Would love" : "Loved";
@@ -8489,6 +8505,9 @@ async function runBackfillLastfm(options, backfillLastfmCommand2) {
   for (const item of failed) {
     console.log(`  ${item.logId}: ${item.error}`);
   }
+  if (failed.length > 0) {
+    process.exitCode = 1;
+  }
 }
 async function runBackfillDiscogs(options, backfillDiscogsCommand2) {
   const limit = parseListLimit(options.limit);
@@ -8563,16 +8582,14 @@ async function runBackfillArtists(options, backfillArtistsCommand2) {
     cursor = result.nextCursor;
   }
   if (options.json) {
-    printJson({
+    printSweepJson({
       dryRun,
       failed,
-      failedCount: failed.length,
-      ok: true,
       skipped,
       skippedCount: skipped.length,
       upserted,
       upsertedCount: upserted.length
-    });
+    }, failed.length);
     return;
   }
   const verb = dryRun ? "Would upsert" : "Upserted";
@@ -8583,6 +8600,9 @@ async function runBackfillArtists(options, backfillArtistsCommand2) {
   for (const item of failed) {
     console.log(`  ${item.logId}: ${item.error}`);
   }
+  if (failed.length > 0) {
+    process.exitCode = 1;
+  }
 }
 async function runBackfillArtistImages(options, backfillArtistImagesCommand2) {
   const limit = parseListLimit(options.limit);
@@ -8608,16 +8628,14 @@ async function runBackfillArtistImages(options, backfillArtistImagesCommand2) {
     cursor = result.nextCursor;
   }
   if (options.json) {
-    printJson({
+    printSweepJson({
       dryRun,
       failed,
-      failedCount: failed.length,
       filled,
       filledCount: filled.length,
-      ok: true,
       skipped,
       skippedCount: skipped.length
-    });
+    }, failed.length);
     return;
   }
   const verb = dryRun ? "Would fill" : "Filled";
@@ -8628,6 +8646,9 @@ async function runBackfillArtistImages(options, backfillArtistImagesCommand2) {
   for (const item of failed) {
     console.log(`  ${item.artistId}: ${item.error}`);
   }
+  if (failed.length > 0) {
+    process.exitCode = 1;
+  }
 }
 async function runArtistResolveQueue(options, listArtistsCommand2) {
   const limit = parseListLimit(options.limit);
@@ -9553,7 +9574,7 @@ async function runAdminRequeueAnalysis(options, requeueAnalysisCommand2) {
   const max = parseRequeueAnalysisLimit(options.limit);
   const result = await requeueAnalysisCommand2({ apply: options.apply === true, max });
   if (options.json) {
-    printJson({ ok: true, ...result });
+    printSweepJson({ ...result }, result.failed.length);
     return;
   }
   const { coordinate: coordinate3 } = await Promise.resolve().then(() => (init_format2(), exports_format));

package/package.json

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