improved view subcommand

1 files changed, 35 insertions, 8 deletions

diff --git a/fctdrive/src/main.rs b/fctdrive/src/main.rs
index 91e5046..1dea4f2 100644
--- a/fctdrive/src/main.rs
+++ b/fctdrive/src/main.rs
@@ -724,7 +724,12 @@ struct RenameArgs {
 }
 
 #[derive(Debug, Args)]
-struct ViewArgs {}
+struct ViewArgs {
+    #[clap(short, long)]
+    recursive: bool,
+
+    path: Option<DrivePath>,
+}
 
 #[derive(Debug, Args)]
 struct ImportArgs {
@@ -857,16 +862,36 @@ fn cmd_view(args: ViewArgs) {
     let mut fs = Fs::default();
     let ops = read_log_file();
     ops.iter().for_each(|op| apply(&mut fs, op).unwrap());
-    write_node(&mut writer, &fs, fs.root, Default::default());
+    let node_id = match args.path {
+        Some(path) => find_node(&fs, &path),
+        None => Some(fs.root),
+    };
+    if let Some(node_id) = node_id {
+        write_node(
+            &mut writer,
+            &fs,
+            node_id,
+            Default::default(),
+            args.recursive,
+            true,
+        );
+    }
     writer.flush().unwrap();
     std::process::exit(0);
 }
 
-fn write_node(writer: &mut FsNodeWriter, fs: &Fs, node_id: FsNodeId, path: DrivePath) {
+fn write_node(
+    writer: &mut FsNodeWriter,
+    fs: &Fs,
+    node_id: FsNodeId,
+    path: DrivePath,
+    recursive: bool,
+    recurse: bool,
+) {
     let node = &fs.nodes[node_id];
     match node.kind {
         FsNodeKind::File => {
-            write!(
+            writeln!(
                 writer,
                 "{}\tfile\t{}\t{}\t{}",
                 path, node.lastmod, node.blob, node.author
@@ -874,15 +899,17 @@ fn write_node(writer: &mut FsNodeWriter, fs: &Fs, node_id: FsNodeId, path: Drive
             .unwrap();
         }
         FsNodeKind::Directory => {
-            write!(
+            writeln!(
                 writer,
                 "{}\tdir\t{}\t-\t{}",
                 path, node.lastmod, node.author
             )
             .unwrap();
-            for (child_comp, child_id) in node.children.iter() {
-                let child_path = path.push(child_comp.clone());
-                write_node(writer, fs, *child_id, child_path);
+            if recursive || recurse {
+                for (child_comp, child_id) in node.children.iter() {
+                    let child_path = path.push(child_comp.clone());
+                    write_node(writer, fs, *child_id, child_path, recursive, false);
+                }
             }
         }
     }