Skip to content

Minor cleanup, prettier output #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bootandy merged 4 commits into from
Mar 21, 2018
Merged

Minor cleanup, prettier output #1

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4c6c68
minor whitespace changes from rustfmt
nebkor Mar 21, 2018
f802d7a
quiet some clippy warnings
nebkor Mar 21, 2018
1c80cbf
Make printing slightly prettier
nebkor Mar 21, 2018
99f462f
s/sibblings/siblings/g
nebkor Mar 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 34 additions & 17 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand All @@ -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();
}
Expand Down Expand Up @@ -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");
}
Expand All @@ -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 {
Expand All @@ -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(
Expand Down Expand Up @@ -346,6 +362,7 @@ fn human_readable_number(size: u64) -> (String) {
}

mod tests {
#[allow(unused_imports)]
use super::*;

#[test]
Expand Down