fix(camera): open file after recording

Author: CyanSalt

addons/camera/src/renderer/RecorderAnchor.vue

@@ -26,9 +26,10 @@ async function stopCapturing() {
   const { startedAt, data } = terminal.addons.recorder.save()
   commas.context.invoke('toggle-recorder', terminal, false)
   const date = new Date(startedAt)
-  await ipcRenderer.invoke('save-file', commas.remote.translate('Terminal Recording ${date}#!camera.1', {
+  const file = await ipcRenderer.invoke('save-file', commas.remote.translate('Terminal Recording ${date}#!camera.1', {
     date: `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}.${String(date.getMinutes()).padStart(2, '0')}.${String(date.getSeconds()).padStart(2, '0')}`,
   }) + '.ttyrec', data)
+  commas.remote.addFile(file)
 }
 
 const isCapturing = $computed(() => {

src/api/modules/remote.ts

@@ -6,7 +6,7 @@ import {
   useSettings,
   useSettingsSpecs,
 } from '../../renderer/compositions/settings'
-import { openDirectory, openFile, openFileExternally, openURL, openURLExternally, showDirectory, showFileExternally } from '../../renderer/compositions/shell'
+import { addFile, openDirectory, openFile, openFileExternally, openURL, openURLExternally, showDirectory, showFileExternally } from '../../renderer/compositions/shell'
 import { useIsLightTheme, useTheme } from '../../renderer/compositions/theme'
 import { translate } from '../../renderer/utils/i18n'
 import type { RendererAPIContext } from '../types'
@@ -59,4 +59,5 @@ export {
   showDirectory,
   openURL,
   openURLExternally,
+  addFile,
 }

src/api/renderer.ts

@@ -16,7 +16,7 @@ declare module './modules/context' {
     },
     'terminal.file-opener': {
       extensions: string[],
-      handler: (file: string) => void,
+      handler: (file: string) => Promise<void> | void,
     },
   }
 }

src/main/lib/message.ts

@@ -32,7 +32,7 @@ declare module '@commas/electron-ipc' {
     'preview-file': (file: string) => void,
     'open-path': (uri: string) => void,
     'open-url': (uri: string) => void,
-    'save-file': (name: string, content: Buffer | string) => Promise<void>,
+    'save-file': (name: string, content: Buffer | string) => Promise<string>,
   }
   export interface Events {
     'get-path': (name?: Parameters<typeof app['getPath']>[0]) => string,
@@ -219,11 +219,10 @@ function handleMessages() {
   ipcMain.handle('open-url', (event, url) => {
     shell.openExternal(url)
   })
-  ipcMain.handle('save-file', (event, name, content) => {
-    return fs.promises.writeFile(
-      path.join(app.getPath('downloads'), name),
-      content,
-    )
+  ipcMain.handle('save-file', async (event, name, content) => {
+    const file = path.join(app.getPath('downloads'), name)
+    await fs.promises.writeFile(file, content)
+    return file
   })
   let watcherCollections = new WeakMap<WebContents, Map<string, any>>()
   ipcMain.handle('get-ref:file', (event, file: string) => {

src/renderer/compositions/shell.ts

@@ -67,6 +67,12 @@ export async function confirmClosing() {
   return response === 0
 }
 
+function getFileOpener(file: string) {
+  const ext = path.extname(file).toLowerCase()
+  const openers = commas.proxy.context.getCollection('terminal.file-opener')
+  return openers.find(item => item.extensions.includes(ext))
+}
+
 /**
  * {@link https://en.wikipedia.org/wiki/Quick_Look#Supported_file_types_by_default}
  */
@@ -113,6 +119,10 @@ const QUICK_LOOK_EXTENSIONS = [
 ]
 
 export function openFile(file: string) {
+  const opener = getFileOpener(file)
+  if (opener) {
+    return opener.handler(file)
+  }
   if (process.platform === 'darwin') {
     const ext = path.extname(file).toLowerCase()
     if (QUICK_LOOK_EXTENSIONS.includes(ext)) {
@@ -122,6 +132,14 @@ export function openFile(file: string) {
   return globalHandler.invoke('global-renderer:open-file', file)
 }
 
+export async function addFile(file: string) {
+  const opener = getFileOpener(file)
+  if (opener) {
+    return opener.handler(file)
+  }
+  return globalHandler.invoke('global-renderer:add-file', file)
+}
+
 export function showFileExternally(file: string) {
   return ipcRenderer.invoke('show-file', file)
 }
@@ -134,10 +152,6 @@ export function openFileExternally(file: string) {
   return ipcRenderer.invoke('open-path', file)
 }
 
-export async function addFile(file: string) {
-  return ipcRenderer.invoke('open-file', file)
-}
-
 export function showDirectory(file: string) {
   return globalHandler.invoke('global-renderer:show-directory', file)
 }
@@ -172,15 +186,8 @@ export function handleShellMessages() {
   ipcRenderer.on('before-quit', () => {
     willQuit = true
   })
-  const openers = commas.proxy.context.getCollection('terminal.file-opener')
   ipcRenderer.on('add-file', (event, file) => {
-    const ext = path.extname(file).toLowerCase()
-    const opener = openers.find(item => item.extensions.includes(ext))
-    if (opener) {
-      opener.handler(file)
-    } else {
-      globalHandler.invoke('global-renderer:add-file', file)
-    }
+    return addFile(file)
   })
   globalHandler.handle('global-renderer:open-file', (file) => {
     return showFileExternally(file)
@@ -194,4 +201,7 @@ export function handleShellMessages() {
   globalHandler.handle('global-renderer:open-url', (url) => {
     return openURLExternally(url)
   })
+  globalHandler.handle('global-renderer:add-file', (file) => {
+    // pass
+  })
 }

src/renderer/compositions/terminal.ts

@@ -20,7 +20,6 @@ import { ipcRenderer } from '@commas/electron-ipc'
 import type { KeyBindingCommand, MenuItem } from '@commas/types/menu'
 import type { ReadonlyTerminalTabAddons, TerminalContext, TerminalTab, TerminalTabCharacter, TerminalTabCharacterCommand } from '@commas/types/terminal'
 import * as commas from '../../api/core-renderer'
-import { globalHandler } from '../../shared/handler'
 import { createIDGenerator } from '../../shared/helper'
 import { openContextMenu } from '../utils/frame'
 import { translate } from '../utils/i18n'
@@ -1123,7 +1122,4 @@ export function handleTerminalMessages() {
       ?? []
     return count ? commands.slice(0 - count) : commands
   })
-  globalHandler.handle('global-renderer:add-file', (file) => {
-    // pass
-  })
 }