technofab/pay-respects
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/pay-respects.git synced 2025-12-12 06:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: less nesting

Browse source
This commit is contained in:
iff 2024-09-25 18:30:03 +02:00
parent cfbe95493e
commit 2b6821b900
1 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/suggestions.rs
View file

@ -211,39 +211,40 @@ pub fn confirm_suggestion(shell: &str, command: &str, highlighted: &str) -> Resu
for p in PRIVILEGE_LIST { for p in PRIVILEGE_LIST {
let _p = p.to_owned() + " "; let _p = p.to_owned() + " ";
if command.starts_with(&_p) { if !command.starts_with(&_p) {
let command = command.replacen(p, "", 1); continue;
}
let command = command.replacen(&_p, "", 1);
let now = Instant::now(); let now = Instant::now();
let process = std::process::Command::new(p)
.arg(shell)
.arg("-c")
.arg(&command)
// .stdout(Stdio::inherit())
.stdout(stderr().as_fd().try_clone_to_owned().unwrap())
.stderr(Stdio::inherit())
.spawn()
.expect("failed to execute process")
.wait()
.unwrap();
if process.success() {
println!("{}", shell_evaluated_commands(&command));
return Ok(());
} else {
if now.elapsed() > Duration::from_secs(3) {
exit(1);
}
let process = std::process::Command::new(p) let process = std::process::Command::new(p)
.arg(shell) .arg(shell)
.arg("-c") .arg("-c")
.arg(&command) .arg(command)
// .stdout(Stdio::inherit()) .env("LC_ALL", "C")
.stdout(stderr().as_fd().try_clone_to_owned().unwrap()) .output()
.stderr(Stdio::inherit()) .expect("failed to execute process");
.spawn() let error_msg = String::from_utf8_lossy(&process.stderr);
.expect("failed to execute process") return Err(error_msg.to_string());
.wait()
.unwrap();
if process.success() {
println!("{}", shell_evaluated_commands(&command));
return Ok(());
} else {
if now.elapsed() > Duration::from_secs(3) {
exit(1);
}
let process = std::process::Command::new(p)
.arg(shell)
.arg("-c")
.arg(command)
.env("LC_ALL", "C")
.output()
.expect("failed to execute process");
let error_msg = String::from_utf8_lossy(&process.stderr);
return Err(error_msg.to_string());
}
} }
} }
@ -284,7 +285,7 @@ fn shell_evaluated_commands(command: &str) -> String {
.collect::<Vec<&str>>(); .collect::<Vec<&str>>();
let mut commands = Vec::new(); let mut commands = Vec::new();
for line in lines { for line in lines {
if line.starts_with("cd") { if line.starts_with("cd ") {
commands.push(line.to_string()); commands.push(line.to_string());
} }
} }