feat: fuzzy search not found commands

This commit is contained in:
iff 2023-07-31 18:46:35 +02:00
parent 86ae6a6fb4
commit 135abc75b6
5 changed files with 177 additions and 27 deletions

10
rules/no_command.toml Normal file
View file

@ -0,0 +1,10 @@
command = "no_command"
[[match_err]]
pattern = [
"command not found"
]
suggest = [
'''
{{typo[0](path)}} {{command[1:]}}'''
]

View file

@ -22,10 +22,13 @@ pub fn handle_args() {
"nu" | "nush" | "nushell" => { "nu" | "nush" | "nushell" => {
last_command = "(history | last).command"; last_command = "(history | last).command";
alias = "\"\""; alias = "\"\"";
println!("with-env {{ _PR_LAST_COMMAND : {},\ println!(
"with-env {{ _PR_LAST_COMMAND : {},\
_PR_ALIAS : {},\ _PR_ALIAS : {},\
_PR_SHELL : {} }} \ _PR_SHELL : nu }} \
{{ {} }}", last_command, alias, "nu", binary_path); {{ {} }}",
last_command, alias, binary_path
);
std::process::exit(0); std::process::exit(0);
} }
_ => { _ => {

View file

@ -29,6 +29,12 @@ pub fn correct_command(shell: &str, last_command: &str) -> Option<String> {
} }
return Some(suggest); return Some(suggest);
} }
let suggest = match_pattern("no_command", last_command, &err);
if let Some(suggest) = suggest {
let suggest = eval_suggest(&suggest, last_command);
return Some(suggest);
}
None None
} }
@ -57,9 +63,16 @@ fn check_suggest(suggest: &str, command: &str, error_msg: &str) -> Option<String
if !suggest.starts_with('#') { if !suggest.starts_with('#') {
return Some(suggest.to_owned()); return Some(suggest.to_owned());
} }
let lines = suggest.lines().collect::<Vec<&str>>(); let mut lines = suggest.lines().collect::<Vec<&str>>();
let conditions = lines.first().unwrap().trim().replacen('#', "", 1); let conditions = lines.first().unwrap().trim().replacen('#', "", 1);
let conditions = conditions.trim_start_matches('[').trim_end_matches(']'); let mut conditions = conditions.trim_start_matches('[').to_string();
for (i, line) in lines[1..].iter().enumerate() {
conditions.push_str(line);
if line.ends_with(']') {
lines = lines[i + 1..].to_vec();
break;
}
}
let conditions = conditions.split(',').collect::<Vec<&str>>(); let conditions = conditions.split(',').collect::<Vec<&str>>();
for condition in conditions { for condition in conditions {
@ -91,6 +104,7 @@ fn eval_condition(condition: &str, arg: &str, command: &str, error_msg: &str) ->
} }
"err_contains" => error_msg.contains(arg), "err_contains" => error_msg.contains(arg),
"cmd_contains" => command.contains(arg), "cmd_contains" => command.contains(arg),
"match_typo_command" => false,
_ => unreachable!("Unknown condition when evaluation condition: {}", condition), _ => unreachable!("Unknown condition when evaluation condition: {}", condition),
} }
} }
@ -103,33 +117,154 @@ fn eval_suggest(suggest: &str, last_command: &str) -> String {
while suggest.contains("{{command") { while suggest.contains("{{command") {
let placeholder_start = "{{command"; let placeholder_start = "{{command";
let placeholder_end = "}}"; let placeholder_end = "}}";
let placeholder = suggest.find(placeholder_start).unwrap()
..suggest.find(placeholder_end).unwrap() + placeholder_end.len();
let start_index = suggest.find(placeholder_start).unwrap();
let end_index = suggest[start_index..].find(placeholder_end).unwrap()
+ start_index
+ placeholder_end.len();
let placeholder = start_index + placeholder_start.len()..end_index - placeholder_end.len();
let range = suggest[placeholder.to_owned()].trim_matches(|c| c == '[' || c == ']'); let range = suggest[placeholder.to_owned()].trim_matches(|c| c == '[' || c == ']');
if let Some((start, end)) = range.split_once(':') { if let Some((start, end)) = range.split_once(':') {
let start = match start {
"" => 0,
_ => start.parse::<usize>().unwrap(),
};
let end = match end {
"" => last_command.split_whitespace().count(),
_ => end.parse::<usize>().unwrap(),
};
let split_command = last_command.split_whitespace().collect::<Vec<&str>>(); let split_command = last_command.split_whitespace().collect::<Vec<&str>>();
let start = start.parse::<usize>().unwrap_or(0);
let end = end.parse::<usize>().unwrap_or(split_command.len() - 1) + 1;
let command = split_command[start..end].join(" "); let command = split_command[start..end].join(" ");
suggest = suggest.replace(&suggest[placeholder], &command);
// let command = match start == end {
// true => split_command[start].to_owned(),
// false => split_command[start..end].join(" ")
// };
suggest = suggest.replace(&suggest[start_index..end_index], &command);
} else { } else {
let range = range.parse::<usize>().unwrap(); let range = range.parse::<usize>().unwrap_or(0);
let split_command = last_command.split_whitespace().collect::<Vec<&str>>(); let split_command = suggest.split_whitespace().collect::<Vec<&str>>();
let command = split_command[range].to_owned(); let command = split_command[range].to_owned();
suggest = suggest.replace(&suggest[placeholder], &command); suggest = suggest.replace(&suggest[start_index..end_index], &command);
} }
} }
while suggest.contains("{{typo") {
let placeholder_start = "{{typo";
let placeholder_end = "}}";
let start_index = suggest.find(placeholder_start).unwrap();
let end_index = suggest[start_index..].find(placeholder_end).unwrap()
+ start_index
+ placeholder_end.len();
let placeholder = start_index + placeholder_start.len()..end_index - placeholder_end.len();
let mut command_index = 0;
let mut match_list = vec![];
if suggest.contains('[') {
let split = suggest[placeholder.to_owned()]
.split(&['[', ']'])
.collect::<Vec<&str>>();
command_index = split[1].parse::<usize>().unwrap();
}
if suggest.contains('(') {
let split = suggest[placeholder.to_owned()]
.split(&['(', ')'])
.collect::<Vec<&str>>();
match_list = split[1].split(',').collect::<Vec<&str>>();
}
let command = last_command.split_whitespace().collect::<Vec<&str>>()[command_index];
let match_list = match_list
.iter()
.map(|s| s.to_string())
.collect::<Vec<String>>();
let suggestion = suggest_typo(command, match_list.clone());
suggest = suggest.replace(&suggest[start_index..end_index], &suggestion);
}
suggest suggest
} }
fn suggest_typo(typo: &str, candidates: Vec<String>) -> String {
let mut suggestion = typo.to_owned();
if candidates.len() == 1 {
match candidates[0].as_str() {
"path" => {
let path_files = get_path_files();
if let Some(suggest) = find_fimilar(typo, path_files) {
suggestion = suggest;
}
}
"file" => {
unimplemented!();
}
_ => {}
}
} else if let Some(suggest) = find_fimilar(typo, candidates) {
suggestion = suggest;
}
suggestion
}
fn get_path_files() -> Vec<String> {
let path = std::env::var("PATH").unwrap();
let path = path.split(':').collect::<Vec<&str>>();
// get all executable files in $PATH
let mut all_executable = vec![];
for p in path {
let files = match std::fs::read_dir(p) {
Ok(files) => files,
Err(_) => continue,
};
for file in files {
let file = file.unwrap();
let file_name = file.file_name().into_string().unwrap();
all_executable.push(file_name);
}
}
all_executable
}
fn find_fimilar(typo: &str, candidates: Vec<String>) -> Option<String> {
let mut min_distance = 10;
let mut min_distance_index = None;
for (i, candidate) in candidates.iter().enumerate() {
let distance = compare_string(typo, candidate);
if distance < min_distance {
min_distance = distance;
min_distance_index = Some(i);
}
}
if let Some(min_distance_index) = min_distance_index {
return Some(candidates[min_distance_index].to_string());
}
None
}
// warning disable
#[allow(clippy::needless_range_loop)]
fn compare_string(a: &str, b: &str) -> usize {
let mut matrix = vec![vec![0; b.chars().count() + 1]; a.chars().count() + 1];
for i in 0..a.chars().count() + 1 {
matrix[i][0] = i;
}
for j in 0..b.chars().count() + 1 {
matrix[0][j] = j;
}
for (i, ca) in a.chars().enumerate() {
for (j, cb) in b.chars().enumerate() {
let cost = if ca == cb { 0 } else { 1 };
matrix[i + 1][j + 1] = std::cmp::min(
std::cmp::min(matrix[i][j + 1] + 1, matrix[i + 1][j] + 1),
matrix[i][j] + cost,
);
}
}
matrix[a.chars().count()][b.chars().count()]
}
pub fn confirm_correction(shell: &str, command: &str, last_command: &str) { pub fn confirm_correction(shell: &str, command: &str, last_command: &str) {
println!( println!(
"Did you mean {}?", "Did you mean {}?",

View file

@ -18,7 +18,10 @@ fn main() {
if let Some(corrected_command) = corrected_command { if let Some(corrected_command) = corrected_command {
corrections::confirm_correction(&shell, &corrected_command, &last_command); corrections::confirm_correction(&shell, &corrected_command, &last_command);
} else { } else {
println!("No correction found for the command: {}\n", last_command.red().bold()); println!(
"No correction found for the command: {}\n",
last_command.red().bold()
);
println!("If you think there should be a correction, please open an issue or send a pull request!"); println!("If you think there should be a correction, please open an issue or send a pull request!");
} }
} }

View file

@ -1,4 +1,4 @@
use std::{process::exit}; use std::process::exit;
pub const PRIVILEGE_LIST: [&str; 2] = ["sudo", "doas"]; pub const PRIVILEGE_LIST: [&str; 2] = ["sudo", "doas"];
@ -45,12 +45,11 @@ pub fn last_command_expanded_alias(shell: &str) -> String {
} }
let split_command = last_command.split_whitespace().collect::<Vec<&str>>(); let split_command = last_command.split_whitespace().collect::<Vec<&str>>();
let command; let command = if PRIVILEGE_LIST.contains(&split_command[0]) {
if PRIVILEGE_LIST.contains(&split_command[0]) { split_command[1]
command = split_command[1];
} else { } else {
command = split_command[0]; split_command[0]
} };
let mut expanded_command = command.to_string(); let mut expanded_command = command.to_string();