fluncle 0.49.0 → 0.51.0

package/bin/fluncle.mjs

@@ -408,7 +408,7 @@ function compareVersions(left, right) {
   const leftParts = parseVersion(left);
   const rightParts = parseVersion(right);
   for (let index = 0;index < 3; index += 1) {
-    const difference = leftParts[index] - rightParts[index];
+    const difference = (leftParts[index] ?? 0) - (rightParts[index] ?? 0);
     if (difference !== 0) {
       return difference;
     }
@@ -417,16 +417,13 @@ function compareVersions(left, right) {
 }
 function parseVersion(version) {
   const parts = version.split(".").map((part) => Number.parseInt(part, 10));
-  return [
-    Number.isInteger(parts[0]) ? parts[0] : 0,
-    Number.isInteger(parts[1]) ? parts[1] : 0,
-    Number.isInteger(parts[2]) ? parts[2] : 0
-  ];
+  const integerOrZero = (value) => value !== undefined && Number.isInteger(value) ? value : 0;
+  return [integerOrZero(parts[0]), integerOrZero(parts[1]), integerOrZero(parts[2])];
 }
 var currentVersion;
 var init_version = __esm(() => {
   init_output();
-  currentVersion = "0.49.0".trim() ? "0.49.0".trim() : "0.1.0";
+  currentVersion = "0.51.0".trim() ? "0.51.0".trim() : "0.1.0";
 });
 
 // src/update-notifier.ts
@@ -483,6 +480,9 @@ function shouldNotify(args) {
 function firstPositional(args) {
   for (let index = 0;index < args.length; index += 1) {
     const arg = args[index];
+    if (arg === undefined) {
+      continue;
+    }
     if (arg === "--env") {
       index += 1;
       continue;
@@ -1237,6 +1237,9 @@ async function mixtapeDistributeCommand(idOrLogId, options, onProgress = () => {
   }
   const results = [];
   if (doYoutube) {
+    if (!options.video) {
+      throw new CliError2("missing_video", "YouTube distribution needs --video <mp4>");
+    }
     onProgress("YouTube: uploading video…");
     const { distributeYoutube: distributeYoutube2 } = await Promise.resolve().then(() => (init_mixtape_youtube(), exports_mixtape_youtube));
     const result = await distributeYoutube2(mixtapeId, options.video, onProgress);
@@ -1244,6 +1247,9 @@ async function mixtapeDistributeCommand(idOrLogId, options, onProgress = () => {
     onProgress(`YouTube: ${result.url}`);
   }
   if (doMixcloud) {
+    if (!options.audio) {
+      throw new CliError2("missing_audio", "Mixcloud distribution needs --audio <file>");
+    }
     onProgress("Mixcloud: uploading audio…");
     const { distributeMixcloud: distributeMixcloud2 } = await Promise.resolve().then(() => (init_mixtape_mixcloud(), exports_mixtape_mixcloud));
     const result = await distributeMixcloud2(mixtapeId, options.audio, onProgress, options.unlisted);
@@ -1327,11 +1333,15 @@ function parseCueSheet(text) {
     }
     const match = trimmed.match(/^(\d{1,2}:\d{2}(?::\d{2})?)\s+(.+)$/);
     if (match) {
-      const startMs = parseDuration(match[1]);
+      const [, time, ref] = match;
+      if (time === undefined || ref === undefined) {
+        continue;
+      }
+      const startMs = parseDuration(time);
       if (startMs === null) {
         continue;
       }
-      entries.push({ ref: match[2].trim(), startMs });
+      entries.push({ ref: ref.trim(), startMs });
     } else {
       entries.push({ ref: trimmed });
     }
@@ -1354,12 +1364,18 @@ function parseDuration(input) {
     }
     if (parts.length === 3) {
       const [hours, minutes2, seconds2] = nums;
+      if (hours === undefined || minutes2 === undefined || seconds2 === undefined) {
+        return null;
+      }
       if (minutes2 >= 60 || seconds2 >= 60) {
         return null;
       }
       return Math.round((hours * 3600 + minutes2 * 60 + seconds2) * 1000);
     }
     const [minutes, seconds] = nums;
+    if (minutes === undefined || seconds === undefined) {
+      return null;
+    }
     if (seconds >= 60) {
       return null;
     }
@@ -1881,7 +1897,7 @@ function compareVersions2(left, right) {
   const leftParts = parseVersion2(left);
   const rightParts = parseVersion2(right);
   for (let index = 0;index < 3; index += 1) {
-    const difference = leftParts[index] - rightParts[index];
+    const difference = (leftParts[index] ?? 0) - (rightParts[index] ?? 0);
     if (difference !== 0) {
       return difference;
     }
@@ -1890,16 +1906,13 @@ function compareVersions2(left, right) {
 }
 function parseVersion2(version) {
   const parts = version.split(".").map((part) => Number.parseInt(part, 10));
-  return [
-    Number.isInteger(parts[0]) ? parts[0] : 0,
-    Number.isInteger(parts[1]) ? parts[1] : 0,
-    Number.isInteger(parts[2]) ? parts[2] : 0
-  ];
+  const integerOrZero = (value) => value !== undefined && Number.isInteger(value) ? value : 0;
+  return [integerOrZero(parts[0]), integerOrZero(parts[1]), integerOrZero(parts[2])];
 }
 var currentVersion2, latestReleaseUrl = "https://api.github.com/repos/mauricekleine/fluncle/releases/latest";
 var init_version2 = __esm(() => {
   init_output();
-  currentVersion2 = "0.49.0".trim() ? "0.49.0".trim() : "0.1.0";
+  currentVersion2 = "0.51.0".trim() ? "0.51.0".trim() : "0.1.0";
 });
 
 // src/commands/track.ts
@@ -2081,7 +2094,6 @@ __export(exports_admin_tracks, {
   vehiclesCommand: () => vehiclesCommand,
   queueCommand: () => queueCommand,
   observeQueueCommand: () => observeQueueCommand,
-  enrichSweepCommand: () => enrichSweepCommand,
   enrichQueueCommand: () => enrichQueueCommand,
   contextQueueCommand: () => contextQueueCommand,
   backfillLastfmCommand: () => backfillLastfmCommand,
@@ -2146,9 +2158,6 @@ async function observeQueueCommand(limit) {
     order: "asc"
   });
 }
-async function enrichSweepCommand(limit) {
-  return adminApiPost(`/api/admin/tracks/enrich?limit=${limit}`);
-}
 async function backfillLastfmCommand(limit, dryRun, cursor) {
   const params = new URLSearchParams({ dryRun: String(dryRun), limit: String(limit) });
   if (cursor) {
@@ -2996,6 +3005,9 @@ async function paginateWithKeyboard(options) {
       const columns = stdout.columns ?? 80;
       const before = pages.slice(0, index).reduce((count, page2) => count + page2.lines.length, 0);
       const page = pages[index];
+      if (page === undefined) {
+        return;
+      }
       const start = before + 1;
       const end = before + page.lines.length;
       const loading = busy ? "  ·  loading…" : "";
@@ -3007,7 +3019,7 @@ async function paginateWithKeyboard(options) {
 `);
     }
     function loadNext() {
-      const cursor = pages[index].nextCursor;
+      const cursor = pages[index]?.nextCursor;
       if (cursor === undefined) {
         return;
       }
@@ -5384,18 +5396,6 @@ function addAdminCommands(program2) {
     const { enrichQueueCommand: enrichQueueCommand2 } = await Promise.resolve().then(() => (init_admin_tracks(), exports_admin_tracks));
     await runAdminEnrichQueue(options, enrichQueueCommand2);
   });
-  adminTracks.command("enrich").description("Re-fire enrichment for everything in the enrich-queue (--all; idempotent self-heal)").option("--all", "Sweep the whole enrich-queue (required)", false).option("--limit <limit>", "Max findings to re-trigger", "25").option("--json", "Print JSON", false).action(async (options) => {
-    const { enrichSweepCommand: enrichSweepCommand2 } = await Promise.resolve().then(() => (init_admin_tracks(), exports_admin_tracks));
-    await runAdminEnrich(options, enrichSweepCommand2);
-  });
-  adminTracks.command("enrich-sweep", { hidden: true }).description("Enrich sweep (alias of `admin tracks enrich --all`)").option("--limit <limit>", "Max findings to re-trigger", "25").option("--json", "Print JSON", false).action(async (options) => {
-    const { enrichSweepCommand: enrichSweepCommand2 } = await Promise.resolve().then(() => (init_admin_tracks(), exports_admin_tracks));
-    await runAdminEnrich({ ...options, all: true }, enrichSweepCommand2);
-  });
-  admin.command("enrich-sweep", { hidden: true }).description("Enrich sweep (alias of `admin tracks enrich --all`)").option("--limit <limit>", "Max findings to re-trigger", "25").option("--json", "Print JSON", false).action(async (options) => {
-    const { enrichSweepCommand: enrichSweepCommand2 } = await Promise.resolve().then(() => (init_admin_tracks(), exports_admin_tracks));
-    await runAdminEnrich({ ...options, all: true }, enrichSweepCommand2);
-  });
   adminTracks.command("vehicles").description("Recent video vehicles, newest first (the style ledger for diversity)").option("--limit <limit>", "Number of vehicles to show", "10").option("--json", "Print JSON", false).action(async (options) => {
     const { vehiclesCommand: vehiclesCommand2 } = await Promise.resolve().then(() => (init_admin_tracks(), exports_admin_tracks));
     await runAdminVehicles(options, vehiclesCommand2);
@@ -6136,35 +6136,6 @@ async function runAdminEnrichQueue(options, enrichQueueCommand2) {
   console.log(trackRows2(tracks).join(`
 `));
 }
-async function runAdminEnrich(options, enrichSweepCommand2) {
-  if (!options.all) {
-    throw new Error("Usage: fluncle admin tracks enrich --all [--limit 25] [--json] (sweeps the whole enrich-queue)");
-  }
-  const limit = parseListLimit(options.limit);
-  const result = await enrichSweepCommand2(limit);
-  if (options.json) {
-    printJson({
-      ok: true,
-      reEnriched: result.reEnriched,
-      reEnrichedCount: result.reEnrichedCount,
-      skipped: result.skipped,
-      skippedCount: result.skippedCount
-    });
-    return;
-  }
-  if (result.reEnrichedCount === 0 && result.skippedCount === 0) {
-    console.log("Nothing to sweep. The enrich-queue is empty.");
-    return;
-  }
-  const noun = result.reEnrichedCount === 1 ? "finding" : "findings";
-  console.log(`Re-fired enrichment for ${result.reEnrichedCount} ${noun}.`);
-  for (const entry of result.reEnriched) {
-    console.log(`  ${entry.logId || entry.trackId} (was ${entry.status})`);
-  }
-  if (result.skippedCount > 0) {
-    console.log(`Skipped ${result.skippedCount} with no Log ID yet.`);
-  }
-}
 async function runAdminVehicles(options, vehiclesCommand2) {
   const limit = parseListLimit(options.limit);
   const vehicles = await vehiclesCommand2(limit);
@@ -6269,6 +6240,9 @@ function assertParseArgsCompatibleOptionValues(args) {
   }
   for (let index = 0;index < args.length; index += 1) {
     const arg = args[index];
+    if (arg === undefined) {
+      continue;
+    }
     if (arg === "--") {
       return;
     }
@@ -6298,6 +6272,9 @@ function positionalArgs(args) {
   const positionals = [];
   for (let index = 0;index < args.length; index += 1) {
     const arg = args[index];
+    if (arg === undefined) {
+      continue;
+    }
     if (arg === "--") {
       positionals.push(...args.slice(index + 1));
       return positionals;
@@ -6326,6 +6303,9 @@ function positionalArgs(args) {
 function topLevelCommand(args) {
   for (let index = 0;index < args.length; index += 1) {
     const arg = args[index];
+    if (arg === undefined) {
+      continue;
+    }
     if (arg === "--env") {
       index += 1;
       continue;

package/package.json

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