Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-11-22 12:05:11 +00:00
Code Issues Projects Releases Wiki Activity

Add --help flag

Browse Source
This commit is contained in:
Ben S 2014-11-25 15:54:42 +00:00
parent 0b1e94a3c8
commit e1d3512a69
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/exa.rs
View File

@ -31,8 +31,8 @@ fn main() {
let args: Vec<String> = os::args();
match Options::getopts(args) {
Err(err) => println!("Invalid options:\n{}", err),
Ok(opts) => exa(&opts),
Err(error_code) => os::set_exit_status(error_code),
Ok(options) => exa(&options),
};
}

39
src/options.rs
View File

@ -42,8 +42,8 @@ pub struct Options {
impl Options {
pub fn getopts(args: Vec<String>) -> Result<Options, getopts::Fail_> {
let opts = &[
pub fn getopts(args: Vec<String>) -> Result<Options, int> {
let opts = [
getopts::optflag("1", "oneline", "display one entry per line"),
getopts::optflag("a", "all", "show dot-files"),
getopts::optflag("b", "binary", "use binary prefixes in file sizes"),
@ -57,20 +57,31 @@ impl Options {
getopts::optopt ("s", "sort", "field to sort by", "WORD"),
getopts::optflag("S", "blocks", "show number of file system blocks"),
getopts::optflag("x", "across", "sort multi-column view entries across"),
getopts::optflag("?", "help", "show list of command-line options"),
];
match getopts::getopts(args.tail(), opts) {
Err(f) => Err(f),
Ok(ref matches) => Ok(Options {
header: matches.opt_present("header"),
list_dirs: matches.opt_present("list-dirs"),
path_strs: if matches.free.is_empty() { vec![ ".".to_string() ] } else { matches.free.clone() },
reverse: matches.opt_present("reverse"),
show_invisibles: matches.opt_present("all"),
sort_field: matches.opt_str("sort").map(|word| SortField::from_word(word)).unwrap_or(SortField::Name),
view: Options::view(matches),
})
let matches = match getopts::getopts(args.tail(), &opts) {
Ok(m) => m,
Err(e) => {
println!("Invalid options: {}", e);
return Err(1);
}
};
if matches.opt_present("help") {
println!("exa - ls with more features\n\n{}", getopts::usage("Usage:\n exa [options] [files...]", &opts))
return Err(2);
}
Ok(Options {
header: matches.opt_present("header"),
list_dirs: matches.opt_present("list-dirs"),
path_strs: if matches.free.is_empty() { vec![ ".".to_string() ] } else { matches.free.clone() },
reverse: matches.opt_present("reverse"),
show_invisibles: matches.opt_present("all"),
sort_field: matches.opt_str("sort").map(|word| SortField::from_word(word)).unwrap_or(SortField::Name),
view: Options::view(&matches),
})
}
fn view(matches: &getopts::Matches) -> View {