fluncle 0.67.0 → 0.68.0

package/bin/fluncle.mjs

@@ -423,7 +423,7 @@ function parseVersion(version) {
 var currentVersion;
 var init_version = __esm(() => {
   init_output();
-  currentVersion = "0.67.0".trim() ? "0.67.0".trim() : "0.1.0";
+  currentVersion = "0.68.0".trim() ? "0.68.0".trim() : "0.1.0";
 });
 
 // src/update-notifier.ts
@@ -2138,7 +2138,7 @@ function parseVersion2(version) {
 var currentVersion2, latestReleaseUrl = "https://api.github.com/repos/mauricekleine/fluncle/releases/latest";
 var init_version2 = __esm(() => {
   init_output();
-  currentVersion2 = "0.67.0".trim() ? "0.67.0".trim() : "0.1.0";
+  currentVersion2 = "0.68.0".trim() ? "0.68.0".trim() : "0.1.0";
 });
 
 // ../../packages/registry/src/index.ts
@@ -3162,6 +3162,73 @@ var init_admin_tracks = __esm(() => {
   init_recent2();
 });
 
+// src/version-match.ts
+function isRemix(title) {
+  return REMIX_MARKER.test(title);
+}
+function stripVersionSuffix(title) {
+  const parts = title.split(/\s+-\s+/);
+  if (parts.length > 1 && VERSION_MARKER.test(parts[parts.length - 1] ?? "")) {
+    return parts.slice(0, -1).join(" - ").trim();
+  }
+  return title.trim();
+}
+function tokenize(value) {
+  return value.toLowerCase().normalize("NFKD").replace(/[̀-ͯ]/g, "").replace(/[^a-z0-9]+/g, " ").trim().split(" ").filter(Boolean);
+}
+function versionTokens(title) {
+  const parts = title.split(/\s+-\s+/);
+  const tail = parts.length > 1 ? parts[parts.length - 1] ?? "" : "";
+  if (parts.length > 1 && VERSION_MARKER.test(tail)) {
+    return new Set(tokenize(tail));
+  }
+  const bracketed = /[([]([^)\]]*?)[)\]]/.exec(title);
+  if (bracketed?.[1] && VERSION_MARKER.test(bracketed[1])) {
+    return new Set(tokenize(bracketed[1]));
+  }
+  return new Set;
+}
+function versionMatches(findingTitle, candidateTitle) {
+  const findingIsRemix = isRemix(findingTitle);
+  const candidateIsRemix = isRemix(candidateTitle);
+  if (findingIsRemix) {
+    if (!candidateIsRemix) {
+      return false;
+    }
+    const want = [...versionTokens(findingTitle)].filter((t) => !VERSION_STOPWORDS.has(t));
+    if (want.length === 0) {
+      return true;
+    }
+    const have = versionTokens(candidateTitle);
+    for (const token of want) {
+      if (!have.has(token)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  return !candidateIsRemix;
+}
+function baseTitleMatches(findingTitle, candidateTitle) {
+  const want = new Set(tokenize(stripVersionSuffix(findingTitle)));
+  const have = new Set(tokenize(stripVersionSuffix(candidateTitle)));
+  if (want.size === 0) {
+    return false;
+  }
+  for (const token of want) {
+    if (!have.has(token)) {
+      return false;
+    }
+  }
+  return true;
+}
+var VERSION_MARKER, REMIX_MARKER, VERSION_STOPWORDS;
+var init_version_match = __esm(() => {
+  VERSION_MARKER = /\b(mix|edit|version|remix|dub|vip|bootleg|rework|re-?edit|flip|refix|remaster(?:ed)?|instrumental)\b/i;
+  REMIX_MARKER = /\b(remix|bootleg|vip|rework|re-?edit|flip|refix)\b/i;
+  VERSION_STOPWORDS = new Set(["mix", "the", "and", "feat", "ft", "edit", "version", "remix"]);
+});
+
 // src/commands/preview-archive.ts
 var exports_preview_archive = {};
 __export(exports_preview_archive, {
@@ -3265,16 +3332,22 @@ async function resolveDeezerByIsrc(isrc) {
     return;
   }
 }
+function durationAgrees(findingMs, candidateSeconds) {
+  if (!findingMs || !candidateSeconds) {
+    return true;
+  }
+  return Math.abs(candidateSeconds - findingMs / 1000) <= DURATION_TOLERANCE_S;
+}
 async function resolveDeezerSearch(track) {
   const artist = track.artists[0]?.trim();
   if (!artist || !track.title.trim()) {
     return;
   }
   try {
-    const query = `artist:"${artist}" track:"${track.title.trim()}"`;
+    const query = `artist:"${artist}" track:"${stripVersionSuffix(track.title.trim())}"`;
     const response = await fetch(`https://api.deezer.com/search?q=${encodeURIComponent(query)}`);
     const body = await response.json();
-    const hit = (body.data ?? []).find((item) => item.preview);
+    const hit = (body.data ?? []).find((item) => item.preview && versionMatches(track.title, item.title ?? "") && baseTitleMatches(track.title, item.title ?? "") && durationAgrees(track.durationMs, item.duration));
     return downloadPreview(hit?.preview, "deezer:search");
   } catch {
     return;
@@ -3288,7 +3361,7 @@ async function resolveItunes(track) {
   try {
     const response = await fetch(`https://itunes.apple.com/search?term=${encodeURIComponent(`${artist} ${track.title}`)}&media=music&limit=10`);
     const body = await response.json();
-    const hit = (body.results ?? []).find((item) => item.previewUrl && normalize(item.artistName ?? "").includes(normalize(artist)));
+    const hit = (body.results ?? []).find((item) => item.previewUrl && normalize(item.artistName ?? "").includes(normalize(artist)) && versionMatches(track.title, item.trackName ?? "") && baseTitleMatches(track.title, item.trackName ?? "") && durationAgrees(track.durationMs, item.trackTimeMillis ? item.trackTimeMillis / 1000 : undefined));
     return downloadPreview(hit?.previewUrl, "itunes");
   } catch {
     return;
@@ -3350,8 +3423,10 @@ function extensionForMime(mime) {
 function normalize(value) {
   return value.toLowerCase().replace(/[^a-z0-9]/g, "");
 }
+var DURATION_TOLERANCE_S = 5;
 var init_preview_archive = __esm(() => {
   init_api();
+  init_version_match();
 });
 
 // src/commands/mixtape-youtube.ts

package/package.json

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