matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Change output to not have quotes when printing string, int, float or bool

Browse source 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2019-10-20 15:04:55 +02:00
parent eb85635bef
commit a6bbcd65f4
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
bin/core/imag-header/src/main.rs
View file

@ -47,10 +47,12 @@ extern crate libimagutil;
use std::io::Write; use std::io::Write;
use std::str::FromStr; use std::str::FromStr;
use std::string::ToString;
use clap::ArgMatches; use clap::ArgMatches;
use filters::filter::Filter; use filters::filter::Filter;
use failure::Error; use failure::Error;
use toml::Value;
use libimagerror::exit::ExitCode; use libimagerror::exit::ExitCode;
use libimagerror::exit::ExitUnwrap; use libimagerror::exit::ExitUnwrap;
@ -134,10 +136,23 @@ fn read<'a, 'e, I>(rt: &Runtime, mtch: &ArgMatches<'a>, iter: I) -> i32
.map_err_trace_exit_unwrap() .map_err_trace_exit_unwrap()
.map(|value| { .map(|value| {
trace!("Processing headers: Got value {:?}", value); trace!("Processing headers: Got value {:?}", value);
writeln!(output, "{}", value)
.to_exit_code() let string_representation = match value {
.map(|_| accu) Value::String(s) => Some(s.to_owned()),
.unwrap_or_else(ExitCode::code) Value::Integer(i) => Some(i.to_string()),
Value::Float(f) => Some(f.to_string()),
Value::Boolean(b) => Some(b.to_string()),
_ => None,
};
if let Some(repr) = string_representation {
writeln!(output, "{}", repr)
} else {
writeln!(output, "{}", value)
}
.to_exit_code()
.map(|_| accu)
.unwrap_or_else(ExitCode::code)
}) })
.unwrap_or_else(|| { .unwrap_or_else(|| {
// if value not present and configured // if value not present and configured