Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add an option to specify max depth #96

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −4
Open

Add an option to specify max depth #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ pub struct Opt {
#[structopt(short, long)]
/// Don't ask for confirmation before deleting
disable_delete_confirmation: bool,
#[structopt(short, long)]
/// The max depth of directories
max_depth: Option<usize>,
}

fn main() {
Expand Down Expand Up @@ -91,6 +94,7 @@ fn try_main() -> Result<(), failure::Error> {
folder,
opts.apparent_size,
opts.disable_delete_confirmation,
opts.max_depth,
);
}
Err(_) => failure::bail!("Failed to get stdout: are you trying to pipe 'diskonaut'?"),
Expand All @@ -105,6 +109,7 @@ pub fn start<B>(
path: PathBuf,
show_apparent_size: bool,
disable_delete_confirmation: bool,
max_depth: Option<usize>,
) where
B: Backend + Send + 'static,
{
Expand Down Expand Up @@ -187,16 +192,21 @@ pub fn start<B>(
let instruction_sender = instruction_sender.clone();
let loaded = loaded.clone();
move || {
'scanning: for entry in WalkDir::new(&path)
let walker = WalkDir::new(&path)
.parallelism(if SHOULD_SCAN_HD_FILES_IN_MULTIPLE_THREADS {
RayonDefaultPool
} else {
Serial
})
.skip_hidden(false)
.follow_links(false)
.into_iter()
{
.follow_links(false);

let walker_with_depth = match max_depth {
Some(depth) => walker.max_depth(depth),
None => walker,
};

'scanning: for entry in walker_with_depth.into_iter() {
let instruction_sent = match entry {
Ok(entry) => match entry.metadata() {
Ok(file_metadata) => {
Expand Down