open-nami 1.2.6 → 1.2.7

package/dist/cli.js

@@ -9,7 +9,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "open-nami",
-      version: "1.2.6",
+      version: "1.2.7",
       description: "Open Nami: terminal-first bulk social media profile downloader for Instagram, TikTok, Facebook & X.",
       type: "module",
       bin: {
@@ -5352,9 +5352,9 @@ function startClipboardWatcher(options = {}) {
             try {
               const res = await dispatch({
                 profile: parsed,
-                choice,
-                outputDir: options.outputDir,
-                writeMetadata: options.writeMetadata,
+                choice: options.getChoice ? options.getChoice() : options.choice || "all",
+                outputDir: resolveDefaultDownloadDir(parsed.platform, parsed.username, options.outputDir),
+                writeMetadata: options.getWriteMetadata ? options.getWriteMetadata() : options.writeMetadata ?? false,
                 signal: options.signal,
                 onProgress: (p) => {
                   if (p.statusText) {
@@ -5444,16 +5444,19 @@ function revealInFileManager(targetPath) {
 
 // src/components/views/watcher-view.tsx
 import { jsx as jsx16, jsxs as jsxs13 } from "react/jsx-runtime";
+var CHOICES = ["all", "photos", "videos", "stories", "highlights"];
 function WatcherView({
   onBack,
   outputDir,
   theme,
   gapComponent: Gap2,
   defaultChoice = "all",
-  defaultWriteMetadata = false
+  defaultWriteMetadata = false,
+  onRegisterClickTargets
 }) {
   const [mediaChoice, setMediaChoice] = useState7(defaultChoice);
   const [writeMetadata, setWriteMetadata] = useState7(defaultWriteMetadata);
+  const [focusedIndex, setFocusedIndex] = useState7(0);
   const [history, setHistory] = useState7([]);
   const [activeJob, setActiveJob] = useState7(null);
   const [stats, setStats] = useState7({ detected: 0, downloaded: 0, skipped: 0 });
@@ -5471,8 +5474,10 @@ function WatcherView({
   useEffect6(() => {
     const watcher = startClipboardWatcher({
       choice: mediaChoiceRef.current,
+      getChoice: () => mediaChoiceRef.current,
       outputDir,
       writeMetadata: writeMetadataRef.current,
+      getWriteMetadata: () => writeMetadataRef.current,
       onDetected: (profile) => {
         setStats((prev) => ({ ...prev, detected: prev.detected + 1 }));
         const newItem = {
@@ -5528,9 +5533,9 @@ function WatcherView({
   }, [outputDir]);
   const cycleChoice = useCallback3(() => {
     setMediaChoice((prev) => {
-      if (prev === "all") return "photos";
-      if (prev === "photos") return "videos";
-      return "all";
+      const idx = CHOICES.indexOf(prev);
+      const nextChoice = CHOICES[(idx + 1) % CHOICES.length] || "all";
+      return nextChoice;
     });
   }, []);
   const toggleMetadata = useCallback3(() => {
@@ -5540,20 +5545,68 @@ function WatcherView({
     const target = outputDir || resolveDefaultDownloadDir("instagram", "watcher");
     revealInFileManager(target);
   }, [outputDir]);
+  useEffect6(() => {
+    if (!onRegisterClickTargets) return;
+    const targets = [
+      { match: "Target:", padX: 1, action: () => {
+        setFocusedIndex(0);
+        cycleChoice();
+      } },
+      { match: "Sidecars:", padX: 1, action: () => {
+        setFocusedIndex(1);
+        toggleMetadata();
+      } },
+      { match: "Open Folder", padX: 1, action: () => {
+        setFocusedIndex(2);
+        openFolder();
+      } },
+      { match: "c target", padX: 1, action: () => {
+        setFocusedIndex(0);
+        cycleChoice();
+      } },
+      { match: "m sidecar", padX: 1, action: () => {
+        setFocusedIndex(1);
+        toggleMetadata();
+      } },
+      { match: "o open dir", padX: 1, action: () => {
+        setFocusedIndex(2);
+        openFolder();
+      } },
+      { match: "esc back", padX: 1, action: onBack }
+    ];
+    onRegisterClickTargets(targets);
+  }, [onRegisterClickTargets, cycleChoice, toggleMetadata, openFolder, onBack, mediaChoice, writeMetadata]);
   useInput4((input, key) => {
     if (key.escape) {
       onBack();
       return;
     }
+    if (key.leftArrow) {
+      setFocusedIndex((prev) => prev === 0 ? 2 : prev - 1);
+      return;
+    }
+    if (key.rightArrow || key.tab) {
+      setFocusedIndex((prev) => prev === 2 ? 0 : prev + 1);
+      return;
+    }
+    if (key.return || input === " ") {
+      if (focusedIndex === 0) cycleChoice();
+      else if (focusedIndex === 1) toggleMetadata();
+      else if (focusedIndex === 2) openFolder();
+      return;
+    }
     if (input === "c" || input === "C") {
+      setFocusedIndex(0);
       cycleChoice();
       return;
     }
     if (input === "m" || input === "M") {
+      setFocusedIndex(1);
       toggleMetadata();
       return;
     }
     if (input === "o" || input === "O") {
+      setFocusedIndex(2);
       openFolder();
       return;
     }
@@ -5569,8 +5622,10 @@ function WatcherView({
     ] }),
     /* @__PURE__ */ jsx16(ProgressBar, { indeterminate: true, width: 58, tick: pulseTick }),
     /* @__PURE__ */ jsx16(Gap2, {}),
-    /* @__PURE__ */ jsx16(Text15, { color: theme.gray, dimColor: theme.dimSecondary, children: "Listening for Instagram, TikTok, Facebook, or X profile links in clipboard." }),
-    /* @__PURE__ */ jsx16(Text15, { color: theme.gray, dimColor: theme.dimSecondary, children: "Simply copy any profile link in your browser and Open Nami will download it!" }),
+    /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx16(Text15, { color: theme.gray, dimColor: theme.dimSecondary, children: "Auto-monitoring clipboard for profile links (Instagram, TikTok, FB, X)." }),
+      /* @__PURE__ */ jsx16(Text15, { color: theme.gray, dimColor: theme.dimSecondary, children: "Copy any profile link in your browser: Open Nami downloads it in background." })
+    ] }),
     /* @__PURE__ */ jsx16(Gap2, {}),
     /* @__PURE__ */ jsx16(
       Box13,
@@ -5606,15 +5661,42 @@ function WatcherView({
     ] }) : null,
     /* @__PURE__ */ jsx16(Gap2, {}),
     /* @__PURE__ */ jsxs13(Box13, { justifyContent: "space-between", children: [
-      /* @__PURE__ */ jsxs13(Text15, { color: theme.gray, dimColor: theme.dimSecondary, children: [
-        "[c] Target: ",
-        /* @__PURE__ */ jsx16(Text15, { color: theme.primary, bold: true, children: mediaChoice.toUpperCase() })
-      ] }),
-      /* @__PURE__ */ jsxs13(Text15, { color: theme.gray, dimColor: theme.dimSecondary, children: [
-        "[m] Sidecars: ",
-        /* @__PURE__ */ jsx16(Text15, { color: theme.primary, bold: true, children: writeMetadata ? "ON" : "OFF" })
-      ] }),
-      /* @__PURE__ */ jsx16(Text15, { color: theme.gray, dimColor: theme.dimSecondary, children: "[o] Open Folder" })
+      /* @__PURE__ */ jsx16(
+        Box13,
+        {
+          borderStyle: "round",
+          borderColor: focusedIndex === 0 ? theme.primary : theme.gray,
+          borderDimColor: focusedIndex !== 0,
+          paddingX: 1,
+          children: /* @__PURE__ */ jsxs13(Text15, { color: focusedIndex === 0 ? theme.primary : theme.gray, bold: focusedIndex === 0, children: [
+            "[c] Target: ",
+            /* @__PURE__ */ jsx16(Text15, { color: theme.primary, bold: true, children: mediaChoice === "all" ? "EVERYTHING" : mediaChoice.toUpperCase() })
+          ] })
+        }
+      ),
+      /* @__PURE__ */ jsx16(
+        Box13,
+        {
+          borderStyle: "round",
+          borderColor: focusedIndex === 1 ? theme.primary : theme.gray,
+          borderDimColor: focusedIndex !== 1,
+          paddingX: 1,
+          children: /* @__PURE__ */ jsxs13(Text15, { color: focusedIndex === 1 ? theme.primary : theme.gray, bold: focusedIndex === 1, children: [
+            "[m] Sidecars: ",
+            /* @__PURE__ */ jsx16(Text15, { color: theme.primary, bold: true, children: writeMetadata ? "ON" : "OFF" })
+          ] })
+        }
+      ),
+      /* @__PURE__ */ jsx16(
+        Box13,
+        {
+          borderStyle: "round",
+          borderColor: focusedIndex === 2 ? theme.primary : theme.gray,
+          borderDimColor: focusedIndex !== 2,
+          paddingX: 1,
+          children: /* @__PURE__ */ jsx16(Text15, { color: focusedIndex === 2 ? theme.primary : theme.gray, bold: focusedIndex === 2, children: "[o] Open Folder" })
+        }
+      )
     ] }),
     /* @__PURE__ */ jsx16(Box13, { marginTop: 1, justifyContent: "center", children: /* @__PURE__ */ jsxs13(Text15, { color: theme.gray, dimColor: theme.dimSecondary, children: [
       "Session Stats: ",
@@ -5756,7 +5838,7 @@ async function runBatchQueue(options) {
 // src/components/views/batch-view.tsx
 import { Fragment as Fragment4, jsx as jsx17, jsxs as jsxs14 } from "react/jsx-runtime";
 var PLATFORMS = ["instagram", "tiktok", "facebook", "x"];
-var CHOICES = ["all", "photos", "videos", "stories", "highlights"];
+var CHOICES2 = ["all", "photos", "videos", "stories", "highlights"];
 var DATE_PRESETS2 = ["all", "24h", "7d", "30d", "2024", "2023", "2022", "2021", "custom"];
 var LIMIT_PRESETS2 = [void 0, 10, 24, 50, 100, "custom"];
 function BatchView({
@@ -5798,8 +5880,8 @@ function BatchView({
   }, []);
   const cycleChoice = useCallback4(() => {
     setChoice((prev) => {
-      const idx = CHOICES.indexOf(prev);
-      return CHOICES[(idx + 1) % CHOICES.length];
+      const idx = CHOICES2.indexOf(prev);
+      return CHOICES2[(idx + 1) % CHOICES2.length];
     });
   }, []);
   const cycleLimit = useCallback4(() => {
@@ -6793,6 +6875,7 @@ function InnerApp({
   const [clipboardUrl, setClipboardUrl] = useState9(void 0);
   const [settingsFocus, setSettingsFocus] = useState9("cookies");
   const [batchClickTargets, setBatchClickTargets] = useState9([]);
+  const [watcherClickTargets, setWatcherClickTargets] = useState9([]);
   const columns = stdout?.columns && stdout.columns > 0 ? stdout.columns : 80;
   const boxWidth = Math.max(14, Math.min(64, columns - 6));
   const contentWidth = Math.max(10, Math.min(columns - 4, 78));
@@ -6944,8 +7027,11 @@ function InnerApp({
     if (key.ctrl && (input === "w" || input === "W")) {
       if (phase.name === "watcher") {
         setPhase({ name: "input" });
-      } else if (phase.name === "input") {
+        return;
+      }
+      if (phase.name === "input" && urlInput.length === 0) {
         setPhase({ name: "watcher" });
+        return;
       }
       return;
     }
@@ -7063,6 +7149,9 @@ function InnerApp({
     if (phase.name === "batch") {
       targets.push(...batchClickTargets);
     }
+    if (phase.name === "watcher") {
+      targets.push(...watcherClickTargets);
+    }
     for (const [key, label] of hints) {
       const action = hintAction(key);
       if (action) targets.push({ match: `${key} ${label}`, action });
@@ -7083,7 +7172,8 @@ function InnerApp({
     handlePlatformSelect,
     handleModeSelect,
     resetToInput,
-    batchClickTargets
+    batchClickTargets,
+    watcherClickTargets
   ]);
   useMouseClick(
     (x, y) => {
@@ -7210,7 +7300,8 @@ function InnerApp({
         theme,
         gapComponent: Gap,
         defaultChoice: initialChoice,
-        defaultWriteMetadata: effectiveWriteMetadata
+        defaultWriteMetadata: effectiveWriteMetadata,
+        onRegisterClickTargets: setWatcherClickTargets
       }
     ),
     phase.name === "batch" && /* @__PURE__ */ jsx18(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-nami",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "Open Nami: terminal-first bulk social media profile downloader for Instagram, TikTok, Facebook & X.",
   "type": "module",
   "bin": {