Add errors for config file loading errors

This commit is contained in:
Matthias Beyer 2016-01-19 18:05:00 +01:00
parent 9cf3e22636
commit f7494333fa

View file

@ -1,10 +1,79 @@
use std::default::Default;
use std::fmt::{Debug, Formatter, Error};
use std::fmt::{Debug, Display, Formatter, Error};
use std::path::PathBuf;
use std::result::Result as RResult;
pub use config::types::Config;
pub use config::reader::from_file;
pub mod error {
use std::error::Error;
use std::fmt::{Debug, Display, Formatter};
use std::fmt::Error as FmtError;
#[derive(Clone, Debug, PartialEq)]
pub enum ConfigErrorKind {
ConfigNotFound,
ConfigParsingFailed,
NoConfigFileFound,
}
#[derive(Debug)]
pub struct ConfigError {
kind: ConfigErrorKind,
cause: Option<Box<Error>>,
}
impl ConfigError {
pub fn new(kind: ConfigErrorKind, cause: Option<Box<Error>>) -> ConfigError {
ConfigError {
kind: kind,
cause: cause,
}
}
pub fn kind(&self) -> ConfigErrorKind {
self.kind.clone()
}
pub fn as_str(e: &ConfigError) -> &'static str {
match e.kind() {
ConfigErrorKind::ConfigNotFound => "Config not found",
ConfigErrorKind::ConfigParsingFailed => "Config parsing failed",
ConfigErrorKind::NoConfigFileFound => "No config file found",
}
}
}
impl Display for ConfigError {
fn fmt(&self, fmt: &mut Formatter) -> Result<(), FmtError> {
try!(write!(fmt, "{}", ConfigError::as_str(self)));
Ok(())
}
}
impl Error for ConfigError {
fn description(&self) -> &str {
ConfigError::as_str(self)
}
fn cause(&self) -> Option<&Error> {
self.cause.as_ref().map(|e| &**e)
}
}
}
use self::error::{ConfigError, ConfigErrorKind};
pub type Result<T> = RResult<T, ConfigError>;
pub struct Configuration {
verbosity: bool,
editor: Option<String>,
@ -13,8 +82,8 @@ pub struct Configuration {
impl Configuration {
pub fn new(rtp: &PathBuf) -> Option<Configuration> {
fetch_config(&rtp).and_then(|cfg| {
pub fn new(rtp: &PathBuf) -> Result<Configuration> {
fetch_config(&rtp).map(|cfg| {
let verbosity = cfg.lookup_boolean("verbosity").unwrap_or(false);
let editor = cfg.lookup_str("editor").map(String::from);
let editor_opts = String::from(cfg.lookup_str("editor-opts").unwrap_or(""));
@ -24,17 +93,17 @@ impl Configuration {
debug!(" - editor : {:?}", editor);
debug!(" - editor-opts: {}", editor_opts);
Some(Configuration {
Configuration {
verbosity: verbosity,
editor: editor,
editor_opts: editor_opts,
})
}
})
}
}
fn fetch_config(rtp: &PathBuf) -> Option<Config> {
fn fetch_config(rtp: &PathBuf) -> Result<Config> {
use std::process::exit;
use std::env;
@ -61,15 +130,21 @@ fn fetch_config(rtp: &PathBuf) -> Option<Config> {
].iter()
.flatten()
.filter(|path| path.exists())
.map(|path| from_file(&path).ok())
.filter(|loaded| loaded.is_some())
.map(|path| {
from_file(&path)
.map_err(|e| {
ConfigError::new(ConfigErrorKind::ConfigParsingFailed, Some(Box::new(e)))
})
})
.filter(|loaded| loaded.is_ok())
.nth(0)
.map(|inner| inner.unwrap())
.ok_or(ConfigError::new(ConfigErrorKind::NoConfigFileFound, None))
}
impl Debug for Configuration {
fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
fn fmt(&self, f: &mut Formatter) -> RResult<(), Error> {
try!(write!(f, "Configuration (verbose: {})", self.verbosity));
Ok(())
}