完善命令读取功能 (#17)

src/shell/command/mod.rs

@@ -96,12 +96,18 @@ impl Command {
     }
 
     fn from_string(str: String) -> Result<Command, CommandError> {
-        let regex: Regex = Regex::new(r#"([^\s'"]|("[^"]*"|'[^']*'))+"#).unwrap();
+        let regex: Regex = Regex::new(r#"'.*'|".*"|[^\s]+"#).unwrap();
         let hay = str.clone();
-        let mut iter = regex
-            .captures_iter(hay.as_str())
-            .map(|c| String::from(c.get(0).unwrap().as_str()));
-        // let mut iter = str.split_ascii_whitespace();
+        let mut iter = regex.captures_iter(hay.as_str()).map(|c| {
+            let str = c.get(0).unwrap().as_str();
+            if str.starts_with(|char| char == '\'' || char == '\"')
+                && str.ends_with(|char| char == '\'' || char == '\"')
+            {
+                return str[1..str.len() - 1].to_string();
+            } else {
+                return str.to_string();
+            }
+        });
         let name = iter.next().unwrap();
         let re: Regex = Regex::new(r"\$[\w_]+").unwrap();
         let replacement = |caps: &Captures| -> String {

src/shell/mod.rs

@@ -61,13 +61,13 @@ impl Shell {
                 self.executed_commands.push(command_bytes.clone());
             }
             if !command_bytes.iter().all(|&byte| byte == b' ') {
-                self.exec_command_in_bytes(&command_bytes);
+                self.exec_commands_in_line(&command_bytes);
             }
         }
         self.write_commands();
     }
 
-    fn exec_command_in_bytes(&mut self, command_bytes: &Vec<u8>) {
+    fn exec_commands_in_line(&mut self, command_bytes: &Vec<u8>) {
         let commands = Command::from_strings(String::from_utf8(command_bytes.clone()).unwrap());
         commands
             .iter()