mirror of
https://github.com/Llewellynvdm/exa.git
synced 2024-12-25 17:51:10 +00:00
Turn the file filter options into their own struct
This commit is contained in:
parent
827a1e11fd
commit
d4d04b7e92
@ -80,8 +80,7 @@ fn exa(options: &Options) {
|
||||
|
||||
match Dir::readdir(&dir_path) {
|
||||
Ok(ref dir) => {
|
||||
let unsorted_files = dir.files(false);
|
||||
let files: Vec<File> = options.transform_files(unsorted_files);
|
||||
let files = options.transform_files(dir.files(false));
|
||||
|
||||
// When recursing, add any directories to the dirs stack
|
||||
// backwards: the *last* element of the stack is used each
|
||||
|
@ -20,10 +20,15 @@ use self::Misfire::*;
|
||||
pub struct Options {
|
||||
pub dir_action: DirAction,
|
||||
pub path_strs: Vec<String>,
|
||||
pub filter: FileFilter,
|
||||
view: View,
|
||||
}
|
||||
|
||||
#[derive(PartialEq, Debug, Copy)]
|
||||
pub struct FileFilter {
|
||||
reverse: bool,
|
||||
show_invisibles: bool,
|
||||
sort_field: SortField,
|
||||
view: View,
|
||||
}
|
||||
|
||||
impl Options {
|
||||
@ -67,18 +72,26 @@ impl Options {
|
||||
Ok(Options {
|
||||
dir_action: try!(dir_action(&matches)),
|
||||
path_strs: if matches.free.is_empty() { vec![ ".".to_string() ] } else { matches.free.clone() },
|
||||
view: try!(view(&matches)),
|
||||
filter: FileFilter {
|
||||
reverse: matches.opt_present("reverse"),
|
||||
show_invisibles: matches.opt_present("all"),
|
||||
sort_field: sort_field,
|
||||
view: try!(view(&matches)),
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
pub fn transform_files<'a>(&self, files: Vec<File<'a>>) -> Vec<File<'a>> {
|
||||
self.filter.transform_files(files)
|
||||
}
|
||||
|
||||
/// Display the files using this Option's View.
|
||||
pub fn view(&self, dir: Option<&Dir>, files: &[File]) {
|
||||
self.view.view(dir, files)
|
||||
}
|
||||
}
|
||||
|
||||
impl FileFilter {
|
||||
/// Transform the files (sorting, reversing, filtering) before listing them.
|
||||
pub fn transform_files<'a>(&self, mut files: Vec<File<'a>>) -> Vec<File<'a>> {
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user