matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Propagate parsing errors

Browse source 
This somehow resolved another error as well, where the toml parser
reported an error for the parsed file, despite beeing one in the file.

I don't know how this commit fixed this, but it scares the shit out of
me.
This commit is contained in:
Matthias Beyer 2017-06-20 20:13:36 +02:00
parent 801622ecf2
commit 2790042f6f
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libimagrt/src/configuration.rs
View file

@ -23,6 +23,9 @@ use std::ops::Deref;
use toml::Value; use toml::Value;
use error::RuntimeErrorKind as REK;
use libimagerror::into::IntoError;
generate_error_module!( generate_error_module!(
generate_error_types!(ConfigError, ConfigErrorKind, generate_error_types!(ConfigError, ConfigErrorKind,
TOMLParserError => "TOML Parsing error", TOMLParserError => "TOML Parsing error",
@ -221,14 +224,12 @@ fn fetch_config(rtp: &PathBuf) -> Result<Value> {
use std::env; use std::env;
use std::fs::File; use std::fs::File;
use std::io::Read; use std::io::Read;
use std::io::Write;
use std::io::stderr;
use xdg_basedir; use xdg_basedir;
use itertools::Itertools; use itertools::Itertools;
use libimagutil::variants::generate_variants as gen_vars; use libimagutil::variants::generate_variants as gen_vars;
use libimagerror::trace::trace_error; use self::error::MapErrInto;
let variants = vec!["config", "config.toml", "imagrc", "imagrc.toml"]; let variants = vec!["config", "config.toml", "imagrc", "imagrc.toml"];
let modifier = |base: &PathBuf, v: &'static str| { let modifier = |base: &PathBuf, v: &'static str| {
@ -250,6 +251,7 @@ fn fetch_config(rtp: &PathBuf) -> Result<Value> {
.flatten() .flatten()
.filter(|path| path.exists() && path.is_file()) .filter(|path| path.exists() && path.is_file())
.map(|path| { .map(|path| {
debug!("Reading {:?}", path);
let content = { let content = {
let mut s = String::new(); let mut s = String::new();
let f = File::open(path); let f = File::open(path);
@ -261,17 +263,18 @@ fn fetch_config(rtp: &PathBuf) -> Result<Value> {
s s
}; };
match ::toml::de::from_str(&content[..]) { trace!("Contents of config file: \n---\n{}\n---", content);
Ok(res) => res,
Err(e) => { let toml = ::toml::de::from_str(&content[..])
write!(stderr(), "Config file parser error:").ok(); .map_err_into(ConfigErrorKind::TOMLParserError)
trace_error(&e); .map_err(Box::new)
None .map_err(|e| REK::Instantiate.into_error_with_cause(e));
}
} Some(toml)
}) })
.filter(|loaded| loaded.is_some()) .filter_map(|x| x)
.nth(0) .filter(|loaded| loaded.is_ok())
.map(|inner| Value::Table(inner.unwrap())) .map(|inner| Value::Table(inner.unwrap()))
.nth(0)
.ok_or(ConfigErrorKind::NoConfigFileFound.into()) .ok_or(ConfigErrorKind::NoConfigFileFound.into())
} }