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

refactor: reuse executable list

Browse source
This commit is contained in:
iff 2024-12-07 17:14:47 +01:00
parent 0ab8f269a1
commit f47bf23f6a
7 changed files with 35 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/runtime_rules.rs
View file

@ -25,6 +25,7 @@ pub fn runtime_match(executable: &str, data: &mut Data) {
let shell = &data.shell.clone();
let last_command = &data.command.clone();
let error_msg = &data.error.clone();
let executables = &data.get_executables().clone();
let mut pure_suggest;
@ -66,6 +67,7 @@ pub fn runtime_match(executable: &str, data: &mut Data) {
last_command,
error_msg,
split_command,
data,
) == reverse
{
continue 'suggest;
@ -84,6 +86,7 @@ pub fn runtime_match(executable: &str, data: &mut Data) {
&pure_suggest,
last_command,
error_msg,
executables,
shell,
));
}
@ -99,9 +102,10 @@ fn eval_condition(
last_command: &str,
error_msg: &str,
split_command: &[String],
data: &mut Data
) -> bool {
match condition {
"executable" => check_executable(shell, arg),
"executable" => data.has_executable(arg),
"err_contains" => error_msg.contains(arg),
"cmd_contains" => last_command.contains(arg),
"min_length" => split_command.len() >= arg.parse::<usize>().unwrap(),
@ -112,7 +116,7 @@ fn eval_condition(
}
}
fn eval_suggest(suggest: &str, last_command: &str, error_msg: &str, shell: &str) -> String {
fn eval_suggest(suggest: &str, last_command: &str, error_msg: &str, executables: &[String], shell: &str) -> String {
let mut suggest = suggest.to_owned();
if suggest.contains("{{command}}") {
suggest = suggest.replace("{{command}}", "{last_command}");
@ -128,7 +132,7 @@ fn eval_suggest(suggest: &str, last_command: &str, error_msg: &str, shell: &str)
replaces::err(&mut suggest, error_msg);
replaces::command(&mut suggest, &split_command);
replaces::shell(&mut suggest, shell);
replaces::typo(&mut suggest, &split_command, shell);
replaces::typo(&mut suggest, &split_command, executables, shell);
for (tag, value) in opt_list {
suggest = suggest.replace(&tag, &value);