better error handeling for the terminal

src/tools/terminal.rs

@@ -7,46 +7,54 @@ use std::io::BufReader;
 use std::io::Read;
 use std::os::fd::AsRawFd;
 use std::process::Stdio;
-use std::{env, path::Path, process::Command};
+use std::{env, path::Path, path::PathBuf, process::Command};
+
+pub struct Buffer {
+	pub output_buffer: BufReader<std::process::ChildStdout>,
+	pub error_buffer: BufReader<std::process::ChildStderr>,
+}
 
 pub struct CommandEntry {
 	pub env: String,
 	pub command: String,
 	pub output: String,
 	pub error: String,
-    pub output_buffer: BufReader<std::process::ChildStdout>,
-    pub error_buffer: BufReader<std::process::ChildStderr>,
+	pub buffer: Option<Buffer>,
 }
 
 impl CommandEntry {
 	pub fn new(command: String) -> Self {
-        let (stdout_reader, stderr_reader) = execute(command.clone());
+		let (buffer, error) = match execute(command.clone()) {
+			Ok(command_buffer) => (Some(command_buffer), String::new()),
+			Err(err) => (None, format!("failed to get results: {}", err)),
+		};
 
 		CommandEntry {
-            env: format_path(&env::current_dir().expect("Could not find Shell Environnment")),
+			env: format_path(&env::current_dir().unwrap_or_else(|_| PathBuf::from("/"))),
 			command,
 			output: String::new(),
-            error: String::new(),
-            output_buffer: stdout_reader,
-            error_buffer: stderr_reader,
+			error,
+			buffer,
 		}
 	}
 
 	pub fn update(&mut self) {
-        for line in self.output_buffer.by_ref().lines() {
+		if let Some(buffer) = &mut self.buffer {
+			for line in buffer.output_buffer.by_ref().lines() {
 				match line {
 					Ok(line) => self.output += &format!("{}\n", line),
 					Err(_) => return,
 				}
 			}
 
-        for line in self.error_buffer.by_ref().lines() {
+			for line in buffer.error_buffer.by_ref().lines() {
 				match line {
 					Ok(line) => self.error += &format!("{}\n", line),
 					Err(_) => return,
 				}
 			}
 		}
+	}
 }
 
 pub fn send_command(command: String) -> CommandEntry {
@@ -85,30 +93,34 @@ pub fn send_command(command: String) -> CommandEntry {
 	}
 }
 
-pub fn execute(
-    command: String,
-) -> (
-    BufReader<std::process::ChildStdout>,
-    BufReader<std::process::ChildStderr>,
-) {
+pub fn execute(command: String) -> Result<Buffer, std::io::Error> {
 	let mut child = Command::new("sh")
 		.arg("-c")
 		.arg(command.clone())
 		.stdout(Stdio::piped())
 		.stderr(Stdio::piped())
-        .spawn()
-        .expect("failed to execute process");
+		.spawn()?;
 
-    let stdout = child.stdout.take().unwrap();
-    let stderr = child.stderr.take().unwrap();
+	let stdout = child
+		.stdout
+		.take()
+		.ok_or_else(|| std::io::Error::new(std::io::ErrorKind::Other, "Failed to open stdout"))?;
+	let stderr = child
+		.stderr
+		.take()
+		.ok_or_else(|| std::io::Error::new(std::io::ErrorKind::Other, "Failed to open stderr"))?;
 
 	let stdout_fd = stdout.as_raw_fd();
 	let stderr_fd = stderr.as_raw_fd();
 
-    fcntl(stdout_fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))
-        .expect("Failed to set non-blocking mode");
-    fcntl(stderr_fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))
-        .expect("Failed to set non-blocking mode");
+	fcntl(stdout_fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
+	fcntl(stderr_fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
 
-    (BufReader::new(stdout), BufReader::new(stderr))
+	let output_buffer = BufReader::new(stdout);
+	let error_buffer = BufReader::new(stderr);
+
+	Ok(Buffer {
+		output_buffer,
+		error_buffer,
+	})
 }