fix(search): cancel previous search processes when typing

johnlindquist · Sep 28, 2024 · f72e40f · f72e40f
1 parent 4188b56
commit f72e40f
Show file tree

Hide file tree

Showing 3 changed files with 234 additions and 184 deletions.
diff --git a/src/lib/file.ts b/src/lib/file.ts
@@ -1,39 +1,50 @@
+import type { ExecaChildProcess } from "@johnlindquist/globals/types/execa"
 import { Channel } from "../core/enum.js"
 
 // TODO: Optimize, etc
 // "kMDItemContentType = 'com.apple.application-bundle'"
+let activeFileSearchProcess: ExecaChildProcess<string>
 global.fileSearch = async (
-	name,
-	{ onlyin = "~", kind = "", kMDItemContentType = "" } = {}
+  name,
+  { onlyin = "~", kind = "", kMDItemContentType = "" } = {}
 ) => {
-	let command = `/usr/bin/mdfind${
-		name ? ` -name ${name}` : ""
-	}${onlyin ? ` -onlyin ${onlyin}` : ``}${kind ? ` "kind:${kind}"` : ``}${
-		kMDItemContentType ? ` "kMDItemContentType:${kMDItemContentType}"` : ``
-	}`
-
-	let results = []
-
-	try {
-		results = (
-			await global.exec(command, {
-				windowsHide: true,
-				shell: true
-			})
-		).stdout
-			.split("\n")
-			.filter(Boolean)
-	} catch (e) {
-		warn(e)
-		results = []
-	}
-
-	return results
+  let command = `/usr/bin/mdfind${
+    name ? ` -name ${name}` : ""
+  }${onlyin ? ` -onlyin ${onlyin}` : ``}${
+    kind ? ` "kind:${kind}"` : ``
+  }${
+    kMDItemContentType
+      ? ` "kMDItemContentType:${kMDItemContentType}"`
+      : ``
+  }`
+
+  let results = []
+
+  try {
+    if (activeFileSearchProcess) {
+      activeFileSearchProcess.kill()
+    }
+
+    activeFileSearchProcess = global.exec(command, {
+      windowsHide: true,
+      shell: true,
+    })
+
+    let { stdout } = await activeFileSearchProcess
+
+    results = stdout.split("\n").filter(Boolean)
+    activeFileSearchProcess = null
+  } catch (e) {
+    warn(e)
+    results = []
+  }
+
+  return results
 }
 
 global.getSelectedFile = async () => {
-	return await applescript(
-		String.raw`
+  return await applescript(
+    String.raw`
       tell application "Finder"
         set finderSelList to selection as alias list
       end tell
@@ -46,11 +57,11 @@ global.getSelectedFile = async () => {
         set AppleScript's text item delimiters to linefeed
         finderSelList as text
       end if`
-	)
+  )
 }
 
 global.getSelectedDir = async () => {
-	return await applescript(`
+  return await applescript(`
  tell application "Finder"
      if exists Finder window 1 then
          set currentDir to target of Finder window 1 as alias
@@ -63,33 +74,37 @@ global.getSelectedDir = async () => {
 }
 
 global.setSelectedFile = async (filePath: string) => {
-	await applescript(`
+  await applescript(`
 set aFile to (POSIX file "${filePath}") as alias
 tell application "Finder" to select aFile
 `)
 }
 
-global.copyPathAsImage = async (path) =>
-	await applescript(
-		String.raw`set the clipboard to (read (POSIX file "${path}") as JPEG picture)`
-	)
+global.copyPathAsImage = async path =>
+  await applescript(
+    String.raw`set the clipboard to (read (POSIX file "${path}") as JPEG picture)`
+  )
 
 global.copyPathAsPicture = copyPathAsImage
 
-global.selectFolder = async (message: string = "Pick a folder:") => {
-	return await sendWaitLong(Channel.SELECT_FOLDER, message)
+global.selectFolder = async (
+  message: string = "Pick a folder:"
+) => {
+  return await sendWaitLong(Channel.SELECT_FOLDER, message)
 }
 
-global.selectFile = async (message: string = "Pick a file:") => {
-	return await sendWaitLong(Channel.SELECT_FILE, message)
+global.selectFile = async (
+  message: string = "Pick a file:"
+) => {
+  return await sendWaitLong(Channel.SELECT_FILE, message)
 }
 
-global.revealFile = async (filePath) => {
-	return sendWaitLong(Channel.REVEAL_FILE, filePath.trim())
+global.revealFile = async filePath => {
+  return sendWaitLong(Channel.REVEAL_FILE, filePath.trim())
 }
 
-global.revealInFinder = async (filePath) => {
-	return sendWaitLong(Channel.REVEAL_FILE, filePath.trim())
+global.revealInFinder = async filePath => {
+  return sendWaitLong(Channel.REVEAL_FILE, filePath.trim())
 }
 
 export {}
diff --git a/src/main/file-search.ts b/src/main/file-search.ts
@@ -3,77 +3,86 @@
 // Trigger: .
 // Pass: true
 
-import { keywordInputTransformer, isMac } from "../core/utils.js"
+import {
+  keywordInputTransformer,
+  isMac,
+} from "../core/utils.js"
 import { actionFlags } from "./common.js"
 
 let flags = {}
 for (let flag of actionFlags) {
-	flags[flag.name] = flag
+  flags[flag.name] = flag
 }
 
 let pleaseType = [
-	{
-		name: "Type at least 3 characters",
-		info: true
-	}
+  {
+    name: "Type at least 3 characters",
+    info: true,
+  },
 ]
 
 let transformer = keywordInputTransformer(arg?.keyword)
 let selectedFile = await arg(
-	{
-		preventCollapse: true,
-		input: arg?.pass ? arg.pass : arg?.keyword ? `${arg.keyword} ` : "",
-		...(!arg?.pass && { initialChoices: pleaseType }),
-		onMenuToggle: async (input, state) => {
-			if (state.flag) {
-				setPlaceholder("Select Action")
-				setEnter("Submit")
-			} else {
-				setPlaceholder("Search Files")
-				setEnter("Actions")
-			}
-		},
-		onSubmit: async (input, state) => {
-			if (!state?.flag) {
-				await setFlagValue(state?.focused)
-				return preventSubmit
-			}
-		},
-		placeholder: "Search Files",
-		enter: "Actions",
-		shortcuts: [
-			{
-				key: "right"
-			}
-		],
-		resize: true,
-		flags
-	},
-	async (input) => {
-		input = transformer(input)
+  {
+    preventCollapse: true,
+    input: arg?.pass
+      ? arg.pass
+      : arg?.keyword
+      ? `${arg.keyword} `
+      : "",
+    ...(!arg?.pass && { initialChoices: pleaseType }),
+    onMenuToggle: async (input, state) => {
+      if (state.flag) {
+        setPlaceholder("Select Action")
+        setEnter("Submit")
+      } else {
+        setPlaceholder("Search Files")
+        setEnter("Actions")
+      }
+    },
+    onSubmit: async (input, state) => {
+      if (!state?.flag) {
+        await setFlagValue(state?.focused)
+        return preventSubmit
+      }
+    },
+    placeholder: "Search Files",
+    enter: "Actions",
+    shortcuts: [
+      {
+        key: "right",
+      },
+    ],
+    resize: true,
+    flags,
+  },
+  async input => {
+    input = transformer(input)
 
-		if (!input || input?.length < 3) {
-			return pleaseType
-		}
-		let files = await fileSearch(input)
+    if (!input || input?.length < 3) {
+      return pleaseType
+    }
+    let files = await fileSearch(input)
 
-		if (files.length === 0) {
-			return [
-				{
-					name: `No results found for ${input}`,
-					info: true
-				}
-			]
-		}
-		return files.map((p) => {
-			return {
-				name: path.basename(p),
-				description: p,
-				drag: p,
-				value: p
-			}
-		})
-	}
+    if (files.length === 0) {
+      return [
+        {
+          name: `No results found for ${input}`,
+          info: true,
+        },
+      ]
+    }
+    return files.map(p => {
+      return {
+        name: path.basename(p),
+        description: p,
+        drag: p,
+        value: p,
+      }
+    })
+  }
 )
 
-await actionFlags.find((f) => flag?.[f.name])?.action?.(selectedFile)
+await actionFlags
+  .find(f => flag?.[f.name])
+  ?.action?.(selectedFile)