bootandy/archived-dust
1
0
Fork 0
mirror of https://github.com/bootandy/dust.git synced 2026-06-08 11:29:05 +03:00
Code Issues 21 Packages Projects Releases 10 Wiki Activity

Squash Node and DirEnt objects into single object

Browse Source
This commit is contained in:
bootandy
2018-04-03 17:05:28 +01:00
parent 6198e3183f
commit 120b4e16e7
3 changed files with 23 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/mod.rs
+6 -7
View File
@@ -3,7 +3,7 @@ use std::collections::HashSet;
use std::fs::{self, ReadDir};
use std::io;
use dust::{DirEnt, Node};
use dust::Node;
mod platform;
use self::platform::*;
@@ -28,8 +28,8 @@ fn examine_dir_str(loc: &str, apparent_size: bool) -> (bool, Node) {
let (hp, result) = examine_dir(fs::read_dir(loc), apparent_size, &mut inodes);
// This needs to be folded into the below recursive call somehow
let new_size = result.iter().fold(0, |a, b| a + b.entry().size());
(hp, Node::new(DirEnt::new(loc, new_size), result))
let new_size = result.iter().fold(0, |a, b| a + b.size());
(hp, Node::new(loc, new_size, result))
}
fn examine_dir(
@@ -64,11 +64,10 @@ fn examine_dir(
let (hp, recursive) =
examine_dir(fs::read_dir(d.path()), apparent_size, inodes);
have_permission = have_permission && hp;
let new_size =
recursive.iter().fold(size, |a, b| a + b.entry().size());
result.push(Node::new(DirEnt::new(&s, new_size), recursive))
let new_size = recursive.iter().fold(size, |a, b| a + b.size());
result.push(Node::new(s, new_size, recursive))
} else {
result.push(Node::new(DirEnt::new(&s, size), vec![]))
result.push(Node::new(s, size, vec![]))
}
}
(_, None) => have_permission = false,