Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
133 changes: 128 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nmuidi"
version = "0.1.5"
version = "0.1.6"
edition = "2021"
description = "Parallelizes deleting directories which can significantly speed up deleting large deeply nested directories with a large number of files on Windows"
readme = "README.md"
Expand All @@ -19,3 +19,4 @@ num_cpus = "1.16.0"
itertools = "0.11.0"
log = "0.4.20"
pretty_env_logger = "0.5.0"
clap = { version = "4.6.1", features = ["cargo"] }
36 changes: 33 additions & 3 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use clap::{arg, command};
use log::{debug, trace};
#[doc(inline)]
use nmuidi::prelude::*;
Expand All @@ -6,13 +7,42 @@ use std::{env, time::Instant};
fn main() {
pretty_env_logger::init();

let mut cmd = command!()
.arg(
arg!(-t --threads <THREADS> "Number of threads")
.value_parser(clap::value_parser!(usize)),
)
.arg(
arg!(<DIR> ... "One or more directories to clean")
.id("dirs")
.value_delimiter(',')
.required(true),
);

if env::args().any(|arg| arg == "/?" || arg == "-?") {
cmd.print_help().unwrap();
println!();
return;
}

let matches = cmd.get_matches();
let threads = matches.get_one::<usize>("threads");
let dirs: Vec<_> = matches
.get_many::<String>("dirs")
.expect("required")
.collect();

let mut directory_timings = Vec::new();
let start_time = Instant::now();
for dir in env::args().skip(1) {
for dir in dirs {
println!("Cleaning {dir}");
let start = Instant::now();

Cleaner::new(&dir).clean();
let mut cleaner = Cleaner::new(&dir);
if let Some(&threads) = threads {
debug!("Setting threads to {threads}");
cleaner = cleaner.threads(threads);
}
cleaner.clean();
directory_timings.push((dir, start.elapsed()));
}

Expand Down
8 changes: 7 additions & 1 deletion src/nmuidi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ impl Cleaner {
}
}

pub fn threads(mut self, threads: usize) -> Self {
self.threads = threads;
self
}

/// Perform the deletion of the selected directory
pub fn clean(&mut self) {
self.remove_files();
Expand Down Expand Up @@ -111,7 +116,8 @@ impl Cleaner {
None
})
.collect();
dirs.sort_by(|a, b| b.1.cmp(&a.1)); // Note reverse sort
dirs.sort_by_key(|b| std::cmp::Reverse(b.1)); // Note reverse sort
self.dirs = dirs;
}
}

Loading