Robot
/
fd
mirror of https://github.com/sharkdp/fd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add filter trait for walk

This commit is contained in:
Jie Yang 2017-10-21 19:27:14 +08:00
parent 570ea78d24
commit 4e811dbbec
1 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/walk.rs
View File

@ -9,7 +9,7 @@ use std::sync::mpsc::channel;
use std::thread;
use std::time;
use ignore::{self, WalkBuilder};
use ignore::{self, WalkBuilder, DirEntry};
use regex::Regex;
/// The receiver thread can either be buffering results or directly streaming to the console.
@ -31,6 +31,34 @@ pub enum FileType {
SymLink,
}
trait Filter {
fn filter_by_type(&self, item: &DirEntry) -> bool;
fn filter_by_ext(&self, item: &DirEntry) -> bool;
}
impl Filter for FdOptions {
fn filter_by_type(&self, entry: &DirEntry) -> bool {
match self.file_type {
FileType::RegularFile => entry.file_type().map_or(true, |ft| !ft.is_file()),
FileType::Directory => entry.file_type().map_or(true, |ft| !ft.is_dir()),
FileType::SymLink => entry.file_type().map_or(true, |ft| !ft.is_symlink()),
FileType::Any => false,
}
}
fn filter_by_ext(&self, entry: &DirEntry) -> bool {
if let Some(ref filter_ext) = self.extension {
let entry_ext = entry.path().extension().map(|e| {
e.to_string_lossy().to_lowercase()
});
if entry_ext.map_or(true, |ext| ext != *filter_ext) {
return true;
}
}
false
}
}
/// Recursively scan the given search path for files / pathnames matching the pattern.
///
/// If the `--exec` argument was supplied, this will create a thread pool for executing
@ -150,33 +178,12 @@ pub fn scan(root: &Path, pattern: Arc<Regex>, config: Arc<FdOptions>) {
}
// Filter out unwanted file types.
match config.file_type {
FileType::Any => (),
FileType::RegularFile => {
if entry.file_type().map_or(false, |ft| !ft.is_file()) {
return ignore::WalkState::Continue;
}
}
FileType::Directory => {
if entry.file_type().map_or(false, |ft| !ft.is_dir()) {
return ignore::WalkState::Continue;
}
}
FileType::SymLink => {
if entry.file_type().map_or(false, |ft| !ft.is_symlink()) {
return ignore::WalkState::Continue;
}
}
if config.filter_by_type(&entry) {
return ignore::WalkState::Continue;
}
// Filter out unwanted extensions.
if let Some(ref filter_ext) = config.extension {
let entry_ext = entry_path.extension().map(
|e| e.to_string_lossy().to_lowercase(),
);
if entry_ext.map_or(true, |ext| ext != *filter_ext) {
return ignore::WalkState::Continue;
}
if config.filter_by_ext(&entry) {
return ignore::WalkState::Continue;
}
let search_str_o = if config.search_full_path {