error : unification de la gestion des erreurs

This commit is contained in:
Ahurac 2024-04-16 16:31:51 +02:00
parent a16ed0e030
commit 1270576444
3 changed files with 52 additions and 11 deletions

View file

@ -1,4 +1,5 @@
use crate::error::print_error; use crate::error;
use crate::error::CdError;
use crate::exit_code::ExitCode; use crate::exit_code::ExitCode;
use std::env; use std::env;
@ -18,10 +19,12 @@ pub(super) fn cd(args: &Vec<String>) -> ExitCode {
let exit_code: ExitCode; let exit_code: ExitCode;
if path.is_some() { if path.is_some() {
let result = set_current_dir(path.unwrap()); let path = path.unwrap();
let result = set_current_dir(&path);
if result.is_err() { if result.is_err() {
print_error("cd: no such file or directory"); let error = CdError::new(&args[0]);
error::print(Box::new(error));
exit_code = ExitCode::new(2); exit_code = ExitCode::new(2);
} else { } else {
exit_code = ExitCode::success(); exit_code = ExitCode::success();

View file

@ -2,7 +2,8 @@ mod builtins;
pub mod command_builder; pub mod command_builder;
pub mod command_sequence; pub mod command_sequence;
use crate::error::print_error; use crate::error;
use crate::error::CommandNotFoundError;
use crate::exit_code::ExitCode; use crate::exit_code::ExitCode;
type BuiltinFunction = fn(&Vec<String>) -> ExitCode; type BuiltinFunction = fn(&Vec<String>) -> ExitCode;
@ -81,11 +82,8 @@ impl Command for UnixProgram {
exit_code exit_code
} else { } else {
let message = format!( let error = CommandNotFoundError::new(self.command.get_program().to_str().unwrap());
"{}: command not found", error::print(Box::new(error));
self.command.get_program().to_str().unwrap()
);
print_error(message.as_str());
ExitCode::not_found() ExitCode::not_found()
} }
} }

View file

@ -1,9 +1,49 @@
use std::env; use std::env;
use std::fmt;
use std::fmt::{Display, Formatter};
use std::path::Path; use std::path::Path;
pub fn print_error(message: &str) { type Error = Box<dyn Display>;
pub struct CdError {
entry_name: String,
}
impl CdError {
pub fn new(entry_name: &str) -> Self {
Self {
entry_name: String::from(entry_name),
}
}
}
impl Display for CdError {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
write!(f, "cd: no such directory as '{}'", self.entry_name)
}
}
pub struct CommandNotFoundError {
command: String,
}
impl CommandNotFoundError {
pub fn new(command: &str) -> Self {
Self {
command: String::from(command),
}
}
}
impl Display for CommandNotFoundError {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
write!(f, "{}: command not found", self.command)
}
}
pub fn print(error: Error) {
let name = env::args().next().unwrap_or(String::from("rash")); let name = env::args().next().unwrap_or(String::from("rash"));
let name = Path::new(&name).file_name().unwrap().to_str().unwrap(); let name = Path::new(&name).file_name().unwrap().to_str().unwrap();
eprintln!("{}: {}", name, message); eprintln!("{}: {}", name, error);
} }