diff --git a/config/src/open/opener.rs b/config/src/open/opener.rs index b813c04d..e20a5fe5 100644 --- a/config/src/open/opener.rs +++ b/config/src/open/opener.rs @@ -4,6 +4,7 @@ use serde::{Deserialize, Deserializer}; pub struct Opener { pub exec: String, pub block: bool, + pub orphan: bool, pub display_name: String, pub spread: bool, } @@ -18,6 +19,8 @@ impl<'de> Deserialize<'de> for Opener { pub exec: String, #[serde(default)] pub block: bool, + #[serde(default)] + pub orphan: bool, pub display_name: Option, } @@ -32,6 +35,6 @@ impl<'de> Deserialize<'de> for Opener { .unwrap_or_else(|| shadow.exec.split_whitespace().next().unwrap().to_string()); let spread = shadow.exec.contains("$*") || shadow.exec.contains("$@"); - Ok(Self { exec: shadow.exec, block: shadow.block, display_name, spread }) + Ok(Self { exec: shadow.exec, block: shadow.block, orphan: shadow.orphan, display_name, spread }) } } diff --git a/core/src/external/shell.rs b/core/src/external/shell.rs index c3621ae5..a0eaea75 100644 --- a/core/src/external/shell.rs +++ b/core/src/external/shell.rs @@ -4,9 +4,10 @@ use anyhow::Result; use tokio::process::{Child, Command}; pub struct ShellOpt { - pub cmd: OsString, - pub args: Vec, - pub piped: bool, + pub cmd: OsString, + pub args: Vec, + pub piped: bool, + pub orphan: bool, } pub fn shell(opt: ShellOpt) -> Result { @@ -21,7 +22,7 @@ pub fn shell(opt: ShellOpt) -> Result { .stdin(if opt.piped { Stdio::piped() } else { Stdio::inherit() }) .stdout(if opt.piped { Stdio::piped() } else { Stdio::inherit() }) .stderr(if opt.piped { Stdio::piped() } else { Stdio::inherit() }) - .kill_on_drop(true) + .kill_on_drop(!opt.orphan) .spawn()?, ) } diff --git a/core/src/manager/manager.rs b/core/src/manager/manager.rs index e8e8f881..373c418e 100644 --- a/core/src/manager/manager.rs +++ b/core/src/manager/manager.rs @@ -259,9 +259,10 @@ impl Manager { emit!(Stop(true)).await; let mut child = external::shell(ShellOpt { - cmd: (*opener.exec).into(), - args: vec![tmp.to_owned().into()], - piped: false, + cmd: (*opener.exec).into(), + args: vec![tmp.to_owned().into()], + piped: false, + orphan: false, })?; child.wait().await?; diff --git a/core/src/manager/tab.rs b/core/src/manager/tab.rs index 4e5971c1..0b124a64 100644 --- a/core/src/manager/tab.rs +++ b/core/src/manager/tab.rs @@ -379,7 +379,7 @@ impl Tab { emit!(Open( selected, - Some(Opener { exec, block, display_name: Default::default(), spread: true }) + Some(Opener { exec, block, orphan: false, display_name: Default::default(), spread: true }) )); }); diff --git a/core/src/tasks/scheduler.rs b/core/src/tasks/scheduler.rs index 7e319a2e..d48f1002 100644 --- a/core/src/tasks/scheduler.rs +++ b/core/src/tasks/scheduler.rs @@ -310,6 +310,7 @@ impl Scheduler { cmd: opener.exec.into(), args, block: opener.block, + orphan: opener.orphan, cancel: cancel_tx, }) .await diff --git a/core/src/tasks/workers/process.rs b/core/src/tasks/workers/process.rs index 3fade197..b5f04ac6 100644 --- a/core/src/tasks/workers/process.rs +++ b/core/src/tasks/workers/process.rs @@ -16,6 +16,7 @@ pub(crate) struct ProcessOpOpen { pub cmd: OsString, pub args: Vec, pub block: bool, + pub orphan: bool, pub cancel: oneshot::Sender<()>, } @@ -29,11 +30,12 @@ impl Process { fn done(&self, id: usize) -> Result<()> { Ok(self.sch.send(TaskOp::Done(id))?) } pub(crate) async fn open(&self, mut task: ProcessOpOpen) -> Result<()> { + let opt = ShellOpt { cmd: task.cmd, args: task.args, piped: true, orphan: task.orphan }; if task.block { let _guard = BLOCKER.acquire().await.unwrap(); emit!(Stop(true)).await; - match external::shell(ShellOpt { cmd: task.cmd, args: task.args, piped: false }) { + match external::shell(ShellOpt { piped: false, ..opt }) { Ok(mut child) => { child.wait().await.ok(); } @@ -48,13 +50,16 @@ impl Process { } self.sch.send(TaskOp::New(task.id, 0))?; - let mut child = external::shell(ShellOpt { cmd: task.cmd, args: task.args, piped: true })?; + let mut child = external::shell(opt)?; let mut stdout = BufReader::new(child.stdout.take().unwrap()).lines(); let mut stderr = BufReader::new(child.stderr.take().unwrap()).lines(); loop { select! { - _ = task.cancel.closed() => break, + _ = task.cancel.closed() => { + child.start_kill().ok(); + break; + } Ok(Some(line)) = stdout.next_line() => { self.log(task.id, line)?; }