watchwhere 0.3.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "watchwhere",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "region-aware streaming availability CLI — find which of your subs has a given title",
   "type": "module",
   "bin": {

package/src/commands/init.ts

@@ -77,6 +77,7 @@ export async function runInit(): Promise<void> {
     choices,
     pageSize: 15,
     loop: false,
+    theme: { keybindings: ["vim"] },
   });
 
   const saved = await saveConfig({

package/src/commands/search.ts

@@ -15,6 +15,19 @@ import {
 const PAGE_SIZE = 10;
 const SOFT_LIMIT = 25;
 const OVERVIEW_MAX = 140;
+const OLDEST_FILM_YEAR = 1888;
+
+function parseQuery(input: string): { query: string; year?: number } {
+  const match = input.match(/^(.+?)\s+(\d{4})$/);
+  if (match && match[1] && match[2]) {
+    const year = Number.parseInt(match[2], 10);
+    const maxYear = new Date().getFullYear() + 2;
+    if (year >= OLDEST_FILM_YEAR && year <= maxYear) {
+      return { query: match[1].trim(), year };
+    }
+  }
+  return { query: input };
+}
 
 function year(date: string | null): string {
   return date && date.length >= 4 ? date.slice(0, 4) : "????";
@@ -221,14 +234,29 @@ export async function runSearch(query: string, cfg: Config): Promise<void> {
   let currentQuery = query.trim();
   if (!currentQuery) throw new Error(m.searchEmpty);
 
-  // pipe mode: no prompts
-  if (!process.stdin.isTTY) {
-    process.stdout.write(c.dim(`  ${m.searching(currentQuery)}`));
-    const results = await searchAll(currentQuery, cfg.tmdbToken, {
-      region: cfg.region,
+  const runSearchOnce = async (
+    raw: string,
+  ): Promise<ReadonlyArray<MediaItem>> => {
+    const parsed = parseQuery(raw);
+    const displayQ = parsed.year
+      ? `${parsed.query} (${parsed.year})`
+      : parsed.query;
+    process.stdout.write(c.dim(`  ${m.searching(displayQ)}`));
+    // no region: TMDB returns regional release dates with region param,
+    // but year filter expects original release year
+    const all = await searchAll(parsed.query, cfg.tmdbToken, {
       language: cfg.language,
     });
+    const results = parsed.year
+      ? all.filter((r) => r.date?.slice(0, 4) === String(parsed.year))
+      : all;
     console.log(c.dim(m.resultsCount(results.length)));
+    return results;
+  };
+
+  // pipe mode: no prompts
+  if (!process.stdin.isTTY) {
+    const results = await runSearchOnce(currentQuery);
     if (results.length === 0) throw new Error(m.noMatch);
     if (results.length > 1) throw new Error(m.ambiguousQuery(results.length));
     await displayItem(results[0]!, cfg, m);
@@ -236,12 +264,7 @@ export async function runSearch(query: string, cfg: Config): Promise<void> {
   }
 
   while (true) {
-    process.stdout.write(c.dim(`  ${m.searching(currentQuery)}`));
-    const results = await searchAll(currentQuery, cfg.tmdbToken, {
-      region: cfg.region,
-      language: cfg.language,
-    });
-    console.log(c.dim(m.resultsCount(results.length)));
+    const results = await runSearchOnce(currentQuery);
 
     let picked: MediaItem | null = null;
     if (results.length > 0) {

package/src/commands/subs.ts

@@ -35,6 +35,7 @@ export async function runSubs(): Promise<void> {
     })),
     pageSize: 15,
     loop: false,
+    theme: { keybindings: ["vim"] },
   });
 
   const added = subscriptions.filter((id) => !current.has(id)).length;

package/src/i18n.ts

@@ -118,6 +118,7 @@ interface Catalog {
   tokenExpired: string;
   networkOffline: string;
   networkTimeout: string;
+  rateLimited: string;
   relativeNow: string;
   relativeMinutes: (n: number) => string;
   relativeHours: (n: number) => string;
@@ -228,6 +229,7 @@ const en: Catalog = {
   tokenExpired: "TMDB token rejected (401). run `ww init` to re-enter it.",
   networkOffline: "couldn't reach TMDB. check your internet connection.",
   networkTimeout: "TMDB request timed out. try again, or check your connection.",
+  rateLimited: "rate limit hit. try again in an hour, or set WATCHWHERE_PROXY=off to use your own TMDB token.",
   relativeNow: "just now",
   relativeMinutes: (n) => `${n} min ago`,
   relativeHours: (n) => `${n} hr ago`,
@@ -338,6 +340,7 @@ const tr: Catalog = {
   tokenExpired: "TMDB token reddedildi (401). yenilemek için `ww init` çalıştır.",
   networkOffline: "TMDB'ye ulaşılamadı. internet bağlantını kontrol et.",
   networkTimeout: "TMDB isteği zaman aşımına uğradı. tekrar dene veya bağlantını kontrol et.",
+  rateLimited: "rate limit doldu. bir saat sonra dene veya WATCHWHERE_PROXY=off ile kendi TMDB token'ını kullan.",
   relativeNow: "şimdi",
   relativeMinutes: (n) => `${n} dk önce`,
   relativeHours: (n) => `${n} saat önce`,

package/src/index.ts

@@ -162,6 +162,7 @@ main().then(maybeNotifyUpdate).catch(async (err: unknown) => {
   let displayMsg = err instanceof Error ? err.message : String(err);
   if (err instanceof TmdbError) {
     if (err.status === 401) displayMsg = m.tokenExpired;
+    else if (err.status === 429) displayMsg = m.rateLimited;
     else if (err.status === 0 && err.message.includes("timed out")) {
       displayMsg = m.networkTimeout;
     } else if (err.status === 0) {

package/src/picker.ts

@@ -7,10 +7,14 @@ import {
   useKeypress,
   usePagination,
   usePrefix,
+  useRef,
   useState,
 } from "@inquirer/core";
+import { cursorHide } from "@inquirer/ansi";
 import { c } from "./colors.ts";
 
+const GG_TIMEOUT_MS = 500;
+
 export interface PickerChoice<Value> {
   readonly name: string;
   readonly value: Value;
@@ -50,9 +54,14 @@ const promptImpl = createPrompt<unknown | null, PickerConfig<unknown>>(
     const prefix = usePrefix({ status, theme });
     const items = config.choices;
     const [active, setActive] = useState(0);
+    const lastGAt = useRef(0);
 
     useKeypress((key) => {
-      if (key.name === "escape") {
+      // sequence is present at runtime but not in the type; cast to read it
+      const seq = (key as unknown as { sequence?: string }).sequence;
+
+      // esc or q: cancel
+      if (key.name === "escape" || seq === "q") {
         setCancelled(true);
         setStatus("done");
         done(null);
@@ -64,11 +73,29 @@ const promptImpl = createPrompt<unknown | null, PickerConfig<unknown>>(
         if (chosen) done(chosen.value);
         return;
       }
-      if (isUpKey(key, [])) {
+      // G (shift+g): bottom
+      if (seq === "G") {
+        setActive(items.length - 1);
+        return;
+      }
+      // gg: top (two g within timeout)
+      if (seq === "g") {
+        const now = Date.now();
+        if (now - lastGAt.current < GG_TIMEOUT_MS) {
+          setActive(0);
+          lastGAt.current = 0;
+        } else {
+          lastGAt.current = now;
+        }
+        return;
+      }
+      // up or k
+      if (isUpKey(key, []) || seq === "k") {
         if (active > 0) setActive(active - 1);
         return;
       }
-      if (isDownKey(key, [])) {
+      // down or j
+      if (isDownKey(key, []) || seq === "j") {
         if (active < items.length - 1) setActive(active + 1);
         return;
       }
@@ -98,7 +125,7 @@ const promptImpl = createPrompt<unknown | null, PickerConfig<unknown>>(
 
     const description = items[active]?.description;
     const helpLine = [
-      ["↑↓", "navigate"],
+      ["↑↓ jk", "navigate"],
       ["⏎", "select"],
       ...(config.extraKeys ?? []),
     ]
@@ -112,7 +139,7 @@ const promptImpl = createPrompt<unknown | null, PickerConfig<unknown>>(
       helpLine,
     ]
       .filter((line) => line !== "")
-      .join("\n");
+      .join("\n") + cursorHide;
   },
 );