wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 13:52:55 +03:00
Code Issues Projects Releases Wiki Activity

wezterm.run_child_process is now async capable

Browse Source
This commit is contained in:
Wez Furlong 2020-10-07 08:51:54 -07:00
parent ccea650a93
commit c7f95cac72
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/Cargo.toml
View File

@ -12,7 +12,6 @@ vergen = "3"
[dev-dependencies]
pretty_env_logger = "0.4"
smol = "1.2"
[dependencies]
anyhow = "1.0"
@ -28,6 +27,7 @@ log = "0.4"
notify = "4.0"
portable-pty = { path = "../pty", features = ["serde_support"]}
serde = {version="1.0", features = ["rc", "derive"]}
smol = "1.2"
termwiz = { path = "../termwiz" }
toml = "0.5"
wezterm-term = { path = "../term", features=["use_serde"] }

7
config/src/lib.rs
View File

@ -724,10 +724,11 @@ impl Config {
let cfg: Self;
let lua = make_lua_context(p)?;
let config: mlua::Value = lua
.load(&s)
let config: mlua::Value = smol::block_on(
lua.load(&s)
.set_name(p.to_string_lossy().as_bytes())?
.eval()?;
.eval_async(),
)?;
cfg = luahelper::from_lua_value(config).with_context(|| {
format!(
"Error converting lua value returned by script {} to Config struct",

13
config/src/lua.rs
View File

@ -100,7 +100,10 @@ pub fn make_lua_context(config_dir: &Path) -> anyhow::Result<Lua> {
wezterm_mod.set("utf16_to_utf8", lua.create_function(utf16_to_utf8)?)?;
wezterm_mod.set("split_by_newlines", lua.create_function(split_by_newlines)?)?;
wezterm_mod.set("run_child_process", lua.create_function(run_child_process)?)?;
wezterm_mod.set(
"run_child_process",
lua.create_async_function(run_child_process)?,
)?;
wezterm_mod.set("on", lua.create_function(register_event)?)?;
wezterm_mod.set("emit", lua.create_async_function(emit_event)?)?;
@ -363,11 +366,11 @@ fn utf16_to_utf8<'lua>(_: &'lua Lua, text: mlua::String) -> mlua::Result<String>
String::from_utf16(wide).map_err(|e| mlua::Error::external(e))
}
fn run_child_process<'lua>(
async fn run_child_process<'lua>(
_: &'lua Lua,
args: Vec<String>,
) -> mlua::Result<(bool, BString, BString)> {
let mut cmd = std::process::Command::new(&args[0]);
let mut cmd = smol::process::Command::new(&args[0]);
if args.len() > 1 {
cmd.args(&args[1..]);
@ -375,11 +378,11 @@ fn run_child_process<'lua>(
#[cfg(windows)]
{
use std::os::windows::process::CommandExt;
use smol::process::windows::CommandExt;
cmd.creation_flags(winapi::um::winbase::CREATE_NO_WINDOW);
}
let output = cmd.output().map_err(|e| mlua::Error::external(e))?;
let output = cmd.output().await.map_err(|e| mlua::Error::external(e))?;
Ok((
output.status.success(),