Mirrors/rip
2
0
Fork 0
mirror of https://github.com/nivekuil/rip synced 2024-11-22 19:53:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix panic on inspecting small files

Browse source
This commit is contained in:
Kevin Liu 2016-10-23 19:10:27 -07:00
parent e0d48f5aca
commit b5cd8615c7
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main.rs
View file

@ -183,8 +183,9 @@ Send files to the graveyard (/tmp/.graveyard) instead of unlinking them.")
// Print the first few top-level files in the directory // Print the first few top-level files in the directory
for entry in WalkDir::new(source) for entry in WalkDir::new(source)
.min_depth(1).max_depth(1).into_iter() .min_depth(1).max_depth(1).into_iter()
.filter_map(|entry| entry.ok())
.take(FILES_TO_INSPECT) { .take(FILES_TO_INSPECT) {
println!("{}", entry.unwrap().path().display()); println!("{}", entry.path().display());
} }
} else { } else {
println!("{}: file, {}", target, println!("{}: file, {}", target,

9
src/util.rs
View file

@ -35,7 +35,10 @@ fn humanize_bytes(bytes: u64) -> String {
let pair = values.iter() let pair = values.iter()
.enumerate() .enumerate()
.take_while(|x| bytes as usize / (1000 as usize).pow(x.0 as u32) > 10) .take_while(|x| bytes as usize / (1000 as usize).pow(x.0 as u32) > 10)
.last() .last();
.unwrap(); if let Some(p) = pair {
format!("{} {}", bytes as usize / (1000 as usize).pow(pair.0 as u32), pair.1) format!("{} {}", bytes as usize / (1000 as usize).pow(p.0 as u32), p.1)
} else {
format!("{} {}", bytes, values[0])
}
} }