baiduwangpan-cli 1.1.2 → 1.1.3

package/README.md

@@ -146,7 +146,8 @@ bdp gtree <gid> [--depth N] [--concurrency N] [--max-nodes N]
 bdp gsearch <gid> <keyword>      搜索群文件名 (全量遍历目录)
                                   [--page N] [--limit N] [--depth N] [--concurrency N]
                                   [--max-pages N] [--max-requests N] [--no-unique]
-                                  [--all|--all-results] [--timeout N] [--save-partial] [--no-cache]
+                                  [--all|--all-results] [--timeout N] [--save-partial]
+                                  [--any-word] [--exact] [--no-cache]
 bdp cache [clear]                查看 / 清空会话缓存 (~/.bdp/cache/)
 ```
 
@@ -175,6 +176,8 @@ bdp cache [clear]                查看 / 清空会话缓存 (~/.bdp/cache/)
 --all, --all-results             忽略分页获取全部结果 (gsearch; 不限时, 慢但完整)
 --timeout <N>                    超时秒数，到点返回已扫到的部分结果 (gsearch; 0=不限时, 默认 0)
 --save-partial                    未完整时自动把已搜到的结果存为 JSON 并打印路径 (gsearch; 配 --json-file 时写该文件)
+--any-word                        空格分隔关键词命中任意一个即可 (gsearch; 默认=全部命中 AND)
+--exact                           按文件名精确匹配，忽略路径前缀 (gsearch; 大小写不敏感)
 --no-cache                       禁用会话缓存 (gsearch/gtree/gshares/gls)
 ```
 

package/bin/bdp.js

@@ -91,6 +91,10 @@ function parseArgs(argv) {
       opts.flags.timeoutMs = parseInt(argv[++i], 10) || 0;
     } else if (arg === "--save-partial") {
       opts.flags.savePartial = true;
+    } else if (arg === "--any-word") {
+      opts.flags.anyWord = true;
+    } else if (arg === "--exact") {
+      opts.flags.exact = true;
     } else if (arg === "-n" || arg === "--lines") {
       opts.flags.n = parseInt(argv[++i], 10) || 20;
     } else if (arg === "-p" || arg === "--path") {
@@ -483,6 +487,8 @@ cmds.gsearch = async (args, json) => {
     concurrency: args.flags.concurrency || 4,
     unique: args.flags.unique !== false,
     all: args.flags.all === true,
+    exact: args.flags.exact === true,
+    anyWord: args.flags.anyWord === true,
     timeoutMs: args.flags.timeoutMs || (args.flags.timeout ? args.flags.timeout * 1000 : 0),
     depth: args.flags.depth || 1,
     maxPages: args.flags.maxPages || 50,
@@ -536,7 +542,7 @@ cmds.gsearch = async (args, json) => {
     );
   };
 
-  verboseLog(args, `gsearch gid=${gid} keyword="${keyword}" page=${opts.page} limit=${opts.limit} concurrency=${opts.concurrency} unique=${opts.unique} all=${opts.all} timeoutMs=${opts.timeoutMs} savePartial=${savePartial} depth=${opts.depth} maxPages=${opts.maxPages} maxRequests=${opts.maxRequests} cache=${opts.cache}`);
+  verboseLog(args, `gsearch gid=${gid} keyword="${keyword}" page=${opts.page} limit=${opts.limit} concurrency=${opts.concurrency} unique=${opts.unique} all=${opts.all} exact=${opts.exact} anyWord=${opts.anyWord} timeoutMs=${opts.timeoutMs} savePartial=${savePartial} depth=${opts.depth} maxPages=${opts.maxPages} maxRequests=${opts.maxRequests} cache=${opts.cache}`);
   const result = await group.searchFiles(gid, keyword, opts);
 
   if (result.partial) {
@@ -659,7 +665,8 @@ GROUP CHAT OPERATIONS (群聊)
   gsearch <gid> <keyword>    Search group file names (全量遍历目录, 缓存命中秒回)
                              [--page N] [--limit N] [--depth N] [--concurrency N]
                              [--max-pages N] [--max-requests N] [--no-unique]
-                             [--all|--all-results] [--timeout N] [--save-partial] [--no-cache]
+                             [--all|--all-results] [--timeout N] [--save-partial]
+                             [--any-word] [--exact] [--no-cache]
   cache [clear]              Show cache info or clear session cache
   error <code>               Explain an error code (e.g. -3)
 
@@ -692,6 +699,8 @@ OPTIONS
   --all, --all-results        Fetch all results, no paging (gsearch; slow but never truncates)
   --timeout <N>               Abort after N seconds and return partial results (gsearch; 0=unlimited)
   --save-partial              Auto-save partial results to JSON when scan is incomplete (gsearch)
+  --any-word                  Match ANY of the space-separated keywords (OR) (gsearch; default=ALL)
+  --exact                     Match exact file name (case-insensitive) instead of substring (gsearch)
 
 EXAMPLES
   bdp login --bduss abc123 --stoken def456

package/lib/group.js

@@ -514,7 +514,25 @@ async function treeFiles(gid, options = {}) {
 
 async function searchFiles(gid, keyword, options = {}) {
   const gidS = toStr(gid);
-  const kw = keyword.toLowerCase();
+
+  // 关键词解析：空格分隔多关键词。
+  //  - 默认（all）：每个词都要出现（AND，可换序）→ "玄空 飞星" 只命中同时含两者的名字（精确收窄）
+  //  - --any-word：任一词出现即可（OR，更宽）→ "玄空 飞星" 命中含"玄空"或"飞星"的名字
+  //  - --exact：整名精确相等（最严格）；单关键词默认仍是子串包含（兼容旧行为）
+  const rawKw = String(keyword).toLowerCase();
+  const words = rawKw.split(/\s+/).filter(Boolean);
+  const matchMode = options.exact ? "exact" : (options.anyWord ? "any" : "all");
+  const matchesName = (name) => {
+    const n = String(name || "").toLowerCase();
+    if (matchMode === "exact") {
+      // 精确匹配按文件名（去掉路径前缀），顶层分享 name 形如 "/xxx"，子目录文件 name 无前缀
+      const base = n.includes("/") ? n.slice(n.lastIndexOf("/") + 1) : n;
+      return base === rawKw;
+    }
+    if (words.length <= 1) return n.includes(rawKw);
+    if (matchMode === "any") return words.some((w) => n.includes(w));
+    return words.every((w) => n.includes(w));
+  };
 
   const limit = options.limit || 50;
   const page = options.page || 1;
@@ -570,7 +588,7 @@ async function searchFiles(gid, keyword, options = {}) {
   for (const share of shares) {
     if (finished) break;
     if (!share.isDir) scannedShares++;
-    if (share.name.toLowerCase().includes(kw)) {
+    if (matchesName(share.name)) {
       pushIfMatch({
         name: share.name,
         path: share.name,
@@ -617,7 +635,7 @@ async function searchFiles(gid, keyword, options = {}) {
               maxPages, cache, budget, throttleState,
             });
             if (cached) cachedDirs++;
-            const matches = files.filter((f) => f.name.toLowerCase().includes(kw));
+            const matches = files.filter((f) => matchesName(f.name));
             const subDirs = files.filter((f) => f.isDir);
             return { matches, subDirs };
           } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baiduwangpan-cli",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "百度网盘 CLI — 全盘读写 · 免下载读取文件内容 · 群聊文件浏览 (Agent 友好)",
   "main": "lib/index.js",
   "bin": {