|
|
@ -12,7 +12,7 @@ use console::Term;
|
|
|
|
#[cfg(windows)]
|
|
|
|
#[cfg(windows)]
|
|
|
|
use ansi_term;
|
|
|
|
use ansi_term;
|
|
|
|
|
|
|
|
|
|
|
|
use assets::{BAT_STYLE_DEFAULT, BAT_THEME_DEFAULT};
|
|
|
|
use assets::BAT_THEME_DEFAULT;
|
|
|
|
use errors::*;
|
|
|
|
use errors::*;
|
|
|
|
use line_range::LineRange;
|
|
|
|
use line_range::LineRange;
|
|
|
|
use style::{OutputComponent, OutputComponents, OutputWrap};
|
|
|
|
use style::{OutputComponent, OutputComponents, OutputWrap};
|
|
|
@ -430,23 +430,22 @@ impl App {
|
|
|
|
[OutputComponent::Numbers].iter().cloned().collect()
|
|
|
|
[OutputComponent::Numbers].iter().cloned().collect()
|
|
|
|
} else if matches.is_present("plain") {
|
|
|
|
} else if matches.is_present("plain") {
|
|
|
|
[OutputComponent::Plain].iter().cloned().collect()
|
|
|
|
[OutputComponent::Plain].iter().cloned().collect()
|
|
|
|
} else if matches.is_present("style") {
|
|
|
|
|
|
|
|
values_t!(matches.values_of("style"), OutputComponent)?
|
|
|
|
|
|
|
|
.into_iter()
|
|
|
|
|
|
|
|
.map(|style| style.components(self.interactive_output))
|
|
|
|
|
|
|
|
.fold(HashSet::new(), |mut acc, components| {
|
|
|
|
|
|
|
|
acc.extend(components.iter().cloned());
|
|
|
|
|
|
|
|
acc
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
let style_str = env::var("BAT_STYLE").unwrap_or(String::from(BAT_STYLE_DEFAULT));
|
|
|
|
let env_style_components: Option<Vec<OutputComponent>> =
|
|
|
|
|
|
|
|
transpose(env::var("BAT_STYLE").ok().map(|style_str| {
|
|
|
|
style_str
|
|
|
|
style_str
|
|
|
|
.split(",")
|
|
|
|
.split(",")
|
|
|
|
.map(|x| OutputComponent::from_str(&x))
|
|
|
|
.map(|x| OutputComponent::from_str(&x))
|
|
|
|
.map(|s| match s {
|
|
|
|
.collect::<Result<Vec<OutputComponent>>>()
|
|
|
|
Ok(style) => style.components(self.interactive_output),
|
|
|
|
}))?;
|
|
|
|
Err(_) => &[],
|
|
|
|
|
|
|
|
}).fold(HashSet::new(), |mut acc, components| {
|
|
|
|
values_t!(matches.values_of("style"), OutputComponent)
|
|
|
|
|
|
|
|
.ok()
|
|
|
|
|
|
|
|
.or(env_style_components)
|
|
|
|
|
|
|
|
.unwrap_or(vec![OutputComponent::Full])
|
|
|
|
|
|
|
|
.into_iter()
|
|
|
|
|
|
|
|
.map(|style| style.components(self.interactive_output))
|
|
|
|
|
|
|
|
.fold(HashSet::new(), |mut acc, components| {
|
|
|
|
acc.extend(components.iter().cloned());
|
|
|
|
acc.extend(components.iter().cloned());
|
|
|
|
acc
|
|
|
|
acc
|
|
|
|
})
|
|
|
|
})
|
|
|
|