fish-dock-plugin-filemgr 1.0.7 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fish-dock-plugin-filemgr",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "FISH Dock 文件管理插件：目录浏览 + 文件预览（Markdown / 图片 / Office / 代码）+ 文件暂存中转站，兼容 FISH Dock v1.2.3 及更早官方发行版。",
   "type": "module",
   "files": [

package/plugin.json

@@ -2,7 +2,7 @@
   "schema": 1,
   "id": "jassdingk.filemgr",
   "name": "文件管理",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "hostApi": 1,
   "platforms": [
     "windows-x86_64"
@@ -27,11 +27,11 @@
   ],
   "files": {
     "bridge.js": "f38f93994e3cb2b71f2ff1810b3f68fb42f4261550f8ab01b0bfa3eecd5f94ee",
-    "package.json": "330dcaaf54a8291462d17ef6a28d7b49465d7a603add478f03fb35feb49a4bee",
-    "plugins/filemgr/backend.mjs": "7cd37f01f6d4ae8b9693d2b1642f5078855fd405dae1e1cf9a6c10d7a8c15b15",
+    "package.json": "3d4301227f9025eac6274be6cc660f4036943fca12a231c1486c1c130d0fd521",
+    "plugins/filemgr/backend.mjs": "f16d378743eaa51759e53fe8974354f5cb95f7d6694dafba48e041cce7cadbdd",
     "plugins/filemgr/clip.ps1": "b0a32fca35cf2d25133338f46e20a0db20d78c5bb6b5c2aab899998bfbd6c6ab",
     "plugins/filemgr/dock.css": "e795214dd39de3b473ac0b1a7b79f6922a88c761fca4d3ea4da8fd9b60188bcf",
-    "plugins/filemgr/filemgr.css": "c6d6e4041901e37d023205d8d7025b597294a8503bb74be74ed774eeb86fe1e3",
+    "plugins/filemgr/filemgr.css": "f6baa1c309d9655d32a16d284cad00b862a0504a254190f10b52e505fd77de63",
     "plugins/filemgr/FolderPicker.ps1": "4b7f86c543e06fd8f93fa5d8002997d944c8189cb0ae031bedf864ea89196427",
     "plugins/filemgr/page.css": "0801a05b5148cd091a68957beac21cc982a7818ef4707cd06fd11b20adbc7765",
     "plugins/filemgr/page.html": "415e9ae0d7ed85040974498d4d5581d707a668d55c917181025d4fee4dda67de",

package/plugins/filemgr/backend.mjs

@@ -168,28 +168,26 @@ const SEARCH_HIDDEN = new Set([
   '$RECYCLE.BIN', 'System Volume Information', 'AppData', 'Windows', 'Program Files', 'Program Files (x86)',
   'ProgramData', 'Recovery', 'PerfLogs', '$WinREAgent', 'OneDriveTemp',
 ])
-async function searchFiles(query, list) {
-  const raw = String(query || '').trim()
-  const needle = raw.toLowerCase()
-  if (!needle) return { query: raw, results: [], scanned: 0, dirs: 0, truncated: false, timedOut: false }
-  const MAX_RESULTS = 300
-  const MAX_SCAN = 80000
-  const MAX_DEPTH = 14
-  const deadline = Date.now() + 8000
+const MAX_DEPTH = 16
+// 每个根目录单独扫描、并发推进：避免某一根（如 C:\Users 用户目录）先把总配额吃光，
+// 导致其它盘（D:/E:/...）根本没扫到 —— 这正是「经常检索不到」的主因。
+const PER_ROOT_SCAN = 60000
+const MAX_RESULTS = 800
+const MAX_SCAN_TOTAL = 400000
+const SEARCH_DEADLINE_MS = 12000 // 宿主单次调用硬超时 15s，留 3s 余量
+
+async function scanRoot(root, needle, deadline, budget) {
   const results = []
   let scanned = 0
-  let dirs = 0
   let truncated = false
-  let timedOut = false
-  const stack = list.map(r => ({ dir: r.path, depth: 0, root: r.label }))
+  const stack = [{ dir: root.path, depth: 0 }]
   while (stack.length) {
-    if (results.length >= MAX_RESULTS || scanned >= MAX_SCAN || Date.now() > deadline) { truncated = true; timedOut = Date.now() > deadline; break }
+    if (scanned >= budget || Date.now() > deadline) { truncated = true; break }
     const cur = stack.pop()
     let ents
     try { ents = await fs.promises.readdir(cur.dir, { withFileTypes: true }) } catch { continue }
-    dirs++
     for (const e of ents) {
-      if (results.length >= MAX_RESULTS || scanned >= MAX_SCAN || Date.now() > deadline) { truncated = true; timedOut = Date.now() > deadline; break }
+      if (scanned >= budget || Date.now() > deadline) { truncated = true; break }
       const name = e.name
       if (!name || name.startsWith('.')) continue
       if (e.isSymbolicLink && e.isSymbolicLink()) continue
@@ -201,20 +199,47 @@ async function searchFiles(query, list) {
         if (name.toLowerCase().includes(needle)) {
           let size = 0, mtime = 0
           try { const s = await fs.promises.stat(full); size = s.size; mtime = s.mtimeMs } catch { /* 用 0 兜底 */ }
-          results.push({ name, path: full, dir: cur.dir, root: cur.root, size, mtime })
+          results.push({ name, path: full, dir: cur.dir, root: root.label, size, mtime })
         }
       } else if (cur.depth < MAX_DEPTH) {
-        stack.push({ dir: full, depth: cur.depth + 1, root: cur.root })
+        stack.push({ dir: full, depth: cur.depth + 1 })
       }
     }
   }
-  results.sort((a, b) => {
+  return { results, scanned, truncated }
+}
+
+async function searchFiles(query, list) {
+  const raw = String(query || '').trim()
+  const needle = raw.toLowerCase()
+  if (!needle) return { query: raw, results: [], scanned: 0, dirs: 0, truncated: false, timedOut: false }
+  const deadline = Date.now() + SEARCH_DEADLINE_MS
+  // 每个根并发，单根预算 PER_ROOT_SCAN；总体上限 MAX_SCAN_TOTAL 兜底。
+  const parts = await Promise.all(list.map(r => scanRoot(r, needle, deadline, PER_ROOT_SCAN)))
+  const seen = new Set()
+  const all = []
+  let scanned = 0
+  let truncated = false
+  for (const p of parts) {
+    scanned += p.scanned
+    if (p.truncated) truncated = true
+    for (const it of p.results) {
+      const key = it.path.toLowerCase()
+      if (seen.has(key)) continue
+      seen.add(key)
+      all.push(it)
+      if (all.length >= MAX_SCAN_TOTAL) { truncated = true; break }
+    }
+  }
+  all.sort((a, b) => {
     const ea = a.name.toLowerCase() === needle ? 1 : 0
     const eb = b.name.toLowerCase() === needle ? 1 : 0
     if (ea !== eb) return eb - ea
     return (b.mtime || 0) - (a.mtime || 0)
   })
-  return { query: raw, results, scanned, dirs, truncated, timedOut }
+  if (all.length > MAX_RESULTS) { truncated = true }
+  const results = all.slice(0, MAX_RESULTS)
+  return { query: raw, results, scanned, dirs: 0, truncated, timedOut: Date.now() > deadline, total: all.length }
 }
 
 // ---- Everything 索引搜索（优先）：调用本机 Everything 的 HTTP JSON 接口 ----

package/plugins/filemgr/filemgr.css

@@ -12,8 +12,10 @@ body.fm-layout, main.fm{height:820px;display:flex;flex-direction:column;padding:
 .fm-head .fm-meta:empty{display:none}
 
 /* 预览工具栏右侧的全局搜索框（在「📌 固定当前文件夹」右边） */
-.search-box{display:flex;align-items:center;gap:4px;margin-left:auto;min-width:0;max-width:260px;flex:0 1 auto}
-.search-box input[type=search]{width:180px;min-width:80px;height:26px;padding:0 9px;font:inherit;font-size:12px;color:var(--dock-fg);background:var(--dock-control);border:1px solid var(--dock-line);border-radius:999px;outline:none}
+.search-box{display:flex;align-items:center;gap:4px;margin-left:8px;min-width:120px;flex:1 1 auto}
+.search-box input[type=search]{width:100%;min-width:80px;height:26px;padding:0 9px;font:inherit;font-size:12px;color:var(--dock-fg);background:var(--dock-control);border:1px solid var(--dock-line);border-radius:999px;outline:none}
+/* 工具栏里的按钮固定宽度，搜索框加宽时不被压缩，「固定当前文件夹」等功能不受影响 */
+#preview-col .preview-toolbar > button{flex:none}
 .search-box input[type=search]:focus{border-color:var(--dock-accent)}
 .search-box #search-clear{margin:0;padding:2px 7px;border-radius:999px;flex:none}
 .search-head{padding:6px 2px 8px;color:var(--dock-muted);font-size:12px}