Implement dirs-only option #95
Conversation
When dirs-only is enabled every node other than a directory will be skipped, and is not shown in the output. Closes solidiquis#84.
src/render/tree/mod.rs
Outdated
| @@ -89,6 +89,9 @@ impl Tree { | |||
| let mut root_id = None; | |||
|
|
|||
| while let Ok(TraversalState::Ongoing(node)) = rx.recv() { | |||
| if ctx.dirs_only && !node.is_dir() { | |||
There was a problem hiding this comment.
Hmm so doing it here would result in the loss of disk usage information which is something I would still want to compute and surface to the end-user unless they supply the --supress-size option. We'd probably want to filter for dirs on the display step which happens somewhere here.
There was a problem hiding this comment.
Sounds reasonable, I'll update the PR accordingly.
There was a problem hiding this comment.
That's the output for the repository:
By the way, is there a way to disable colors in the ouptut? If not I'll create another a issue or PR.
There was a problem hiding this comment.
Just saw that this should have printed └─ in front of utils.
There was a problem hiding this comment.
There isn't currently a way to disable colors. Feel free to open an issue for that. I'd likely be the one to address that as unfortunately given how erdtree is built it would require a lot of tedious changes.
There was a problem hiding this comment.
I think we need to filter this on a node and not on a display level. I'll notify you when I have a proper fix.
There was a problem hiding this comment.
@solidiquis It's not ideal, but pruning the file nodes after the tree has been assembled seems to be the easiest way to get a dirs-only view that also includes size information. To get directory sizes we need to accumulate the size of all nodes below the directory. Commit 3333586 contains the patch that prunes the file nodes if dirs-only is set.
There was a problem hiding this comment.
Also, the tree is now properly rendered:
src/render/tree/mod.rs
Outdated
| @@ -249,6 +249,9 @@ impl Display for Tree { | |||
| ctx: &Context, | |||
| f: &mut Formatter<'_>, | |||
| ) -> fmt::Result { | |||
| if ctx.dirs_only && !node.is_dir() { | |||
There was a problem hiding this comment.
Perhaps better to move this to the if-statement on line 291 to avoid another making a superfluous function call
There was a problem hiding this comment.
I think this is outdated due to #95 (comment).
|
Not sure why the CI fails. Locally it builds and also the tests succeed without any warning, and there's no uncommitted state. |
|
Sorry for taking so long to get back to this as work has been incredibly hectic. I've made quite a few changes since and had to address a bug with pruning here, which influenced how I ended up going about edit: |
Thank you for the update, I know how stressful it can be to maintain an open source library or application. |
When
dirs-onlyis enabled every node other than a directory will be skipped, i.e. it is not shown in the output.Closes #84.
TODOs