gitea-mirror/dust
1
0
Fork 0
mirror of https://github.com/bootandy/dust.git synced 2025-12-12 07:40:40 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from nebkor/master

Browse Source 
Minor cleanup, prettier output
This commit is contained in:
andy boot
2018-03-21 12:12:19 -04:00
committed by GitHub
parent 2c495364c7 99f462f023
commit cef95fa415
1 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/main.rs
View File

@@ -31,8 +31,8 @@ impl Ord for Node {
} else if self.dir.size < other.dir.size {
Ordering::Greater
} else {
let my_slashes = self.dir.name.matches("/").count();
let other_slashes = other.dir.name.matches("/").count();
let my_slashes = self.dir.name.matches('/').count();
let other_slashes = other.dir.name.matches('/').count();
if my_slashes > other_slashes {
Ordering::Greater
@@ -68,7 +68,7 @@ struct Dir {
size: u64,
}
static DEFAULT_NUMBER_OF_LINES: &'static str = &"15";
static DEFAULT_NUMBER_OF_LINES: &'static str = "15";
fn main() {
let options = App::new("Trailing args example")
@@ -91,16 +91,16 @@ fn main() {
};
let number_of_lines = value_t!(options.value_of("number_of_lines"), usize).unwrap();
let (permissions, results) = get_dir_tree(filenames);
let (permissions, results) = get_dir_tree(&filenames);
let slice_it = find_big_ones(&results, number_of_lines);
display(permissions, slice_it);
display(permissions, &slice_it);
}
fn get_dir_tree(filenames: Vec<&str>) -> (bool, Vec<Node>) {
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);
let mut new_name = String::from(*b);
while new_name.chars().last() == Some('/') && new_name.len() != 1 {
new_name.pop();
}
@@ -253,7 +253,7 @@ fn find_big_ones<'a>(l: &'a Vec<Node>, max_to_show: usize) -> Vec<&Node> {
}
}
fn display(permissions: bool, to_display: Vec<&Node>) -> () {
fn display(permissions: bool, to_display: &Vec<&Node>) -> () {
if !permissions {
eprintln!("Did not have permissions for all directories");
}
@@ -271,14 +271,16 @@ fn display_node<S: Into<String>>(
let mut is = indentation_str.into();
print_this_node(node_to_print, is_first, depth, is.as_ref());
is = is.replace("└──", " ");
is = is.replace("├──", "│ ");
is = is.replace("└─┬", " ");
is = is.replace("└──", " ");
is = is.replace("├──", "│ ");
is = is.replace("├─┬", "│ ");
let printable_node_slashes = node_to_print.dir.name.matches("/").count();
let printable_node_slashes = node_to_print.dir.name.matches('/').count();
let mut num_sibblings = to_display.iter().fold(0, |a, b| {
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
&& b.dir.name.matches('/').count() == printable_node_slashes + 1
{
a + 1
} else {
@@ -287,15 +289,29 @@ 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 {
num_sibblings -= 1;
num_siblings -= 1;
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;
let tree_chars = {
if num_sibblings == 0 {
"└──"
if num_siblings == 0 {
if has_children {
"└─┬"
} else {
"└──"
}
} else {
"├──"
if has_children {
"├─┬"
} else {
"├──"
}
}
};
display_node(
@@ -346,6 +362,7 @@ fn human_readable_number(size: u64) -> (String) {
}
mod tests {
#[allow(unused_imports)]
use super::*;
#[test]