fix(explorer): support terminal.external.explorer

CyanSalt · CyanSalt · commit f1cda8a3ce65 · 2024-10-17T10:35:35.000+08:00
diff --git a/addons/explorer/src/renderer/FileExplorer.vue b/addons/explorer/src/renderer/FileExplorer.vue
@@ -6,6 +6,7 @@ import { nextTick, watch, watchEffect } from 'vue'
 import { FileEntity } from '../types/file'
 
 const { VisualIcon } = commas.ui.vueAssets
+const settings = commas.remote.useSettings()
 
 let modelValue = $(defineModel<string>({ default: '' }))
 
@@ -93,7 +94,20 @@ function openExternal(file: FileEntity) {
   }
 }
 
-function openExternalDirectory() {
+const externalExplorer = $computed(() => {
+  return settings['terminal.external.explorer']
+})
+
+function openExternalExplorer() {
+  if (!openExternalExplorer) {
+    return openDirectory()
+  }
+  const explorer = externalExplorer
+    .replace(/\$\{directory\}/g, modelValue)
+  return ipcRenderer.invoke('execute', explorer)
+}
+
+function openDirectory() {
   ipcRenderer.invoke('open-path', modelValue)
 }
 
@@ -185,9 +199,12 @@ function autoselect(event: FocusEvent) {
       <span class="link form-action" @click="openNewTab">
         <VisualIcon name="lucide-terminal" />
       </span>
-      <span class="link form-action" @click="openExternalDirectory">
+      <span v-if="externalExplorer" class="link form-action" @click="openExternalExplorer">
         <VisualIcon name="lucide-square-arrow-out-up-right" />
       </span>
+      <span class="link form-action" @click="openDirectory">
+        <VisualIcon :name="externalExplorer ? 'lucide-folder-open' : 'lucide-square-arrow-out-up-right'" />
+      </span>
     </div>
     <div class="file-list">
       <a
diff --git a/addons/launcher/src/renderer/launcher.ts b/addons/launcher/src/renderer/launcher.ts
@@ -1,7 +1,6 @@
 import { ipcRenderer } from '@commas/electron-ipc'
 import type { TerminalContext, TerminalInfo, TerminalTab, TerminalTabCharacter } from '@commas/types/terminal'
 import * as commas from 'commas:api/renderer'
-import { shell } from 'electron'
 import type { Launcher } from '../types/launcher'
 import { getLauncherCommand } from './utils'
 
@@ -136,7 +135,7 @@ export async function startLauncherExternally(launcher: Launcher) {
   )
   if (!explorer) {
     if (launcher.remote) return
-    return shell.openPath(directory)
+    return commas.remote.openDirectory(directory)
   }
   explorer = explorer
     .replace(/\$\{directory\}/g, directory)
diff --git a/src/renderer/compositions/shell.ts b/src/renderer/compositions/shell.ts
@@ -63,19 +63,19 @@ export async function confirmClosing() {
 }
 
 export function openFile(file: string) {
-  globalHandler.invoke('global-renderer:open-file', file)
+  return globalHandler.invoke('global-renderer:open-file', file)
 }
 
 export function openDirectory(directory: string) {
-  globalHandler.invoke('global-renderer:open-directory', directory)
+  return globalHandler.invoke('global-renderer:open-directory', directory)
 }
 
 export function showDirectory(file: string) {
-  globalHandler.invoke('global-renderer:show-directory', file)
+  return globalHandler.invoke('global-renderer:show-directory', file)
 }
 
 export function openURL(url: string) {
-  globalHandler.invoke('global-renderer:open-url', url)
+  return globalHandler.invoke('global-renderer:open-url', url)
 }
 
 export function handleShellMessages() {

Original file line number	Diff line number	Diff line change
`@@ -63,19 +63,19 @@ export async function confirmClosing() {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`export function openFile(file: string) {`
`66`		`- globalHandler.invoke('global-renderer:open-file', file)`
	`66`	`+ return globalHandler.invoke('global-renderer:open-file', file)`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`export function openDirectory(directory: string) {`
`70`		`- globalHandler.invoke('global-renderer:open-directory', directory)`
	`70`	`+ return globalHandler.invoke('global-renderer:open-directory', directory)`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`export function showDirectory(file: string) {`
`74`		`- globalHandler.invoke('global-renderer:show-directory', file)`
	`74`	`+ return globalHandler.invoke('global-renderer:show-directory', file)`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`export function openURL(url: string) {`
`78`		`- globalHandler.invoke('global-renderer:open-url', url)`
	`78`	`+ return globalHandler.invoke('global-renderer:open-url', url)`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`export function handleShellMessages() {`