xavo95/repak
1
0
Fork 0
mirror of https://github.com/xavo95/repak.git synced 2025-01-18 19:04:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add progress bar for packing/unpacking

Browse source
This commit is contained in:
Truman Kilen 2023-02-23 16:49:35 -06:00
parent f1fe922c2d
commit 28ae54f743
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
repak_cli/Cargo.toml
View file

@ -14,6 +14,7 @@ path = "src/main.rs"
aes = { workspace = true } aes = { workspace = true }
base64 = { workspace = true } base64 = { workspace = true }
clap = { version = "4.1.4", features = ["derive"] } clap = { version = "4.1.4", features = ["derive"] }
indicatif = { version = "0.17.3", features = ["rayon"] }
path-clean = "0.1.0" path-clean = "0.1.0"
path-slash = "0.2.1" path-slash = "0.2.1"
rayon = "1.6.1" rayon = "1.6.1"

26
repak_cli/src/main.rs
View file

@ -178,6 +178,8 @@ fn list(args: ActionInfo) -> Result<(), repak::Error> {
Ok(()) Ok(())
} }
const STYLE: &str = "[{elapsed_precise}] [{wide_bar}] {pos}/{len} ({eta})";
fn unpack(args: ActionUnpack) -> Result<(), repak::Error> { fn unpack(args: ActionUnpack) -> Result<(), repak::Error> {
let pak = repak::PakReader::new_any( let pak = repak::PakReader::new_any(
BufReader::new(File::open(&args.input)?), BufReader::new(File::open(&args.input)?),
@ -246,11 +248,15 @@ fn unpack(args: ActionUnpack) -> Result<(), repak::Error> {
.filter_map(|e| e.transpose()) .filter_map(|e| e.transpose())
.collect::<Result<Vec<_>, repak::Error>>()?; .collect::<Result<Vec<_>, repak::Error>>()?;
entries.par_iter().try_for_each_init( use indicatif::ParallelProgressIterator;
|| File::open(&args.input),
|file, entry| -> Result<(), repak::Error> { let iter = entries.par_iter().progress_with_style(indicatif::ProgressStyle::with_template(STYLE).unwrap());
let progress = iter.progress.clone();
iter.try_for_each_init(
|| (progress.clone(), File::open(&args.input)),
|(progress, file), entry| -> Result<(), repak::Error> {
if args.verbose { if args.verbose {
println!("extracting {}", entry.entry_path); progress.println(format!("unpacking {}", entry.entry_path));
} }
fs::create_dir_all(&entry.out_dir)?; fs::create_dir_all(&entry.out_dir)?;
pak.read_file( pak.read_file(
@ -302,17 +308,21 @@ fn pack(args: ActionPack) -> Result<(), repak::Error> {
Some(args.path_hash_seed), Some(args.path_hash_seed),
); );
for p in &paths { use indicatif::ProgressIterator;
let mut iter = paths.iter().progress_with_style(indicatif::ProgressStyle::with_template(STYLE).unwrap());
let progress = iter.progress.clone();
iter.try_for_each(|p| {
let rel = &p let rel = &p
.strip_prefix(input_path) .strip_prefix(input_path)
.expect("file not in input directory") .expect("file not in input directory")
.to_slash() .to_slash()
.expect("failed to convert to slash path"); .expect("failed to convert to slash path");
if args.verbose { if args.verbose {
println!("packing {}", &rel); progress.println(format!("packing {}", &rel));
} }
pak.write_file(rel, &mut BufReader::new(File::open(p)?))?; pak.write_file(rel, &mut BufReader::new(File::open(p)?))
} })?;
pak.write_index()?; pak.write_index()?;