Merge pull request #18 from aaronriekenberg/autoregex

autoregex to main

Author: aaronriekenberg

src/parser.rs

@@ -53,6 +53,7 @@ pub struct Parsers {
 impl Parsers {
     pub fn new(command_line_args: &'static CommandLineArgs) -> anyhow::Result<Self> {
         let regex_processor = RegexProcessor::new(command_line_args)?;
+
         Ok(Self {
             buffered_input_line_parser: OnceCell::new(),
             regex_processor,

src/parser/buffered.rs

@@ -59,8 +59,10 @@ impl BufferedInputLineParser {
 
             cmd_and_args
         } else {
-            self.regex_processor
-                .apply_regex_to_arguments(&self.command_and_initial_arguments, input_line)?
+            let apply_regex_result = self
+                .regex_processor
+                .apply_regex_to_arguments(&self.command_and_initial_arguments, input_line)?;
+            apply_regex_result.arguments
         };
 
         super::build_owned_command_and_args(&self.shell_command_and_args, cmd_and_args)

src/parser/command_line.rs

@@ -70,19 +70,22 @@ impl CommandLineArgsParser {
     }
 
     fn parse_argument_group(&self, argument_group: Vec<String>) -> Option<OwnedCommandAndArgs> {
+        let first_command_and_args = &self.argument_groups.first_command_and_args;
+
         let cmd_and_args = if !self.regex_processor.regex_mode() {
-            [
-                self.argument_groups.first_command_and_args.clone(),
-                argument_group,
-            ]
-            .concat()
+            [first_command_and_args.clone(), argument_group].concat()
         } else {
             let input_line = argument_group.join(" ");
 
-            self.regex_processor.apply_regex_to_arguments(
-                &self.argument_groups.first_command_and_args,
-                &input_line,
-            )?
+            let apply_regex_result = self
+                .regex_processor
+                .apply_regex_to_arguments(first_command_and_args, &input_line)?;
+
+            if apply_regex_result.modified_arguments {
+                apply_regex_result.arguments
+            } else {
+                [first_command_and_args.clone(), argument_group].concat()
+            }
         };
 
         super::build_owned_command_and_args(&self.shell_command_and_args, cmd_and_args)
@@ -455,4 +458,58 @@ mod test {
             ]
         );
     }
+
+    #[test]
+    fn test_auto_regex() {
+        let command_line_args = CommandLineArgs {
+            command_and_initial_arguments: [
+                "echo", "got", "arg1={1}", "arg2={2}", ":::", "foo", "bar", ":::", "baz", "qux",
+            ]
+            .into_iter()
+            .map_into()
+            .collect(),
+            ..Default::default()
+        };
+
+        let parser = CommandLineArgsParser::new(
+            &command_line_args,
+            &RegexProcessor::new(&command_line_args).unwrap(),
+        );
+
+        let result = collect_into_vec(parser);
+
+        assert_eq!(
+            result,
+            vec![
+                OwnedCommandAndArgs {
+                    command_path: PathBuf::from("echo"),
+                    args: ["got", "arg1=foo", "arg2=baz"]
+                        .into_iter()
+                        .map_into()
+                        .collect(),
+                },
+                OwnedCommandAndArgs {
+                    command_path: PathBuf::from("echo"),
+                    args: ["got", "arg1=foo", "arg2=qux"]
+                        .into_iter()
+                        .map_into()
+                        .collect(),
+                },
+                OwnedCommandAndArgs {
+                    command_path: PathBuf::from("echo"),
+                    args: ["got", "arg1=bar", "arg2=baz"]
+                        .into_iter()
+                        .map_into()
+                        .collect(),
+                },
+                OwnedCommandAndArgs {
+                    command_path: PathBuf::from("echo"),
+                    args: ["got", "arg1=bar", "arg2=qux"]
+                        .into_iter()
+                        .map_into()
+                        .collect(),
+                },
+            ]
+        );
+    }
 }