From 25e8f5875b1e3463f62d58f4504a5f02a229c4f9 Mon Sep 17 00:00:00 2001
From: iff <iff@ik.me>
Date: Mon, 6 Jan 2025 15:57:15 +0100
Subject: [PATCH] refactor: merge captures

---
 utils/src/evals.rs | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/utils/src/evals.rs b/utils/src/evals.rs
index 43addf8..bea2b29 100644
--- a/utils/src/evals.rs
+++ b/utils/src/evals.rs
@@ -5,15 +5,20 @@
 use crate::files::*;
 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 mut opts = Vec::new();
-	for captures in regex.captures_iter(command) {
+	let mut caps = Vec::new();
+	for captures in regex.captures_iter(string) {
 		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() {
 		*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 {
-	let regex = Regex::new(regex).unwrap();
-
-	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());
-		}
-	}
+	let err = regex_captures(regex, error_msg);
 	err.join(" ")
 }
 
 pub fn cmd_regex(regex: &str, command: &str) -> String {
-	let regex = Regex::new(regex).unwrap();
-
-	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());
-		}
-	}
+	let cmd = regex_captures(regex, command);
 	cmd.join(" ")
 }