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: merge captures

Browse source
This commit is contained in:
iff 2025-01-06 15:57:15 +01:00
parent bf16675d4e
commit 25e8f5875b
1 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

31
utils/src/evals.rs
View file

@ -5,15 +5,20 @@
use crate::files::*; use crate::files::*;
use regex_lite::Regex; use regex_lite::Regex;
pub fn opt_regex(regex: &str, command: &mut String) -> String { fn regex_captures(regex: &str, string: &str) -> Vec<String> {
let regex = Regex::new(regex).unwrap(); let regex = Regex::new(regex).unwrap();
let mut opts = Vec::new(); let mut caps = Vec::new();
for captures in regex.captures_iter(command) { for captures in regex.captures_iter(string) {
for cap in captures.iter().skip(1).flatten() { for cap in captures.iter().skip(1).flatten() {
opts.push(cap.as_str().to_owned()); caps.push(cap.as_str().to_owned());
} }
} }
caps
}
pub fn opt_regex(regex: &str, command: &mut String) -> String {
let opts = regex_captures(regex, command);
for opt in opts.clone() { for opt in opts.clone() {
*command = command.replace(&opt, ""); *command = command.replace(&opt, "");
@ -22,26 +27,12 @@ pub fn opt_regex(regex: &str, command: &mut String) -> String {
} }
pub fn err_regex(regex: &str, error_msg: &str) -> String { pub fn err_regex(regex: &str, error_msg: &str) -> String {
let regex = Regex::new(regex).unwrap(); let err = regex_captures(regex, error_msg);
let mut err = Vec::new();
for captures in regex.captures_iter(error_msg) {
for cap in captures.iter().skip(1).flatten() {
err.push(cap.as_str().to_owned());
}
}
err.join(" ") err.join(" ")
} }
pub fn cmd_regex(regex: &str, command: &str) -> String { pub fn cmd_regex(regex: &str, command: &str) -> String {
let regex = Regex::new(regex).unwrap(); let cmd = regex_captures(regex, command);
let mut cmd = Vec::new();
for captures in regex.captures_iter(command) {
for cap in captures.iter().skip(1).flatten() {
cmd.push(cap.as_str().to_owned());
}
}
cmd.join(" ") cmd.join(" ")
} }