MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-02-20 11:58:45 +00:00
Code Issues Releases Wiki Activity

Added BAT_STYLE env variable functionality

Browse Source
This commit is contained in:
ms2300 2018-09-09 18:28:04 -06:00
parent d6c8fee044
commit 9d6bde48fa
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app.rs
View File

@ -1,6 +1,7 @@
use std::collections::HashSet;
use std::env;
use std::path::Path;
use std::str::FromStr;
use atty::{self, Stream};
@ -11,7 +12,7 @@ use console::Term;
#[cfg(windows)]
use ansi_term;
use assets::BAT_THEME_DEFAULT;
use assets::{BAT_THEME_DEFAULT, BAT_STYLE_DEFAULT};
use errors::*;
use line_range::LineRange;
use style::{OutputComponent, OutputComponents, OutputWrap};
@ -174,7 +175,7 @@ impl App {
.takes_value(true)
.possible_values(&[
"auto", "full", "plain", "changes", "header", "grid", "numbers",
]).default_value("auto")
])
.help("Comma-separated list of style elements to display.")
.long_help(
"Configure which elements (line numbers, file headers, grid \
@ -428,7 +429,7 @@ impl App {
[OutputComponent::Numbers].iter().cloned().collect()
} else if matches.is_present("plain") {
[OutputComponent::Plain].iter().cloned().collect()
} else {
} else if matches.is_present("style") {
values_t!(matches.values_of("style"), OutputComponent)?
.into_iter()
.map(|style| style.components(self.interactive_output))
@ -436,6 +437,17 @@ impl App {
acc.extend(components.iter().cloned());
acc
})
} else {
let style = env::var("BAT_STYLE").unwrap_or(String::from(BAT_STYLE_DEFAULT));
match OutputComponent::from_str(&style) {
Ok(s) => [s].iter()
.map(|style| style.components(self.interactive_output))
.fold(HashSet::new(), |mut acc, components| {
acc.extend(components.iter().cloned());
acc
}),
Err(_) => HashSet::new(),
}
},
))
}

1
src/assets.rs
View File

@ -18,6 +18,7 @@ lazy_static! {
ProjectDirs::from("", "", crate_name!()).expect("Could not get home directory");
}
pub const BAT_STYLE_DEFAULT: &str = "auto";
pub const BAT_THEME_DEFAULT: &str = "Monokai Extended";
pub struct HighlightingAssets {