open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add trim option to Script Extension. Fix #295

Browse Source
This commit is contained in:
Federico Terzi 2020-06-09 20:53:24 +02:00
parent fe745ae815
commit 7d694494e5
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/extension/script.rs
View File

@ -88,7 +88,7 @@ impl super::Extension for ScriptExtension {
match output {
Ok(output) => {
let output_str = String::from_utf8_lossy(output.stdout.as_slice());
let mut output_str = String::from_utf8_lossy(output.stdout.as_slice()).to_string();
let error_str = String::from_utf8_lossy(output.stderr.as_slice());
let error_str = error_str.to_string();
let error_str = error_str.trim();
@ -98,7 +98,20 @@ impl super::Extension for ScriptExtension {
warn!("Script command reported error: \n{}", error_str);
}
return Some(output_str.into_owned());
// If specified, trim the output
let trim_opt = params.get(&Value::from("trim"));
let should_trim = if let Some(value) = trim_opt {
let val = value.as_bool();
val.unwrap_or(true)
}else{
true
};
if should_trim {
output_str = output_str.trim().to_owned()
}
return Some(output_str);
}
Err(e) => {
error!("Could not execute script '{:?}', error: {}", args, e);
@ -129,6 +142,26 @@ mod tests {
let extension = ScriptExtension::new();
let output = extension.calculate(&params, &vec![]);
assert!(output.is_some());
assert_eq!(output.unwrap(), "hello world");
}
#[test]
#[cfg(not(target_os = "windows"))]
fn test_script_basic_no_trim() {
let mut params = Mapping::new();
params.insert(
Value::from("args"),
Value::from(vec!["echo", "hello world"]),
);
params.insert(
Value::from("trim"),
Value::from(false),
);
let extension = ScriptExtension::new();
let output = extension.calculate(&params, &vec![]);
assert!(output.is_some());
assert_eq!(output.unwrap(), "hello world\n");
}
@ -146,7 +179,7 @@ mod tests {
let output = extension.calculate(&params, &vec!["jon".to_owned()]);
assert!(output.is_some());
assert_eq!(output.unwrap(), "hello world\n");
assert_eq!(output.unwrap(), "hello world");
}
#[test]
@ -163,6 +196,6 @@ mod tests {
let output = extension.calculate(&params, &vec!["jon".to_owned()]);
assert!(output.is_some());
assert_eq!(output.unwrap(), "hello world jon\n");
assert_eq!(output.unwrap(), "hello world jon");
}
}