README.md

@@ -14,18 +14,12 @@ Sqish is now my default shell on my home computer, and I'll keep adding features
 
 Also keep in mind I'm a beginner in Rust, so the code is pretty dirty; I will probably come around to reformating it once I have all the features I want and ironed out all the bugs.
 
-# TODO
+TODO: 
-
-TODO (Reformat):
-* Creating a struct "shell" that contains builder method taking an input and an output as parameters as well as a conf could be cool
-* Maybe subdivide lib.src to have more modularity 'cause it getting kinda long... 500 lines it a bit much ?
-
-TODO(Features):
 * Allow redirecting >> to the end of a file ? 
 * Allow && in commands ? 
 * Improve word jumping
 * Add arguments : run a file (sqish myexec) which I believe would make it compatible with gdb ?
-* Add export command => Reuse the function set_envvars
+* Add export command
 
 ## sqishrc (Config)
 See the included sqishrc file included for comments, and copy it as ~/.sqishrc for use (optionnal).

sqishrc

@@ -44,8 +44,3 @@ hotkeys:
 
 #Init : A command to run on startup. Can be used for many things...
 init: "echo ---Initialization over---"
-
-#Env : to set environment variables at launch
-env:
-  CAT: "meow"
-  PATH: /home/cat/bin:$PATH

src/lib.rs

@@ -1,6 +1,5 @@
 #[allow(unused_must_use)]
 pub mod shell {
-    use regex::Regex;
     use std::io::Stdout;
     use std::process::Command;
     use std::io::stdin;
@@ -15,7 +14,7 @@ pub mod shell {
     use termion::input::TermRead;
     use termion::raw::IntoRawMode;
     use termion::raw::RawTerminal;
-    use termion::{color, cursor};
+    use termion::cursor;
     use termion;
     use unicode_segmentation::UnicodeSegmentation;
     use std::collections::HashMap;
@@ -34,46 +33,7 @@ pub mod shell {
     extern crate shell_words;
     extern crate ctrlc;
 
-    ///Stores essential terminal variables
+    fn change_dir(args: &Vec<String>, previous_command: &mut Option<Stdio>) {
-    struct TermElements {
-        //Stores currently typed command
-        command: String,
-        //Current cursor position in the line
-        cur_pos: usize,
-        //Max position of cursor in the line
-        max_pos: usize,
-        stdout: RawTerminal<Stdout>,
-        //Current history number
-        current_number: i32,
-        //Configuration
-        conf: SqishConf,
-    }
-
-    ///Used to unify command output and error handling 
-    ///across functions
-    struct CmdOutput {
-        outp: String,
-        rc: i16,
-    }
-
-    impl CmdOutput {
-        fn from_values(output: String, rc: i16) -> CmdOutput {
-            let myoutp = CmdOutput {
-                outp: output,
-                rc: rc,
-            };
-            return myoutp;
-        }
-        fn new_empty() -> CmdOutput {
-            let outp = CmdOutput {
-                outp: String::new(),
-                rc: 0,
-            };
-            return outp;
-        }
-    }
-
-    fn change_dir(args: &Vec<String>, previous_command: &mut Option<Stdio>) -> Result<CmdOutput, CmdOutput> {
         let homedir = dirs::home_dir().unwrap().into_os_string().into_string().unwrap();
         //let new_dir = args.peekable().peek().map_or(homedir.as_str(), |x| *x);
         let mut new_dir = String::new();
@@ -85,15 +45,14 @@ pub mod shell {
 
         let root = Path::new(&new_dir);
         if let Err(e) = env::set_current_dir(&root) {
-            return Err(CmdOutput::from_values(
+            eprintln!(" Err: {}", e);
-                    format!("Error setting directory to {}, got {:?}",
+        } else {
-                                 new_dir, e), -1));
+            println!("");
-        };
+        }
         *previous_command = None;
-        return Ok(CmdOutput::new_empty());
     }
 
-    fn print_hist(previous_command: &mut Option<Stdio>, command_next: bool) -> Result<CmdOutput, CmdOutput> {
+    fn print_hist(previous_command: &mut Option<Stdio>, command_next: bool) {
         //let stdout = Stdio::inherit();
         let res = get_history();
         match res {
@@ -106,37 +65,30 @@ pub mod shell {
                     print!("{}", r);
                 }
             },
-            Err(e) => {
+            Err(e) => eprintln!(" Err reading history: {}", e),
-                return Err(CmdOutput::from_values(format!("Could not print history, got {:?}", e), 255));
-            },
         }
-        return Ok(CmdOutput::new_empty());
     }
 
-
+    fn process_line(input: &str) -> String {
-    fn process_line(input: &str) -> Result<CmdOutput, CmdOutput> {
         let mut commands = input.trim().split("|").peekable();
         let mut previous_command = None;
         let mut resultat = String::new();
-        let mut rc: i16 = 0;
 
         while let Some(command) = commands.next()  {
             let parts = match shell_words::split(&command.trim()) {
                 Ok(w) => w,
-                Err(e) => { 
+                Err(e) => { return format!("Error parsing the command : {:?}", e); },
-                    return Err(CmdOutput::from_values(format!("Could not parse command {:?}", e), -1));
-                },
             };
             let command = parts[0].as_str();
             let args = Vec::from(&parts[1..]);
 
             match command {
                 "cd" => {
-                    change_dir(&args, &mut previous_command)?;
+                    change_dir(&args, &mut previous_command);
                 },
                 "history" => {
                     let next = commands.peek().is_some();
-                    print_hist(&mut previous_command, next)?;
+                    print_hist(&mut previous_command, next);
                 },
                 command => {
                     if commands.peek().is_some() {
@@ -174,7 +126,7 @@ pub mod shell {
                                 Ok(h) => h,
                                 Err(_) => {
                                     let err_string = format!("Not found : {}", command);
-                                    return Err(CmdOutput::from_values(err_string, -1));
+                                    return String::from(err_string);
                                 },
                             };
 
@@ -188,15 +140,12 @@ pub mod shell {
                         previous_command = None;
                         let format_res = format!("{}", 
                                                  status);
-                        *&mut rc = format_res.parse::<i16>().unwrap();
+                        let _ = &mut resultat.push_str(&format_res);
-                        *&mut resultat = String::from_utf8(output.stdout).unwrap();
-                        //let _ = &mut resultat.push_str(&format_res);
                     }
                 },
             };
         }
-        //return resultat;
+        return resultat;
-        return Ok(CmdOutput::from_values(resultat, rc));
     }
 
     fn replace_signs(line: &String) -> String {
@@ -216,18 +165,17 @@ pub mod shell {
         return ayo;
     }
 
-    fn handle_input(line: &str) -> Result<CmdOutput, CmdOutput> {
+    fn handle_input(line: &str) -> String {
         //history callback
         if (line.len() > 0) && (line.starts_with('!'))  {
             let command_found = treat_history_callback(line);
             match command_found {
                 Some(c) => {
                     write_to_history(&c);
-                    return process_line(&c);
+                    let outp = process_line(&c);
+                    return outp;
                     },
-                None => return Err(CmdOutput::from_values(
+                None => return String::from(" "),
-                        String::from("No such value"),
-                        255)),
             };
         //Regular command
         } else if line.len() > 0 {
@@ -236,7 +184,7 @@ pub mod shell {
         //Nothing
         } else {
             //Command was empty, new line
-            return Ok(CmdOutput::new_empty());
+            return String::from("");
         }
     }
 
@@ -314,36 +262,25 @@ pub mod shell {
                current_number: &mut i32,
                conf: &mut SqishConf,
                stdout: &mut RawTerminal<Stdout>) {
-        //NORMAL CMD
         if (mycommand != &String::from("")) && (mycommand != &String::from("exit")) {
-            //Run the command
             let comm = replace_signs(&mycommand);
             RawTerminal::suspend_raw_mode(&stdout);
             let res = handle_input(&comm);
-            //Display the results
-            match res {
-                Ok(_) => (),
-                Err(e) => {
-                    println!("\r\n{}Got error {}, RC : {:?}{}",
-                             color::Fg(color::Red),
-                             e.outp,
-                             e.rc,
-                             color::Fg(color::Reset));
-                },
-            };
-            //Prepare for a new command
             RawTerminal::activate_raw_mode(&stdout);
             mycommand.clear();
+            for line in res.split("\r\n") {
+                if line != "" && line.starts_with('N'){
+                    write!(stdout, "{}\r\n", line);
+                }
+            }
             conf.update_prompt(get_curr_history_number());
             write!(stdout, "{}", conf.promptline).unwrap();
             stdout.flush();
             *current_number += 1;
-        //EXITTING
         } else if mycommand == &String::from("exit") {
             write!(stdout, "\r\nThanks for using Sqish!\r\nSayonara \r\n");
             RawTerminal::suspend_raw_mode(&stdout);
             std::process::exit(0);
-        //EMPTY LINE
         } else {
             conf.update_prompt(get_curr_history_number());
             write!(stdout, "\r\n{}", conf.promptline).unwrap();
@@ -413,7 +350,6 @@ pub mod shell {
                     aliases: HashMap::new(),
                     hotkeys: HashMap::new(),
                     init: String::new(),
-                    env: HashMap::new(),
                 };
                 let ret_line = format!("Could not build conf, got {}\
                                        \r\nUsing default promptline",  e);
@@ -580,6 +516,20 @@ pub mod shell {
         write!(elems.stdout, "{}{}", elems.conf.promptline, elems.command);
     }
 
+    struct TermElements {
+        //Stores currently typed command
+        command: String,
+        //Current cursor position in the line
+        cur_pos: usize,
+        //Max position of cursor in the line
+        max_pos: usize,
+        stdout: RawTerminal<Stdout>,
+        //Current history number
+        current_number: i32,
+        //Configuration
+        conf: SqishConf,
+    }
+
     fn jmp_nxt_word(elems: &mut TermElements) {
         let steps = find_next_space(&elems.cur_pos, &elems.max_pos, &elems.command);
         //println!("steps: {:?} cur {:?} max {:?}", steps, elems.cur_pos, elems.max_pos);
@@ -638,38 +588,6 @@ pub mod shell {
         };
     }
 
-    //I smell horrible code in here
-    fn set_envvars(conf: &SqishConf) {
-        let vars = conf.env.clone();
-        let re = Regex::new(r"\$[A-Za-z_]+").unwrap();
-
-        for (key, value) in vars {
-            let mut after = value.clone();
-            let mut nbr_of_vars = *&value.matches('$').count();
-            while nbr_of_vars >= 1 {
-                let temp = after.clone();
-                let caps = re.captures(&temp).unwrap();
-                for cap in caps.iter() {
-                    match cap {
-                        Some(c) => {
-                            let myvar = String::from(c.as_str()).replace('$', "");
-                            match env::var(myvar) {
-                                Ok(r) => {
-                                    *&mut after = after.replace(c.as_str(), &r);
-                                },
-                                Err(_) => continue,
-                            };
-                        },
-                        None => continue,
-                    };
-                }
-                nbr_of_vars -= 1;
-            }
-            env::set_var(&key, &after);
-        }
-    }
-
-
     //THE ENTRYPOINT FUNCTION
     pub fn run_raw() {
 
@@ -692,7 +610,6 @@ pub mod shell {
         //Initializing
         write!(elems.stdout, "\r\n ---Sqish initializing--- \r\n{}", elems.conf.promptline);
         elems.stdout.flush();
-        set_envvars(&elems.conf);
 
         if elems.conf.init != String::from("") {
             run_cmd(&mut String::from(&elems.conf.init), &mut elems.current_number, &mut elems.conf, &mut elems.stdout);

src/shell/config.rs

@@ -16,7 +16,6 @@ pub struct SqishConf {
     pub aliases: HashMap<String, String>,
     pub hotkeys: HashMap<String, String>,
     pub init: String,
-    pub env: HashMap<String, String>,
 }
 
 impl SqishConf {
@@ -55,16 +54,12 @@ impl SqishConf {
         let hotkeys_yaml = &sqishrc["hotkeys"];
         let hotkeys = Self::yaml_dict2hashmap(hotkeys_yaml);
 
-        let env_yaml = &sqishrc["env"];
-        let env = Self::yaml_dict2hashmap(env_yaml);
-
         let mut out_conf = SqishConf {
             promptline: out_str.clone(),
             promptline_base: out_str,
             aliases: aliases,
             hotkeys: hotkeys,
             init: startup,
-            env: env,
         };
 
         out_conf.handle_rgb();