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

Merge branch 'nebkor'

Browse Source
This commit is contained in:
Joe Ardent
2018-03-21 10:56:15 -07:00
parent 8fa83e3836 381d286847
commit 617b0d2971
3 changed files with 83 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+17 -22
View File
@@ -16,27 +16,22 @@ Usage: dust -n 30 <dir> (Shows 30 directories not 15)
```
dust .
161M .
160M └── ./target
123M ├── ./target/debug
83M │ ├── ./target/debug/deps
16M │ │ ├── ./target/debug/deps/libclap-82e6176feef5d4b7.rlib
8.6M │ │ └── ./target/debug/deps/dust-993f7d919d92f0f8.dSYM
8.6M │ │ └── ./target/debug/deps/dust-993f7d919d92f0f8.dSYM/Contents
8.6M │ │ └── ./target/debug/deps/dust-993f7d919d92f0f8.dSYM/Contents/Resources
27M │ ├── ./target/debug/incremental
12M │ └── ./target/debug/build
20M ├── ./target/x86_64-apple-darwin
20M │ └── ./target/x86_64-apple-darwin/debug
20M │ └── ./target/x86_64-apple-darwin/debug/deps
16M │ └── ./target/x86_64-apple-darwin/debug/deps/libclap-7e3f8513c52cd558.rlib
16M └── ./target/release
13M └── ./target/release/deps
djin:git/dust> dust
65M .
65M └─┬ ./target
49M ├─┬ ./target/debug
26M │ ├─┬ ./target/debug/deps
21M │ │ └── ./target/debug/deps/libclap-9e6625ac8ff074ad.rlib
13M │ ├── ./target/debug/dust
8.9M │ └─┬ ./target/debug/incremental
6.7M │ ├─┬ ./target/debug/incremental/dust-2748eiei2tcnp
6.7M │ │ └─┬ ./target/debug/incremental/dust-2748eiei2tcnp/s-ezd6jnik5u-163pyem-1aab9ncf5glum
3.0M │ │ └── ./target/debug/incremental/dust-2748eiei2tcnp/s-ezd6jnik5u-163pyem-1aab9ncf5glum/dep-graph.bin
2.2M │ └─┬ ./target/debug/incremental/dust-1dlon65p8m3vl
2.2M │ └── ./target/debug/incremental/dust-1dlon65p8m3vl/s-ezd6jncecv-1xsnfd0-4dw9l1r2th2t
15M └─┬ ./target/release
9.2M ├─┬ ./target/release/deps
6.7M │ └── ./target/release/deps/libclap-87bc2534ea57f044.rlib
5.9M └── ./target/release/dust
```
Performance: dust is currently about 4 times slower than du.
src/lib.rs
+45 -11
View File
@@ -2,34 +2,68 @@ use std::cmp::{Eq, Ord, Ordering, PartialEq, PartialOrd};
#[derive(Clone, Debug)]
pub struct Node {
pub dir: DirEnt,
pub children: Vec<Node>,
entry: DirEnt,
children: Vec<Node>,
}
#[derive(Clone, Debug)]
pub struct DirEnt {
pub name: String,
pub size: u64,
name: String,
size: u64,
}
impl Node {
pub fn new(entry: DirEnt, children: Vec<Node>) -> Self {
Node {
entry: entry,
children: children,
}
}
pub fn children(&self) -> &Vec<Node> {
&self.children
}
pub fn entry(&self) -> &DirEnt {
&self.entry
}
}
impl DirEnt {
pub fn new(name: &str, size: u64) -> Self {
DirEnt {
name: String::from(name),
size: size,
}
}
pub fn name(&self) -> &String {
&self.name
}
pub fn size(&self) -> u64 {
self.size
}
}
impl Ord for Node {
fn cmp(&self, other: &Self) -> Ordering {
if self.dir.size > other.dir.size {
if self.entry.size > other.entry.size {
Ordering::Less
} else if self.dir.size < other.dir.size {
} else if self.entry.size < other.entry.size {
Ordering::Greater
} else {
let my_slashes = self.dir.name.matches('/').count();
let other_slashes = other.dir.name.matches('/').count();
let my_slashes = self.entry.name.matches('/').count();
let other_slashes = other.entry.name.matches('/').count();
if my_slashes > other_slashes {
Ordering::Greater
} else if my_slashes < other_slashes {
Ordering::Less
} else {
if self.dir.name < other.dir.name {
if self.entry.name < other.entry.name {
Ordering::Less
} else if self.dir.name > other.dir.name {
} else if self.entry.name > other.entry.name {
Ordering::Greater
} else {
Ordering::Equal
@@ -45,7 +79,7 @@ impl PartialOrd for Node {
}
impl PartialEq for Node {
fn eq(&self, other: &Self) -> bool {
(&self.dir.name, self.dir.size) == (&other.dir.name, other.dir.size)
(&self.entry.name, self.entry.size) == (&other.entry.name, other.entry.size)
}
}
impl Eq for Node {}
src/utils.rs
+21 -41
View File
@@ -13,34 +13,25 @@ use self::ansi_term::Colour::Fixed;
pub fn get_dir_tree(filenames: &Vec<&str>) -> (bool, Vec<Node>) {
let mut permissions = true;
let mut results = vec![];
for b in filenames {
let mut new_name = String::from(*b);
for &b in filenames {
let mut new_name = String::from(b);
while new_name.chars().last() == Some('/') && new_name.len() != 1 {
new_name.pop();
}
let (hp, data) = examine_dir_str(new_name);
let (hp, data) = examine_dir_str(&new_name);
permissions = permissions && hp;
results.push(data);
}
(permissions, results)
}
fn examine_dir_str(loc: String) -> (bool, Node) {
fn examine_dir_str(loc: &str) -> (bool, Node) {
let mut inodes: HashSet<u64> = HashSet::new();
let (hp, result) = examine_dir(fs::read_dir(&loc), &mut inodes);
let (hp, result) = examine_dir(fs::read_dir(loc), &mut inodes);
// This needs to be folded into the below recursive call somehow
let new_size = result.iter().fold(0, |a, b| a + b.dir.size);
(
hp,
Node {
dir: DirEnt {
name: loc,
size: new_size,
},
children: result,
},
)
let new_size = result.iter().fold(0, |a, b| a + b.entry().size());
(hp, Node::new(DirEnt::new(loc, new_size), result))
}
#[cfg(target_os = "linux")]
@@ -101,22 +92,11 @@ fn examine_dir(a_dir: io::Result<ReadDir>, inodes: &mut HashSet<u64>) -> (bool,
if d.path().is_dir() && !file_type.is_symlink() {
let (hp, recursive) = examine_dir(fs::read_dir(d.path()), inodes);
have_permission = have_permission && hp;
let new_size = recursive.iter().fold(size, |a, b| a + b.dir.size);
result.push(Node {
dir: DirEnt {
name: s,
size: new_size,
},
children: recursive,
})
let new_size =
recursive.iter().fold(size, |a, b| a + b.entry().size());
result.push(Node::new(DirEnt::new(&s, new_size), recursive))
} else {
result.push(Node {
dir: DirEnt {
name: s,
size: size,
},
children: vec![],
})
result.push(Node::new(DirEnt::new(&s, size), vec![]))
}
}
(_, None) => have_permission = false,
@@ -146,7 +126,7 @@ pub fn find_big_ones<'a>(l: &'a Vec<Node>, max_to_show: usize) -> Vec<&Node> {
// Must be a list of pointers into new_l otherwise b_list will go out of scope
// when it is deallocated
let mut b_list: Vec<&Node> = new_l[processed_pointer]
.children
.children()
.iter()
.map(|a| a)
.collect();
@@ -184,11 +164,11 @@ fn display_node<S: Into<String>>(
is = is.replace("├──", "│ ");
is = is.replace("├─┬", "│ ");
let printable_node_slashes = node_to_print.dir.name.matches('/').count();
let printable_node_slashes = node_to_print.entry().name().matches('/').count();
let mut num_siblings = to_display.iter().fold(0, |a, b| {
if node_to_print.children.contains(b)
&& b.dir.name.matches('/').count() == printable_node_slashes + 1
if node_to_print.children().contains(b)
&& b.entry().name().matches('/').count() == printable_node_slashes + 1
{
a + 1
} else {
@@ -199,11 +179,11 @@ fn display_node<S: Into<String>>(
let mut is_biggest = true;
let mut has_display_children = false;
for node in to_display {
if node_to_print.children.contains(node) {
let has_children = node.children.len() > 0;
if node.dir.name.matches("/").count() == printable_node_slashes + 1 {
if node_to_print.children().contains(node) {
let has_children = node.children().len() > 0;
if node.entry().name().matches("/").count() == printable_node_slashes + 1 {
num_siblings -= 1;
for ref n in node.children.iter() {
for ref n in node.children().iter() {
has_display_children = has_display_children || to_display.contains(n);
}
let has_children = has_children && has_display_children;
@@ -236,7 +216,7 @@ fn display_node<S: Into<String>>(
}
fn print_this_node(node_to_print: &Node, is_biggest: bool, depth: u8, indentation_str: &str) {
let padded_size = format!("{:>5}", human_readable_number(node_to_print.dir.size),);
let padded_size = format!("{:>5}", human_readable_number(node_to_print.entry().size()),);
println!(
"{} {} {}",
if is_biggest {
@@ -247,7 +227,7 @@ fn print_this_node(node_to_print: &Node, is_biggest: bool, depth: u8, indentatio
indentation_str,
Fixed(7)
.on(Fixed(cmp::min(8, (depth) as u8) + 231))
.paint(node_to_print.dir.name.to_string())
.paint(node_to_print.entry().name().to_string())
);
}