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

Move the show-invisibles flag into a struct

Browse Source
This commit is contained in:
Benjamin Sago 2017-06-26 23:28:10 +01:00
parent c7f18873fd
commit 5ace1264f2
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/options/filter.rs
View File

@ -60,7 +60,7 @@ pub struct FileFilter {
/// most of them are or whether they're still needed. Every file name /// most of them are or whether they're still needed. Every file name
/// evaluation that goes through my home directory is slowed down by /// evaluation that goes through my home directory is slowed down by
/// this accumulated sludge. /// this accumulated sludge.
show_invisibles: bool, dot_filter: DotFilter,
/// Glob patterns to ignore. Any file name that matches *any* of these /// Glob patterns to ignore. Any file name that matches *any* of these
/// patterns won't be displayed in the list. /// patterns won't be displayed in the list.
@ -76,7 +76,7 @@ impl FileFilter {
list_dirs_first: matches.opt_present("group-directories-first"), list_dirs_first: matches.opt_present("group-directories-first"),
reverse: matches.opt_present("reverse"), reverse: matches.opt_present("reverse"),
sort_field: SortField::deduce(matches)?, sort_field: SortField::deduce(matches)?,
show_invisibles: matches.opt_present("all"), dot_filter: DotFilter::deduce(matches),
ignore_patterns: IgnorePatterns::deduce(matches)?, ignore_patterns: IgnorePatterns::deduce(matches)?,
}) })
} }
@ -84,8 +84,9 @@ impl FileFilter {
/// Remove every file in the given vector that does *not* pass the /// Remove every file in the given vector that does *not* pass the
/// filter predicate for files found inside a directory. /// filter predicate for files found inside a directory.
pub fn filter_child_files(&self, files: &mut Vec<File>) { pub fn filter_child_files(&self, files: &mut Vec<File>) {
if !self.show_invisibles { match self.dot_filter {
files.retain(|f| !f.is_dotfile()); DotFilter::JustFiles => files.retain(|f| !f.is_dotfile()),
DotFilter::ShowDotfiles => {/* keep all elements */},
} }
files.retain(|f| !self.ignore_patterns.is_ignored(f)); files.retain(|f| !self.ignore_patterns.is_ignored(f));
@ -252,6 +253,31 @@ impl SortField {
} }
#[derive(PartialEq, Debug, Copy, Clone)]
enum DotFilter {
/// Show files and dotfiles, but hide `.` and `..`.
ShowDotfiles,
/// Just show files, hiding anything beginning with a dot.
JustFiles,
}
impl Default for DotFilter {
fn default() -> DotFilter {
DotFilter::JustFiles
}
}
impl DotFilter {
pub fn deduce(matches: &getopts::Matches) -> DotFilter {
if matches.opt_present("all") { DotFilter::ShowDotfiles }
else { DotFilter::JustFiles }
}
}
#[derive(PartialEq, Default, Debug, Clone)] #[derive(PartialEq, Default, Debug, Clone)]
struct IgnorePatterns { struct IgnorePatterns {
patterns: Vec<glob::Pattern>, patterns: Vec<glob::Pattern>,