close sidecar on app quit

This commit is contained in:
FTCHD
2025-02-01 20:03:46 +02:00
parent 5fa341f44b
commit 5ac3ff7edb
3 changed files with 12 additions and 3 deletions
+2
View File
@@ -1,4 +1,5 @@
import { Menu, MenuItem, PredefinedMenuItem, Submenu } from '@tauri-apps/api/menu'
import { getCurrentWindow } from '@tauri-apps/api/window'
import { ask, message, open } from '@tauri-apps/plugin-dialog'
import { isPermissionGranted, requestPermission } from '@tauri-apps/plugin-notification'
import { sendNotification } from '@tauri-apps/plugin-notification'
@@ -334,6 +335,7 @@ export async function buildMenu() {
id: 'quit',
text: 'Quit',
action: async () => {
await getCurrentWindow().emit('close-app')
await exit(0)
},
})
+9 -2
View File
@@ -3,6 +3,7 @@ import { ask, message } from '@tauri-apps/plugin-dialog'
import { debug, error, info, trace, warn } from '@tauri-apps/plugin-log'
import { platform } from '@tauri-apps/plugin-os'
import { exit } from '@tauri-apps/plugin-process'
import type { Command } from '@tauri-apps/plugin-shell'
import { validateLicense } from './lib/license'
import { listRemotes } from './lib/rclone/api'
import { initRclone } from './lib/rclone/init'
@@ -113,7 +114,7 @@ async function startRclone() {
const rcloneCommandFn = rclone.system || rclone.internal
const command = await rcloneCommandFn([
const command = (await rcloneCommandFn([
'rcd',
...(platform() === 'macos'
? ['--rc-no-auth'] // webkit doesn't allow for credentials in the url
@@ -122,7 +123,7 @@ async function startRclone() {
// defaults
// '-rc-addr',
// ':5572',
])
])) as Command<string>
// command.stdout.on('data', (line) => {
// console.log('stdout ' + line)
@@ -150,6 +151,12 @@ async function startRclone() {
console.log('running rclone')
const childProcess = await command.spawn()
getCurrentWindow().listen('close-app', async (e) => {
console.log('(main) window close-app requested')
await childProcess.kill()
})
await new Promise((resolve) => setTimeout(resolve, 200))
useStore.setState({ rcloneLoaded: true })
+1 -1
View File
@@ -61,7 +61,7 @@
"icons/favicon/frame_17_delay-0.1s.png"
],
"category": "Utility",
"copyright": "FarFetched",
"copyright": "Copyright © 2025 Rclone UI.",
"macOS": {
"dmg": {
"appPosition": {