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

feat: auto adapt suggestion to shell syntax

Browse source
This commit is contained in:
iff 2024-11-18 13:11:13 +01:00
parent 171b3d4607
commit 8f9aac6bdc
3 changed files with 47 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/suggestions.rs
View file

@ -8,7 +8,7 @@ use regex_lite::Regex;
use crate::files::{get_best_match_file, get_path_files};
use crate::rules::match_pattern;
use crate::shell::{expand_alias_multiline, PRIVILEGE_LIST};
use crate::shell::{expand_alias_multiline, shell_evaluated_commands, PRIVILEGE_LIST};
pub fn suggest_command(shell: &str, last_command: &str, error_msg: &str) -> Option<String> {
let split_command = split_command(last_command);
@ -237,8 +237,10 @@ pub fn confirm_suggestion(shell: &str, command: &str, highlighted: &str) -> Resu
.unwrap();
if process.success() {
println!("{}", shell_evaluated_commands(&command));
return Ok(());
let cd = shell_evaluated_commands(shell, &command);
if let Some(cd) = cd {
println!("{}", cd);
}
} else {
if now.elapsed() > Duration::from_secs(3) {
exit(1);
@ -272,7 +274,10 @@ pub fn confirm_suggestion(shell: &str, command: &str, highlighted: &str) -> Resu
.unwrap();
if process.success() {
println!("{}", shell_evaluated_commands(&command));
let cd = shell_evaluated_commands(shell, &command);
if let Some(cd) = cd {
println!("{}", cd);
}
Ok(())
} else {
if now.elapsed() > Duration::from_secs(3) {
@ -291,18 +296,3 @@ pub fn confirm_suggestion(shell: &str, command: &str, highlighted: &str) -> Resu
Err(error_msg.to_string())
}
}
fn shell_evaluated_commands(command: &str) -> String {
let lines = command
.lines()
.map(|line| line.trim().trim_end_matches(['\\', ';', '|', '&']))
.collect::<Vec<&str>>();
let mut commands = Vec::new();
for line in lines {
if line.starts_with("cd ") {
commands.push(line.to_string());
}
}
commands.join(" && \\ \n")
}