修复输入部分字符导致的崩溃问题 (#16)

src/env.rs

@@ -0,0 +1,79 @@
+use std::{
+    collections::HashMap,
+    fs::File,
+    io::{Read, Write},
+    path::Path,
+    string::String,
+    vec::Vec,
+};
+
+pub const ROOT_PATH: &str = "/";
+pub const ENV_FILE_PATH: &str = "/etc/profile";
+
+pub struct Env(std::collections::HashMap<String, String>);
+
+lazy_static! {
+    static ref ENV: std::sync::Mutex<Env> = std::sync::Mutex::new(Env(HashMap::new()));
+}
+
+impl Env {
+    /// 初始化环境变量文件
+    pub fn init_envfile() {
+        let mut file = File::create(ENV_FILE_PATH).unwrap();
+        file.write_all("PATH=/bin:/usr/bin:/usr/local/bin\n".as_bytes())
+            .unwrap();
+        file.write_all("PWD=/\n".as_bytes()).unwrap();
+    }
+
+    /// 读取环境变量文件
+    /// 如果文件不存在则创建
+    pub fn read_env() {
+        let mut env = ENV.lock().unwrap();
+        if !Path::new(ENV_FILE_PATH).exists() {
+            Env::init_envfile();
+        }
+        let mut file = File::open(ENV_FILE_PATH).unwrap();
+        let mut buf: Vec<u8> = Vec::new();
+        file.read_to_end(&mut buf).unwrap();
+        for (name, value) in String::from_utf8(buf)
+            .unwrap()
+            .split('\n')
+            .filter_map(|str| {
+                let v = str.split('=').collect::<Vec<&str>>();
+                if v.len() == 2 && !v.contains(&"") {
+                    Some((*v.get(0).unwrap(), *v.get(1).unwrap()))
+                } else {
+                    None
+                }
+            })
+            .collect::<Vec<(&str, &str)>>()
+        {
+            env.0.insert(String::from(name), String::from(value));
+        }
+    }
+
+    pub fn get(key: &String) -> Option<String> {
+        let env = &mut ENV.lock().unwrap().0;
+        env.get(key).map(|value| value.clone())
+    }
+
+    pub fn insert(key: String, value: String) {
+        ENV.lock().unwrap().0.insert(key, value);
+    }
+
+    pub fn path() -> Vec<String> {
+        let env = &ENV.lock().unwrap().0;
+        let paths = env.get("PATH").unwrap();
+        paths
+            .split(':')
+            .filter_map(|str| {
+                let path = String::from(str);
+                if Path::new(&path).is_dir() {
+                    Some(path)
+                } else {
+                    None
+                }
+            })
+            .collect::<Vec<String>>()
+    }
+}

src/keycode.rs

@@ -0,0 +1,34 @@
+use num_enum::TryFromPrimitive;
+
+#[repr(u8)]
+#[derive(Debug, FromPrimitive, TryFromPrimitive, ToPrimitive, PartialEq, Eq, Clone)]
+#[allow(dead_code)]
+pub enum SpecialKeycode {
+    LF = b'\n',
+    CR = b'\r',
+    Delete = b'\x7f',
+    BackSpace = b'\x08',
+    Tab = b'\t',
+
+    FunctionKeyPrefix = 0xE0,
+    PauseBreak = 0xE1,
+}
+
+#[repr(u8)]
+#[derive(Debug, FromPrimitive, TryFromPrimitive, ToPrimitive, PartialEq, Eq, Clone)]
+#[allow(dead_code)]
+pub enum FunctionKeySuffix {
+    Up = 0x48,
+    Down = 0x50,
+    Left = 0x4B,
+    Right = 0x4D,
+
+    Home = 0x47,
+    End = 0x4F,
+}
+
+impl Into<u8> for SpecialKeycode {
+    fn into(self) -> u8 {
+        self as u8
+    }
+}

src/main.rs

@@ -11,115 +11,12 @@ extern crate num_derive;
 
 mod shell;
 
-use num_enum::TryFromPrimitive;
-use shell::Shell;
-use std::{
-    collections::HashMap,
-    fs::File,
-    io::{Read, Write},
-    path::Path,
-    string::String,
-    vec::Vec,
-};
-
-pub const ROOT_PATH: &str = "/";
-pub const ENV_FILE_PATH: &str = "/etc/profile";
-
-#[repr(u8)]
-#[derive(Debug, FromPrimitive, TryFromPrimitive, ToPrimitive, PartialEq, Eq, Clone)]
-#[allow(dead_code)]
-pub enum SpecialKeycode {
-    LF = b'\n',
-    CR = b'\r',
-    Delete = b'\x7f',
-    BackSpace = b'\x08',
-    Tab = b'\t',
-
-    FunctionKey = 0xE0,
-    PauseBreak = 0xE1,
-
-    Up = 0x48,
-    Down = 0x50,
-    Left = 0x4B,
-    Right = 0x4D,
-
-    Home = 0x47,
-    End = 0x4F,
-}
-
-impl Into<u8> for SpecialKeycode {
-    fn into(self) -> u8 {
-        self as u8
-    }
-}
+mod keycode;
 
-struct Env(std::collections::HashMap<String, String>);
+mod env;
 
-lazy_static! {
-    static ref ENV: std::sync::Mutex<Env> = std::sync::Mutex::new(Env(HashMap::new()));
-}
-
-impl Env {
-    /// 初始化环境变量文件
-    fn init_envfile() {
-        let mut file = File::create(ENV_FILE_PATH).unwrap();
-        file.write_all("PATH=/bin:/usr/bin:/usr/local/bin\n".as_bytes())
-            .unwrap();
-        file.write_all("PWD=/\n".as_bytes()).unwrap();
-    }
-
-    /// 读取环境变量文件
-    /// 如果文件不存在则创建
-    fn read_env() {
-        let mut env = ENV.lock().unwrap();
-        if !Path::new(ENV_FILE_PATH).exists() {
-            Env::init_envfile();
-        }
-        let mut file = File::open(ENV_FILE_PATH).unwrap();
-        let mut buf: Vec<u8> = Vec::new();
-        file.read_to_end(&mut buf).unwrap();
-        for (name, value) in String::from_utf8(buf)
-            .unwrap()
-            .split('\n')
-            .filter_map(|str| {
-                let v = str.split('=').collect::<Vec<&str>>();
-                if v.len() == 2 && !v.contains(&"") {
-                    Some((*v.get(0).unwrap(), *v.get(1).unwrap()))
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<(&str, &str)>>()
-        {
-            env.0.insert(String::from(name), String::from(value));
-        }
-    }
-
-    fn get(key: &String) -> Option<String> {
-        let env = &mut ENV.lock().unwrap().0;
-        env.get(key).map(|value| value.clone())
-    }
-
-    fn insert(key: String, value: String) {
-        ENV.lock().unwrap().0.insert(key, value);
-    }
-
-    fn path() -> Vec<String> {
-        let env = &ENV.lock().unwrap().0;
-        let paths = env.get("PATH").unwrap();
-        paths
-            .split(':')
-            .filter_map(|str| {
-                let path = String::from(str);
-                if Path::new(&path).is_dir() {
-                    Some(path)
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<String>>()
-    }
-}
+use env::Env;
+use shell::Shell;
 
 fn main() {
     Env::read_env();

src/shell/command/mod.rs

@@ -14,9 +14,8 @@ use std::{
     vec::Vec,
 };
 
+use crate::env::{Env, ENV_FILE_PATH, ROOT_PATH};
 use crate::shell::Shell;
-use crate::ROOT_PATH;
-use crate::{Env, ENV_FILE_PATH};
 
 mod help;
 
@@ -234,7 +233,6 @@ impl Shell {
             1 => self.is_dir(args.get(0).unwrap())?,
             _ => return Err(CommandError::WrongArgumentCount(args.len())),
         };
-        println!("{}", path);
         self.chdir(&path);
         Ok(())
     }
@@ -680,9 +678,7 @@ impl Shell {
     fn is_dir(&self, path_str: &String) -> Result<String, CommandError> {
         match self.path_format(path_str) {
             Ok(path_str) => {
-                println!("{}", path_str);
                 let path = Path::new(&path_str);
-                println!("{:?}", path);
                 if !path.is_dir() {
                     return Err(CommandError::NotDirectory(path_str.clone()));
                 };

src/shell/mod.rs

@@ -7,7 +7,7 @@ use std::{
     vec::Vec,
 };
 
-use crate::SpecialKeycode;
+use crate::keycode::{FunctionKeySuffix, SpecialKeycode};
 
 use command::{BuildInCmd, Command};
 
@@ -128,11 +128,11 @@ impl Shell {
             // }
             if let Ok(special_key) = SpecialKeycode::try_from(key[0]) {
                 match special_key {
-                    SpecialKeycode::FunctionKey => {
+                    SpecialKeycode::FunctionKeyPrefix => {
                         Self::read_char(&mut key[0]);
-                        let special_key = SpecialKeycode::try_from(key[0]).unwrap();
-                        match special_key {
-                            SpecialKeycode::Up => {
+                        let function_key = FunctionKeySuffix::try_from(key[0]).unwrap();
+                        match function_key {
+                            FunctionKeySuffix::Up => {
                                 if command_index > 0 {
                                     command_index -= 1;
                                 }
@@ -142,7 +142,7 @@ impl Shell {
                                 cursor = buf.len() - 1;
                             }
 
-                            SpecialKeycode::Down => {
+                            FunctionKeySuffix::Down => {
                                 if command_index < len {
                                     command_index += 1;
                                 }
@@ -152,29 +152,27 @@ impl Shell {
                                 cursor = buf.len() - 1;
                             }
 
-                            SpecialKeycode::Left => {
+                            FunctionKeySuffix::Left => {
                                 if cursor > 0 {
                                     Printer::set_cursor(buf, cursor, cursor - 1);
                                     cursor -= 1;
                                 }
                             }
 
-                            SpecialKeycode::Right => {
+                            FunctionKeySuffix::Right => {
                                 if cursor < buf.len() - 1 {
                                     Printer::set_cursor(buf, cursor, cursor + 1);
                                     cursor += 1;
                                 }
                             }
 
-                            SpecialKeycode::Home => {
+                            FunctionKeySuffix::Home => {
                                 Printer::set_cursor(buf, cursor, 0);
                             }
 
-                            SpecialKeycode::End => {
+                            FunctionKeySuffix::End => {
                                 Printer::set_cursor(buf, cursor, buf.len());
                             }
-
-                            _ => {}
                         }
                     }
 
@@ -270,7 +268,7 @@ impl Shell {
                         }
                     }
 
-                    _ => todo!(),
+                    _ => {}
                 }
             } else {
                 match key[0] {