refactored cmd_rediraction, using match instead of if else

bexxmodd · Jul 22, 2021 · 3e5f47f · 3e5f47f
1 parent 0007c3f
commit 3e5f47f
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 31 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -181,36 +181,33 @@ pub fn redirect_cmd_execution(cmd_line: &mut Tokenizer) -> Result<process::Comma
     proc.args(&args[1..]);
 
     loop {
-        if cmd_line.peek().eq("<") {
-            assert_eq!("<".to_string(), cmd_line.next().unwrap());
-            redirection_count[0] += 1;
-
-            // retrieve file name if file/directory doesn't
-            // exist notify user and restart the shell
-            if let Some(name) = cmd_line.next() {
-                // redirect stdin from a given file
-                match open_stdin_file(&name) {
-                    Ok(f) => proc.stdin(f),
-                    Err(e) => return Err(e),
-                };
-            };
-        }
-
-        if cmd_line.peek().eq(">") {
-            assert_eq!(">".to_string(), cmd_line.next().unwrap());
-            redirection_count[1] += 1;
-
-            // redirect stdout to a give file
-            if let Some(name) = cmd_line.next() {
-                match open_stdout_file(&name) {
-                    Ok(f) => proc.stdout(f),
-                    Err(e) => return Err(e),
-                };
+        match cmd_line.next().as_deref() {
+            Some("<") => {
+                redirection_count[0] += 1;
+
+                // retrieve file name if file/directory doesn't
+                // exist notify user and restart the shell
+                if let Some(name) = cmd_line.next() {
+                    // redirect stdin from a given file
+                    match open_stdin_file(&name) {
+                        Ok(f) => proc.stdin(f),
+                        Err(e) => return Err(e),
+                    };
+                }
             }
-        }
-
-        if cmd_line.peek().is_empty() {
-            break;
+            Some(">") => {
+                redirection_count[1] += 1;
+
+                // redirect stdout to a give file
+                if let Some(name) = cmd_line.next() {
+                    match open_stdout_file(&name) {
+                        Ok(f) => proc.stdout(f),
+                        Err(e) => return Err(e),
+                    };
+                }
+            },
+            None => break,
+            _ => continue,
         }
     }
 

diff --git a/src/tokenizer.rs b/src/tokenizer.rs
@@ -90,7 +90,6 @@ impl Tokenizer {
         if let Some(cur) = self.current.clone() {
             let mut vals  = cur.split(' ');
             res = vals.next().unwrap().to_string()
-
         }
         res
     }
@@ -114,6 +113,10 @@ impl Tokenizer {
         }
         Tokenizer::new(&before)
     }
+
+    pub fn is_empty(&self) -> bool {
+        self.current.is_none()
+    }
 }
 
 impl Iterator for Tokenizer {
@@ -124,13 +127,16 @@ impl Iterator for Tokenizer {
             let mut split: Vec<_> = s.split(' ').collect();
             let nxt = split.remove(0).to_string();
 
+            // check if strings are left in the vector
+            // if yes build string back and store in current
             if split.is_empty() {
                 self.current = None;
             } else {
                 self.current = Some(split.join(" "));
             }
 
-            if nxt.is_empty() {
+            if nxt.len() < 1 {
+                self.current = None;
                 None
             } else {
                 Some(nxt)