pogmommy/eww
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix unnumbered placeholders not working in commands

Browse source
This commit is contained in:
elkowar 2022-04-24 16:01:53 +02:00
parent 6b7fa5d55c
commit 1daeb0c77a
No known key found for this signature in database
GPG key ID: E321AD71B1D1F27F
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
crates/eww/src/widgets/mod.rs
View file

@ -16,17 +16,8 @@ where
T: 'static + std::fmt::Display + Send + Sync + Clone,
{
use wait_timeout::ChildExt;
let args = args.to_vec();
let cmd = cmd.to_string();
let cmd = replace_placeholders(cmd, args);
std::thread::spawn(move || {
let cmd = if !args.is_empty() {
args.iter()
.enumerate()
.fold(cmd.to_string(), |acc, (i, arg)| acc.replace(&format!("{{{}}}", i), &format!("{}", arg)))
.replace("{{}}", &format!("{}", args[0]))
} else {
cmd
};
log::debug!("Running command from widget: {}", cmd);
let child = Command::new("/bin/sh").arg("-c").arg(&cmd).spawn();
match child {
@ -44,3 +35,28 @@ where
}
});
}
fn replace_placeholders<T>(cmd: &str, args: &[T]) -> String
where
T: 'static + std::fmt::Display + Send + Sync + Clone,
{
if !args.is_empty() {
let cmd = cmd.replace("{}", &format!("{}", args[0]));
args.iter().enumerate().fold(cmd.to_string(), |acc, (i, arg)| acc.replace(&format!("{{{}}}", i), &format!("{}", arg)))
} else {
cmd.to_string()
}
}
#[cfg(test)]
mod test {
use super::*;
#[test]
fn test_replace_placeholders() {
assert_eq!("foo", replace_placeholders("foo", &[""]),);
assert_eq!("foo hi", replace_placeholders("foo {}", &["hi"]),);
assert_eq!("foo hi", replace_placeholders("foo {}", &["hi", "ho"]),);
assert_eq!("bar foo baz", replace_placeholders("{0} foo {1}", &["bar", "baz"]),);
assert_eq!("baz foo bar", replace_placeholders("{1} foo {0}", &["bar", "baz"]),);
}
}