MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-10-31 07:04:04 +00:00
Code Issues Releases Wiki Activity

Added validation for --tabs.

Browse Source 
Also added a comment to explain what 0 represents.
This commit is contained in:
eth-p
2018-09-12 10:08:58 -07:00
parent 9ef1e9f792
commit d404139ff7
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app.rs
View File

@@ -42,6 +42,7 @@ pub struct Config<'a> {
pub term_width: usize, pub term_width: usize,
/// The width of tab characters. /// The width of tab characters.
/// Currently, a value of 0 will cause tabs to be passed through without expanding them.
pub tab_width: usize, pub tab_width: usize,
/// Whether or not to simply loop through all input (`cat` mode) /// Whether or not to simply loop through all input (`cat` mode)
@@ -282,9 +283,14 @@ impl App {
).arg( ).arg(
Arg::with_name("tabs") Arg::with_name("tabs")
.long("tabs") .long("tabs")
.short("t")
.takes_value(true) .takes_value(true)
.value_name("width") .value_name("tabs")
.validator(
|t| t.parse::<u32>()
.map_err(|_t| "must be a number")
.map(|_t| ()) // Convert to Result<(), &str>
.map_err(|e| e.to_string()) // Convert to Result<(), String>
)
.help("Sets the tab width.") .help("Sets the tab width.")
.long_help("Sets the tab width. Use a width of 0 to pass tabs through \ .long_help("Sets the tab width. Use a width of 0 to pass tabs through \
directly"), directly"),
@@ -410,8 +416,9 @@ impl App {
tab_width: self tab_width: self
.matches .matches
.value_of("tabs") .value_of("tabs")
.and_then(|w| w.parse().ok()) .map(String::from)
.or_else(|| env::var("BAT_TABS").ok().and_then(|w| w.parse().ok())) .or_else(|| env::var("BAT_TABS").ok())
.and_then(|t| t.parse().ok())
.unwrap_or( .unwrap_or(
if output_components.plain() && paging_mode == PagingMode::Never { if output_components.plain() && paging_mode == PagingMode::Never {
0 0