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

feat: more conditionals

Browse source
This commit is contained in:
iff 2023-07-31 10:20:06 +02:00
parent 6b4d926dde
commit 9ebe08ad64
4 changed files with 56 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/corrections.rs
View file

@ -6,25 +6,25 @@ use crate::shell::{command_output, PRIVILEGE_LIST};
use crate::style::highlight_difference;
pub fn correct_command(shell: &str, last_command: &str) -> Option<String> {
let command_output = command_output(shell, last_command);
let err = command_output(shell, last_command);
let split_command = last_command.split_whitespace().collect::<Vec<&str>>();
let command = match PRIVILEGE_LIST.contains(&split_command[0]) {
let executable = match PRIVILEGE_LIST.contains(&split_command[0]) {
true => split_command.get(1).expect("No command found."),
false => split_command.first().expect("No command found."),
};
if !PRIVILEGE_LIST.contains(command) {
let suggest = match_pattern("privilege", &command_output);
if !PRIVILEGE_LIST.contains(executable) {
let suggest = match_pattern("privilege", last_command, &err);
if let Some(suggest) = suggest {
let suggest = eval_suggest(&suggest, last_command);
return Some(suggest);
}
}
let suggest = match_pattern(command, &command_output);
let suggest = match_pattern(executable, last_command, &err);
if let Some(suggest) = suggest {
let suggest = eval_suggest(&suggest, last_command);
if PRIVILEGE_LIST.contains(command) {
if PRIVILEGE_LIST.contains(executable) {
return Some(format!("{} {}", split_command[0], suggest));
}
return Some(suggest);
@ -32,15 +32,15 @@ pub fn correct_command(shell: &str, last_command: &str) -> Option<String> {
None
}
fn match_pattern(command: &str, error_msg: &str) -> Option<String> {
fn match_pattern(executable: &str, command: &str, error_msg: &str) -> Option<String> {
let rules = parse_rules!("rules");
if rules.contains_key(command) {
let suggest = rules.get(command).unwrap();
if rules.contains_key(executable) {
let suggest = rules.get(executable).unwrap();
for (pattern, suggest) in suggest {
for pattern in pattern {
if error_msg.contains(pattern) {
for suggest in suggest {
if let Some(suggest) = check_suggest(suggest) {
if let Some(suggest) = check_suggest(suggest, command, error_msg) {
return Some(suggest);
}
}
@ -53,27 +53,38 @@ fn match_pattern(command: &str, error_msg: &str) -> Option<String> {
}
}
fn check_suggest(suggest: &str) -> Option<String> {
fn check_suggest(suggest: &str, command: &str, error_msg: &str) -> Option<String> {
if !suggest.starts_with('#') {
return Some(suggest.to_owned());
}
let lines = suggest.lines().collect::<Vec<&str>>();
let conditions = lines.first().unwrap();
let conditions = conditions.trim_matches(|c| c == '#' || c == '[' || c == ']');
let conditions = conditions.split(',').collect::<Vec<&str>>();
for condition in conditions {
let condition = condition.trim();
let (condition, arg) = condition.split_once('(').unwrap();
let arg = arg.trim_matches(|c| c == '(' || c == ')');
let conditions = lines.first().unwrap().trim().replacen("#", "", 1);
let conditions = conditions
.trim_start_matches('[')
.trim_end_matches(']');
let conditions = conditions
.split(",")
.collect::<Vec<&str>>() ;
if eval_condition(condition, arg) == false {
for condition in conditions {
let (mut condition, arg) = condition.split_once('(').unwrap();
condition = condition.trim();
let arg = arg.trim_matches(|c| c == '(' || c == ')');
let reverse = match condition.starts_with('!') {
true => {
condition = condition.trim_start_matches('!');
true
},
false => false,
};
if eval_condition(condition, arg, command, error_msg) == reverse {
return None;
}
}
Some(lines[1..].join("\n"))
}
fn eval_condition(condition: &str, arg: &str) -> bool {
fn eval_condition(condition: &str, arg: &str, command: &str, error_msg: &str) -> bool {
match condition {
"executable" => {
let output = std::process::Command::new("which")
@ -81,8 +92,14 @@ fn eval_condition(condition: &str, arg: &str) -> bool {
.output()
.expect("failed to execute process");
output.status.success()
}
_ => false,
},
"err_contains" => {
error_msg.contains(arg)
},
"cmd_contains" => {
command.contains(arg)
},
_ => unreachable!("Unknown condition when evaluation condition: {}", condition)
}
}