refactor: cleanup code

This commit is contained in:
andy.boot
2023-01-04 21:24:57 +00:00
parent 57115bd624
commit 15845dee3e
+20 -21
View File
@@ -143,28 +143,27 @@ fn walk(
// return walk(entry.path(), permissions_flag, ignore_directories, allowed_filesystems, use_apparent_size, by_filecount, ignore_hidden); // return walk(entry.path(), permissions_flag, ignore_directories, allowed_filesystems, use_apparent_size, by_filecount, ignore_hidden);
if !ignore_file(entry, walk_data) { if ignore_file(entry, walk_data) {
if let Ok(data) = entry.file_type() { return None;
if data.is_symlink() && walk_data.ignore_links { }
return None; if let Ok(data) = entry.file_type() {
} if data.is_symlink() && walk_data.ignore_links {
return if data.is_dir() || (walk_data.follow_links && data.is_symlink()) return None;
{
walk(entry.path(), permissions_flag, walk_data, depth + 1)
} else {
build_node(
entry.path(),
vec![],
walk_data.filter_regex,
walk_data.invert_filter_regex,
walk_data.use_apparent_size,
data.is_symlink(),
data.is_file(),
walk_data.by_filecount,
depth,
)
};
} }
if data.is_dir() || (walk_data.follow_links && data.is_symlink()) {
return walk(entry.path(), permissions_flag, walk_data, depth + 1);
}
return build_node(
entry.path(),
vec![],
walk_data.filter_regex,
walk_data.invert_filter_regex,
walk_data.use_apparent_size,
data.is_symlink(),
data.is_file(),
walk_data.by_filecount,
depth,
);
} }
} else { } else {
permissions_flag.store(true, atomic::Ordering::Relaxed); permissions_flag.store(true, atomic::Ordering::Relaxed);