bootandy/archived-dust
1
0
Fork 0
mirror of https://github.com/bootandy/dust.git synced 2026-06-08 11:29:05 +03:00
Code Issues 21 Packages Projects Releases 10 Wiki Activity

Cleanup: Vec -> &[]. Remove println.

Browse Source
This commit is contained in:
andy.boot
2021-10-24 11:58:34 +01:00
parent 4b3dc3988d
commit d983175189
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dir_walker.rs
+9 -9
View File
@@ -18,10 +18,10 @@ use std::fs::DirEntry;
use crate::platform::get_metadata; use crate::platform::get_metadata;
pub struct WalkData { pub struct WalkData<'a> {
pub ignore_directories: HashSet<PathBuf>, pub ignore_directories: HashSet<PathBuf>,
pub filter_regex: Vec<Regex>, pub filter_regex: &'a [Regex],
pub invert_filter_regex: Vec<Regex>, pub invert_filter_regex: &'a [Regex],
pub allowed_filesystems: HashSet<u64>, pub allowed_filesystems: HashSet<u64>,
pub use_apparent_size: bool, pub use_apparent_size: bool,
pub by_filecount: bool, pub by_filecount: bool,
@@ -93,14 +93,14 @@ fn ignore_file(entry: &DirEntry, walk_data: &WalkData) -> bool {
// Keeping `walk_data.filter_regex.is_empty()` is important for performance reasons, it stops unnecessary work // Keeping `walk_data.filter_regex.is_empty()` is important for performance reasons, it stops unnecessary work
if !walk_data.filter_regex.is_empty() if !walk_data.filter_regex.is_empty()
&& entry.path().is_file() && entry.path().is_file()
&& is_filtered_out_due_to_regex(&walk_data.filter_regex, &entry.path()) && is_filtered_out_due_to_regex(walk_data.filter_regex, &entry.path())
{ {
return true; return true;
} }
if !walk_data.invert_filter_regex.is_empty() if !walk_data.invert_filter_regex.is_empty()
&& entry.path().is_file() && entry.path().is_file()
&& is_filtered_out_due_to_invert_regex(&walk_data.invert_filter_regex, &entry.path()) && is_filtered_out_due_to_invert_regex(walk_data.invert_filter_regex, &entry.path())
{ {
return true; return true;
} }
@@ -131,8 +131,8 @@ fn walk(dir: PathBuf, permissions_flag: &AtomicBool, walk_data: &WalkData) -> Op
return build_node( return build_node(
entry.path(), entry.path(),
vec![], vec![],
&walk_data.filter_regex, walk_data.filter_regex,
&walk_data.invert_filter_regex, walk_data.invert_filter_regex,
walk_data.use_apparent_size, walk_data.use_apparent_size,
data.is_symlink(), data.is_symlink(),
data.is_file(), data.is_file(),
@@ -152,8 +152,8 @@ fn walk(dir: PathBuf, permissions_flag: &AtomicBool, walk_data: &WalkData) -> Op
build_node( build_node(
dir, dir,
children, children,
&walk_data.filter_regex, walk_data.filter_regex,
&walk_data.invert_filter_regex, walk_data.invert_filter_regex,
walk_data.use_apparent_size, walk_data.use_apparent_size,
false, false,
false, false,
src/main.rs
+2 -7
View File
@@ -273,11 +273,6 @@ fn main() {
} }
}; };
if options.is_present("filter") {
println!("Filtering by: {:?}", filter_regexs);
}
// todo incl invert regex
let ignored_full_path: HashSet<PathBuf> = ignore_directories let ignored_full_path: HashSet<PathBuf> = ignore_directories
.into_iter() .into_iter()
.flat_map(|x| simplified_dirs.iter().map(move |d| d.join(x.clone()))) .flat_map(|x| simplified_dirs.iter().map(move |d| d.join(x.clone())))
@@ -285,8 +280,8 @@ fn main() {
let walk_data = WalkData { let walk_data = WalkData {
ignore_directories: ignored_full_path, ignore_directories: ignored_full_path,
filter_regex: filter_regexs, filter_regex: &filter_regexs,
invert_filter_regex: invert_filter_regexs, invert_filter_regex: &invert_filter_regexs,
allowed_filesystems, allowed_filesystems,
use_apparent_size, use_apparent_size,
by_filecount, by_filecount,