unnecessary borrow

Cargo.lock

@@ -118,6 +118,12 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
+[[package]]
+name = "env_home"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe"
+
 [[package]]
 name = "errno"
 version = "0.3.10"
@@ -225,9 +231,9 @@ dependencies = [
 
 [[package]]
 name = "luajit-src"
-version = "210.5.11+97813fb"
+version = "210.5.12+a4f56a4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3015551c284515db7c30c559fc1080f9cb9ee990d1f6fca315451a107c7540bb"
+checksum = "b3a8e7962a5368d5f264d045a5a255e90f9aa3fc1941ae15a8d2940d42cac671"
 dependencies = [
  "cc",
  "which",
@@ -597,12 +603,12 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "6.0.3"
+version = "7.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
+checksum = "fb4a9e33648339dc1642b0e36e21b3385e6148e289226f657c809dee59df5028"
 dependencies = [
  "either",
- "home",
+ "env_home",
  "rustix",
  "winsafe",
 ]

src/commands.rs

@@ -1,7 +1,7 @@
-use std::{io, process, str::SplitWhitespace, path::{Path, PathBuf}};
+use std::{process, str::SplitWhitespace, path::{Path, PathBuf}};
 use uzers::User;
 
-use crate::{history::History, session::MapDisplay, valid_pbuf::IsValid};
+use crate::{session::{MapDisplay, Pse}, valid_pbuf::IsValid};
 
 trait PathBufIsValid {
 	fn is_valid_or_home(&self) -> Option<PathBuf>;
@@ -12,15 +12,8 @@ impl PathBufIsValid for PathBuf {
 	}
 }
 
-trait ChangeDirectory<'a> {
-	fn change_directory(&self, args: SplitWhitespace) -> Option<PathBuf>;
-	fn set_current_dir(&self, new_path: &Path) -> Option<PathBuf>;
-	fn specific_user_dir(&self, user: String) -> Option<PathBuf>;
-	fn cd_args(&self, vec_args: Vec<String>) -> Option<PathBuf>;
-	fn previous_dir(&self) -> Option<PathBuf>;
-	fn home_dir(&self) -> Option<PathBuf>;
-}
-impl<'a> ChangeDirectory<'a> for Command<'a> {
+struct ChangeDirectory;
+impl ChangeDirectory {
 	fn set_current_dir(&self, new_path: &Path) -> Option<PathBuf> {
 		std::env::set_current_dir(new_path).map_or_display_none(|()| Some(new_path.to_path_buf()))
 	}
@@ -36,10 +29,10 @@ impl<'a> ChangeDirectory<'a> for Command<'a> {
 	fn specific_user_dir(&self, requested_user: String) -> Option<PathBuf> {
 		match requested_user.as_str() {
 			"root" => PathBuf::from("/root").is_valid_or_home(),
-			_ => {
+			u => {
 				for user in unsafe { uzers::all_users().collect::<Vec<User>>() } {
 					let user_name = user.name();
-					if *requested_user == *user_name {
+					if *u == *user_name {
 						let mut user_dir = PathBuf::from("/home");
 						user_dir.push(user_name);
 						return user_dir.is_valid_or_home();
@@ -72,8 +65,8 @@ impl<'a> ChangeDirectory<'a> for Command<'a> {
 			Some(arg) => match arg.as_str() {
 				"/" => self.set_current_dir(Path::new("/")),
 				"-" => self.previous_dir(),
-				_ => {
-					let mut arg_chars = arg.chars();
+				arg_str => {
+					let mut arg_chars = arg_str.chars();
 					match arg_chars.next() {
 						Some(char) => match char == '~' {
 							true => self.specific_user_dir(arg_chars.collect::<String>()),
@@ -87,28 +80,21 @@ impl<'a> ChangeDirectory<'a> for Command<'a> {
 	}
 }
 
-pub struct Command<'a>(&'a String);
-impl<'a> Command<'a> {
-	pub const fn new(input: &'a String) -> Self {
-		Self(input)
-	}
-
-	pub fn spawn_sys_cmd(&mut self, history: &mut History, command_process: io::Result<process::Child>) {
-		match command_process {
-		    Ok(mut child) => {
-				history.add(self.0.as_str());
-				child.wait().ok();
-			},
-		    Err(_) => println!("pse: Unknown command: {}", self.0),
-		}
-	}
-
-	pub fn exec(&mut self, history: &mut History) {
-		let mut args = self.0.split_whitespace();
+pub trait Command {
+	fn spawn_sys_cmd(&mut self);
+}
+impl Command for Pse {
+	fn spawn_sys_cmd(&mut self) {
+		let mut args = self.rt.input.split_whitespace();
 		if let Some(command) = args.next() {
 			match command {
-				"cd" => if self.change_directory(args).is_some() { history.add(self.0.as_str()) },
-				command => { self.spawn_sys_cmd(history, process::Command::new(command).args(args).spawn()); }
+				"cd" => if ChangeDirectory.change_directory(args).is_some() { self.history.add(self.rt.input.as_str()) },
+				command => if let Ok(mut child) = process::Command::new(command).args(args).spawn() {
+	    			self.history.add(self.rt.input.as_str());
+					child.wait().ok();
+				} else {
+		   			println!("\npse: Unknown command: {}", self.rt.input)
+				}
 			}
 		}
 	}

src/terminal.rs

@@ -1,4 +1,4 @@
-use crossterm::{event::{self, Event, KeyCode, KeyEvent, KeyModifiers}, terminal};
+use crossterm::{cursor, event::{self, Event, KeyCode, KeyEvent, KeyModifiers}, execute, terminal};
 use std::io::{self, Write};
 use thiserror::Error;
 
@@ -8,8 +8,8 @@ use crate::{commands::Command, session::{self, Pse}};
 pub enum InputHandleError {
 	#[error("UserExit")]
 	UserExit,
-	#[error("Sigterm")]
-	Sigterm,
+	#[error("Sigint")]
+	Sigint,
 	#[error("Render failure: {0}")]
 	Write(io::Error),
 	#[error("Flush failure: {0}")]
@@ -24,62 +24,83 @@ pub enum InputHandleError {
 type InputResult<T> = Result<T, InputHandleError>;
 
 trait SpecificKeybinds {
-	const TERM_ID_1: &str;
+	const EXIT_1: &str;
+	const KEY_SPACE: char;
+	fn key_literal(&mut self, keycode: KeyCode) -> InputResult<()>;
 	fn key_ctrl(&mut self, input_key: KeyEvent, keycode: KeyCode) -> InputResult<()>;
 	fn key_enter(&mut self) -> InputResult<()>;
 	fn key_backspace(&mut self) -> InputResult<()>;
+	fn key_arrow_right(&mut self) -> InputResult<()>;
+	fn key_arrow_left(&mut self) -> InputResult<()>;
 }
 impl SpecificKeybinds for Pse {
-	const TERM_ID_1: &str = "exit";
+	const EXIT_1: &str = "exit";
+	const KEY_SPACE: char = ' ';
+
+	fn key_literal(&mut self, keycode: KeyCode) -> InputResult<()> {
+		match keycode {
+			KeyCode::Char(Self::KEY_SPACE) => self.term_render(Self::KEY_SPACE.to_string()),
+			keycode => self.term_render(keycode.to_string())
+		}
+	}
 
 	fn key_ctrl(&mut self, input_key: KeyEvent, keycode: KeyCode) -> InputResult<()> {
-		if input_key.modifiers.contains(KeyModifiers::CONTROL) {
-			match keycode {
-				KeyCode::Char('c') => Err(InputHandleError::Sigterm),
+		match input_key.modifiers.contains(KeyModifiers::CONTROL) {
+			true => match keycode {
+				KeyCode::Char('c') => Err(InputHandleError::Sigint),
 				_ => Ok(())
-			}
-		} else {
-			self.term_render(Some(keycode.to_string()))
+			},
+			false => self.key_literal(keycode)
 		}
 	}
 
 	fn key_enter(&mut self) -> InputResult<()> {
-		if self.rt.input == Self::TERM_ID_1 { return Err(InputHandleError::UserExit) };
+		if self.rt.input == Self::EXIT_1 { return Err(InputHandleError::UserExit) };
 
 		terminal::disable_raw_mode().map_err(InputHandleError::DisableRaw)?;
-		Command::new(&self.rt.input).exec(&mut self.history);
+		self.spawn_sys_cmd();
 		self.rt.input.clear();
-		Ok(())
+		self.term_render_ps()
 	}
 
 	fn key_backspace(&mut self) -> InputResult<()> {
-		match self.rt.input.pop() {
-		    Some(_) => self.term_render(None),
-		    None => {
-				//the string is empty, do terminal beep
-				Ok(())
-			},
+		if self.rt.input.pop().is_some() {
+			execute!(
+				io::stdout(),
+				cursor::MoveLeft(1),
+				terminal::Clear(terminal::ClearType::UntilNewLine)
+			).map_err(InputHandleError::Flush)
+		} else {
+			//the string is empty, do terminal beep
+			Ok(())
 		}
 	}
+
+	fn key_arrow_right(&mut self) -> InputResult<()> {
+		execute!(io::stdout(), cursor::MoveRight(1)).map_err(InputHandleError::Flush)
+	}
+
+	fn key_arrow_left(&mut self) -> InputResult<()> {
+		execute!(io::stdout(), cursor::MoveLeft(1)).map_err(InputHandleError::Flush)
+	}
 }
 
 pub trait TermProcessor {
-	fn term_render(&mut self, def: Option<String>) -> InputResult<()>;
+	fn term_render(&mut self, def_string: String) -> InputResult<()>;
+	fn term_render_ps(&self) -> InputResult<()>;
 	fn term_input_handler(&mut self, input_key: KeyEvent) -> Option<()>;
 	fn term_input_mainthread(&mut self) -> io::Result<()>;
 	fn term_input_processor(&mut self) -> io::Result<()>;
 }
 impl TermProcessor for Pse {
-	fn term_render(&mut self, def: Option<String>) -> InputResult<()> {
-		match def {
-		    Some(def_string) => {
-				self.rt.input.push_str(&def_string);
-				write!(io::stdout(), "{def_string}").map_err(InputHandleError::Write)?;
-			},
-		    None => {
-				write!(io::stdout(), "{}", self.rt.input).map_err(InputHandleError::Write)?
-			}
-		};
+	fn term_render(&mut self, def_string: String) -> InputResult<()> {
+		self.rt.input.push_str(&def_string);
+		write!(io::stdout(), "{def_string}").map_err(InputHandleError::Write)?;
+		io::stdout().flush().map_err(InputHandleError::Flush)
+	}
+
+	fn term_render_ps(&self) -> InputResult<()> {
+		print!("{}", self.rt.ps.borrow());
 		io::stdout().flush().map_err(InputHandleError::Flush)
 	}
 
@@ -88,32 +109,34 @@ impl TermProcessor for Pse {
 			KeyCode::Enter     => self.key_enter(),
 			KeyCode::Backspace => self.key_backspace(),
 			KeyCode::Tab       => todo!(),
-			KeyCode::Right     => todo!(),
-			KeyCode::Left      => todo!(),
+			KeyCode::Right     => self.key_arrow_right(),
+			KeyCode::Left      => self.key_arrow_left(),
 			KeyCode::Up        => todo!(),
 			KeyCode::Down      => todo!(),
 			keycode            => self.key_ctrl(input_key, keycode)
 		};
 		input_handle.map_or_else(|inp_err| match inp_err {
 			InputHandleError::UserExit => None,
-		    InputHandleError::Sigterm => self.term_render(Some("^C".to_owned())).ok(),
+		    InputHandleError::Sigint => self.term_render("^C".to_owned()).ok(),
 			input_err => session::shell_error_none(input_err)
 		}, Some)
 	}
 
 	fn term_input_mainthread(&mut self) -> io::Result<()> {
-		crossterm::execute!(io::stdout(), event::EnableBracketedPaste)?;
-		loop {
-			terminal::enable_raw_mode()?;
-		    if let Event::Key(event) = event::read()? {
-				if self.term_input_handler(event).is_none() { break Ok(()) }
+		execute!(io::stdout(), event::EnableBracketedPaste)?;
+		self.term_render_ps().map_or_else(|_| Ok(()), |()| {
+			loop {
+				terminal::enable_raw_mode()?;
+			    if let Event::Key(event) = event::read()? {
+					if self.term_input_handler(event).is_none() { break Ok(()) }
+				}
 			}
-		}
+		})
 	}
 
 	fn term_input_processor(&mut self) -> io::Result<()> {
 		self.term_input_mainthread()?;
 	    terminal::disable_raw_mode()?;
-	    crossterm::execute!(io::stdout(), event::DisableBracketedPaste)
+	    execute!(io::stdout(), event::DisableBracketedPaste)
 	}
 }