Merge pull request #206 from solidiquis/inverted-flat

inverted flat layout

Author: solidiquis

README.md

@@ -227,6 +227,7 @@ Options:
           - regular:  Outputs the tree with the root node at the bottom of the output
           - inverted: Outputs the tree with the root node at the top of the output
           - flat:     Outputs a flat layout using paths rather than an ASCII tree
+          - iflat:    Outputs an inverted flat layout with the root at the top of the output
 
   -., --hidden
           Show hidden files
@@ -525,7 +526,7 @@ Additionally, the word and line-count of directories are the summation of all of
 
 ### Layouts
 
-`erdtree` comes with three layouts:
+`erdtree` comes with four layouts:
 
 ```
 -y, --layout <LAYOUT>
@@ -537,6 +538,7 @@ Additionally, the word and line-count of directories are the summation of all of
       - regular:  Outputs the tree with the root node at the bottom of the output
       - inverted: Outputs the tree with the root node at the top of the output
       - flat:     Outputs a flat layout using paths rather than an ASCII tree
+      - iflat:    Outputs an inverted flat layout with the root at the top of the output
 ```
 
 * The `inverted` layout a more traditional `tree`-like layout where the root node is at the very top of the output.

src/context/config/toml/mod.rs

@@ -199,7 +199,6 @@ mod unix {
 mod windows {
     use super::super::{ERDTREE_CONFIG_TOML, ERDTREE_DIR};
     use config::{Config, File};
-    use std::{env, path::PathBuf};
 
     /// Try to read in config from the following location:
     /// - `%APPDATA%\erdtree\.erdtree.toml`

src/context/layout.rs

@@ -10,6 +10,9 @@ pub enum Type {
     /// Outputs the tree with the root node at the top of the output
     Inverted,
 
-    /// Outputs a flat layout using paths rather than an ASCII tree.
+    /// Outputs a flat layout using paths rather than an ASCII tree
     Flat,
+
+    /// Outputs an inverted flat layout with the root at the top of the output
+    Iflat,
 }

src/main.rs

@@ -22,7 +22,7 @@
 use clap::CommandFactory;
 use context::{layout, Context};
 use progress::Message;
-use render::{Engine, Flat, Inverted, Regular};
+use render::{Engine, Flat, FlatInverted, Inverted, Regular};
 use std::{error::Error, io::stdout, process::ExitCode};
 use tree::Tree;
 
@@ -97,6 +97,10 @@ fn run() -> Result<(), Box<dyn Error>> {
             let render = Engine::<Flat>::new(tree, ctx);
             format!("{render}")
         }
+        layout::Type::Iflat => {
+            let render = Engine::<FlatInverted>::new(tree, ctx);
+            format!("{render}")
+        }
         layout::Type::Inverted => {
             let render = Engine::<Inverted>::new(tree, ctx);
             format!("{render}")

src/render/layout/flat_inverted.rs

@@ -0,0 +1,44 @@
+use crate::{
+    render::{
+        grid::{self, Row},
+        Engine, FlatInverted,
+    },
+    tree::{count::FileCount, Tree},
+};
+use indextree::NodeEdge;
+use std::fmt::{self, Display};
+
+impl Display for Engine<FlatInverted> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let ctx = self.context();
+        let tree = self.tree();
+        let arena = tree.arena();
+        let root_id = tree.root_id();
+        let max_depth = ctx.level();
+        let mut file_count_data = vec![];
+
+        for edge in root_id.traverse(arena) {
+            let node_id = match edge {
+                NodeEdge::Start(id) => id,
+                NodeEdge::End(_) => continue,
+            };
+            file_count_data.push(Tree::compute_file_count(node_id, arena));
+
+            let node = arena[node_id].get();
+
+            if node.depth() > max_depth {
+                continue;
+            }
+
+            let row = Row::<grid::Flat>::new(node, ctx, None);
+
+            writeln!(f, "{row}")?;
+        }
+
+        if !file_count_data.is_empty() {
+            write!(f, "\n{}", FileCount::from(file_count_data))?;
+        }
+
+        Ok(())
+    }
+}

src/render/layout/mod.rs

@@ -4,5 +4,8 @@ pub mod regular;
 /// See [`super::Flat`]
 pub mod flat;
 
+/// See [`super::FlatInverted`]
+pub mod flat_inverted;
+
 /// See [`super::Inverted`]
 pub mod inverted;

src/render/mod.rs

@@ -26,6 +26,9 @@ pub struct Engine<T> {
 /// The flat output that is similar to `du`, without the ASCII tree.
 pub struct Flat;
 
+/// Same as [`Flat`] but the root is at the top of the output.
+pub struct FlatInverted;
+
 /// The tree output with the root directory at the bottom of the output.
 pub struct Regular;