penwing/calcifer
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

better error handeling for the terminal

Browse source
This commit is contained in:
Penwing 2024-01-26 08:26:26 +01:00
parent c77752c05c
commit 877beb06f4
1 changed files with 94 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

176
src/tools/terminal.rs
View file

@ -7,108 +7,120 @@ use std::io::BufReader;
use std::io::Read; use std::io::Read;
use std::os::fd::AsRawFd; use std::os::fd::AsRawFd;
use std::process::Stdio; 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 struct CommandEntry {
pub env: String, pub env: String,
pub command: String, pub command: String,
pub output: String, pub output: String,
pub error: String, pub error: String,
pub output_buffer: BufReader<std::process::ChildStdout>, pub buffer: Option<Buffer>,
pub error_buffer: BufReader<std::process::ChildStderr>,
} }
impl CommandEntry { impl CommandEntry {
pub fn new(command: String) -> Self { 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 { 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, command,
output: String::new(), output: String::new(),
error: String::new(), error,
output_buffer: stdout_reader, buffer,
error_buffer: stderr_reader, }
} }
}
pub fn update(&mut self) { pub fn update(&mut self) {
for line in self.output_buffer.by_ref().lines() { if let Some(buffer) = &mut self.buffer {
match line { for line in buffer.output_buffer.by_ref().lines() {
Ok(line) => self.output += &format!("{}\n", line), match line {
Err(_) => return, 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 { match line {
Ok(line) => self.error += &format!("{}\n", line), Ok(line) => self.error += &format!("{}\n", line),
Err(_) => return, Err(_) => return,
} }
} }
} }
}
} }
pub fn send_command(command: String) -> CommandEntry { pub fn send_command(command: String) -> CommandEntry {
if command.len() < 2 { if command.len() < 2 {
return CommandEntry::new(command); return CommandEntry::new(command);
} }
if &command[..2] != "cd" { if &command[..2] != "cd" {
return CommandEntry::new(command); return CommandEntry::new(command);
} }
if command.len() < 4 { if command.len() < 4 {
let mut entry = CommandEntry::new("echo Invalid cd, should provide path >&2".to_string()); let mut entry = CommandEntry::new("echo Invalid cd, should provide path >&2".to_string());
entry.command = command; entry.command = command;
return entry; return entry;
} }
let path_append = command[3..].replace('~', "/home/penwing"); let path_append = command[3..].replace('~', "/home/penwing");
let path = Path::new(&path_append); let path = Path::new(&path_append);
if format!("{}", path.display()) == "/" { if format!("{}", path.display()) == "/" {
let mut entry = CommandEntry::new("echo Root access denied >&2".to_string()); let mut entry = CommandEntry::new("echo Root access denied >&2".to_string());
entry.command = command; entry.command = command;
return entry; return entry;
} }
if env::set_current_dir(path).is_ok() { if env::set_current_dir(path).is_ok() {
let mut entry = CommandEntry::new(format!("echo Moved to : {}", path.display())); let mut entry = CommandEntry::new(format!("echo Moved to : {}", path.display()));
entry.command = command; entry.command = command;
entry entry
} else { } else {
let mut entry = let mut entry =
CommandEntry::new(format!("echo Could not find path : {} >&2", path.display())); CommandEntry::new(format!("echo Could not find path : {} >&2", path.display()));
entry.command = command; entry.command = command;
entry entry
} }
} }
pub fn execute( pub fn execute(command: String) -> Result<Buffer, std::io::Error> {
command: String, let mut child = Command::new("sh")
) -> ( .arg("-c")
BufReader<std::process::ChildStdout>, .arg(command.clone())
BufReader<std::process::ChildStderr>, .stdout(Stdio::piped())
) { .stderr(Stdio::piped())
let mut child = Command::new("sh") .spawn()?;
.arg("-c")
.arg(command.clone())
.stdout(Stdio::piped())
.stderr(Stdio::piped())
.spawn()
.expect("failed to execute process");
let stdout = child.stdout.take().unwrap(); let stdout = child
let stderr = child.stderr.take().unwrap(); .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 stdout_fd = stdout.as_raw_fd();
let stderr_fd = stderr.as_raw_fd(); let stderr_fd = stderr.as_raw_fd();
fcntl(stdout_fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK)) 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))?;
fcntl(stderr_fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))
.expect("Failed to set non-blocking mode");
(BufReader::new(stdout), BufReader::new(stderr)) let output_buffer = BufReader::new(stdout);
let error_buffer = BufReader::new(stderr);
Ok(Buffer {
output_buffer,
error_buffer,
})
} }