nixamp 0.11.0 → 0.11.2

package/dist/enrich.d.ts

@@ -16,6 +16,12 @@ export declare const MIN_SCORE = 0.5;
 export declare const PREFIX_SCORE = 0.42;
 /** How many answers the cache keeps before the oldest go. */
 export declare const MAX_ENTRIES = 5000;
+/**
+ * Which rules wrote the cache. Answers chosen by older rules are dropped on
+ * load: 0.11.0 remembered "Oppenheimer" as the row without the poster for
+ * seven days, and an update that chose better could not be seen through it.
+ */
+export declare const CACHE_VERSION = 2;
 export type EnrichKind = "auto" | "title" | "channel" | "fixture";
 export interface Enriched {
     /** What nichedb says it is. */

package/dist/enrich.js

@@ -34,6 +34,12 @@ export const MIN_SCORE = 0.5;
 export const PREFIX_SCORE = 0.42;
 /** How many answers the cache keeps before the oldest go. */
 export const MAX_ENTRIES = 5000;
+/**
+ * Which rules wrote the cache. Answers chosen by older rules are dropped on
+ * load: 0.11.0 remembered "Oppenheimer" as the row without the poster for
+ * seven days, and an update that chose better could not be seen through it.
+ */
+export const CACHE_VERSION = 2;
 /** The collection and kind a name is asked about, from what the caller knows. */
 export function whereToAsk(kind, parsedKind) {
     const k = kind === "auto" ? parsedKind ?? "" : kind;
@@ -79,11 +85,15 @@ export function pickBest(answer, asked) {
             (askedPlain.startsWith(`${titlePlain} `) || titlePlain.startsWith(`${askedPlain} `));
         if (!exact && score < (prefix ? PREFIX_SCORE : MIN_SCORE))
             continue;
-        // An exact title beats any score; among the rest, the score decides.
+        // An exact title beats any score; among exact titles the one with a
+        // picture wins, since nichedb keeps both the IMDb row and the TMDB row of
+        // a film and only one has the poster; among the rest, the score decides.
         if (!best)
             best = item;
         else if (exact && !isExact(best))
             best = item;
+        else if (exact && isExact(best) && !best.image_url && item.image_url)
+            best = item;
         else if (!isExact(best) && score > Number(best.score ?? 0))
             best = item;
     }
@@ -213,7 +223,10 @@ export class Enricher {
             return;
         try {
             const parsed = JSON.parse(readFileSync(this.options.cacheFile, "utf8"));
-            for (const [k, v] of Object.entries(parsed)) {
+            // A file from older rules is a file of answers those rules chose.
+            if (parsed.v !== CACHE_VERSION)
+                return;
+            for (const [k, v] of Object.entries(parsed.entries ?? {})) {
                 if (v && typeof v.at === "number")
                     this.cache.set(k, v);
             }
@@ -238,7 +251,7 @@ export class Enricher {
         try {
             mkdirSync(dirname(this.options.cacheFile), { recursive: true });
             const tmp = `${this.options.cacheFile}.tmp`;
-            writeFileSync(tmp, JSON.stringify(Object.fromEntries(this.cache)));
+            writeFileSync(tmp, JSON.stringify({ v: CACHE_VERSION, entries: Object.fromEntries(this.cache) }));
             renameSync(tmp, this.options.cacheFile);
             this.dirty = false;
         }

package/dist/server.js

@@ -2341,8 +2341,9 @@ export function createHandler(engine, options) {
             response.writeHead(200, {
                 ...CORS,
                 "content-type": "application/json; charset=utf-8",
-                // A miss is worth asking again in a few hours; a hit lasts the day.
-                "cache-control": match ? "public, max-age=3600" : "public, max-age=600",
+                // Briefly: the server remembers for days, so the browser need not,
+                // and an hour of browser cache hid a better answer for an hour.
+                "cache-control": match ? "public, max-age=300" : "public, max-age=120",
             });
             response.end(JSON.stringify({ match }));
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nixamp",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "description": "It really whips the terminal's ass. A Winamp-shaped audio player for your terminal.",
   "license": "MIT",
   "type": "module",

package/src/enrich.ts

@@ -35,6 +35,12 @@ export const MIN_SCORE = 0.5;
 export const PREFIX_SCORE = 0.42;
 /** How many answers the cache keeps before the oldest go. */
 export const MAX_ENTRIES = 5000;
+/**
+ * Which rules wrote the cache. Answers chosen by older rules are dropped on
+ * load: 0.11.0 remembered "Oppenheimer" as the row without the poster for
+ * seven days, and an update that chose better could not be seen through it.
+ */
+export const CACHE_VERSION = 2;
 
 export type EnrichKind = "auto" | "title" | "channel" | "fixture";
 
@@ -126,9 +132,12 @@ export function pickBest(answer: MatchAnswer, asked: string): Enriched | null {
       askedPlain.length >= 4 &&
       (askedPlain.startsWith(`${titlePlain} `) || titlePlain.startsWith(`${askedPlain} `));
     if (!exact && score < (prefix ? PREFIX_SCORE : MIN_SCORE)) continue;
-    // An exact title beats any score; among the rest, the score decides.
+    // An exact title beats any score; among exact titles the one with a
+    // picture wins, since nichedb keeps both the IMDb row and the TMDB row of
+    // a film and only one has the poster; among the rest, the score decides.
     if (!best) best = item;
     else if (exact && !isExact(best)) best = item;
+    else if (exact && isExact(best) && !best.image_url && item.image_url) best = item;
     else if (!isExact(best) && score > Number(best.score ?? 0)) best = item;
   }
   if (!best) return null;
@@ -260,8 +269,13 @@ export class Enricher {
   private load(): void {
     if (!this.options.cacheFile) return;
     try {
-      const parsed = JSON.parse(readFileSync(this.options.cacheFile, "utf8")) as Record<string, Cached>;
-      for (const [k, v] of Object.entries(parsed)) {
+      const parsed = JSON.parse(readFileSync(this.options.cacheFile, "utf8")) as {
+        v?: number;
+        entries?: Record<string, Cached>;
+      };
+      // A file from older rules is a file of answers those rules chose.
+      if (parsed.v !== CACHE_VERSION) return;
+      for (const [k, v] of Object.entries(parsed.entries ?? {})) {
         if (v && typeof v.at === "number") this.cache.set(k, v);
       }
     } catch {
@@ -284,7 +298,7 @@ export class Enricher {
     try {
       mkdirSync(dirname(this.options.cacheFile), { recursive: true });
       const tmp = `${this.options.cacheFile}.tmp`;
-      writeFileSync(tmp, JSON.stringify(Object.fromEntries(this.cache)));
+      writeFileSync(tmp, JSON.stringify({ v: CACHE_VERSION, entries: Object.fromEntries(this.cache) }));
       renameSync(tmp, this.options.cacheFile);
       this.dirty = false;
     } catch (error) {

package/src/server.ts

@@ -2815,8 +2815,9 @@ export function createHandler(engine: Engine, options: HandlerOptions) {
       response.writeHead(200, {
         ...CORS,
         "content-type": "application/json; charset=utf-8",
-        // A miss is worth asking again in a few hours; a hit lasts the day.
-        "cache-control": match ? "public, max-age=3600" : "public, max-age=600",
+        // Briefly: the server remembers for days, so the browser need not,
+        // and an hour of browser cache hid a better answer for an hour.
+        "cache-control": match ? "public, max-age=300" : "public, max-age=120",
       });
       response.end(JSON.stringify({ match }));
       return;

package/web/dist/sw.js

@@ -1,5 +1,5 @@
 /* nixamp service worker — generated, do not edit */
-const CACHE = "nixamp-1789049456452";
+const CACHE = "nixamp-1789050586501";
 const PRECACHE = [
   "/",
   "/apple-touch-icon.png",