From 030e06f1b653b21d15af3f97a67f0b3e0798e8af Mon Sep 17 00:00:00 2001
From: Will Scott <will.scott@protocol.ai>
Date: Fri, 5 Jan 2024 14:56:26 +0100
Subject: [PATCH] Add a `car ls --unixfs-blocks` to render two-column output
 like bafy... foo.txt

---
 cmd/car/car.go  |  4 ++++
 cmd/car/list.go | 16 +++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/cmd/car/car.go b/cmd/car/car.go
index 6e7c63a2..8191208f 100644
--- a/cmd/car/car.go
+++ b/cmd/car/car.go
@@ -207,6 +207,10 @@ func main1() int {
 						Name:  "unixfs",
 						Usage: "List unixfs filesystem from the root of the car",
 					},
+					&cli.BoolFlag{
+						Name:  "unixfs-blocks",
+						Usage: "List blocks of unixfs objects in the car",
+					},
 				},
 			},
 			{
diff --git a/cmd/car/list.go b/cmd/car/list.go
index 62cdb265..8ba7ebff 100644
--- a/cmd/car/list.go
+++ b/cmd/car/list.go
@@ -32,7 +32,7 @@ func ListCar(c *cli.Context) error {
 	}
 	defer outStream.Close()
 
-	if c.Bool("unixfs") {
+	if c.Bool("unixfs") || c.Bool("unixfs-blocks") {
 		return listUnixfs(c, outStream)
 	}
 
@@ -180,7 +180,12 @@ func printUnixFSNode(c *cli.Context, prefix string, node cid.Cid, ls *ipld.LinkS
 		for !i.Done() {
 			_, l := i.Next()
 			name := path.Join(prefix, l.Name.Must().String())
-			fmt.Fprintf(outStream, "%s\n", name)
+			if c.Bool("unixfs-blocks") {
+				cidL, _ := l.Hash.AsLink()
+				fmt.Fprintf(outStream, "%s %s\n", cidL.(cidlink.Link).Cid, name)
+			} else {
+				fmt.Fprintf(outStream, "%s\n", name)
+			}
 			// recurse into the file/directory
 			cl, err := l.Hash.AsLink()
 			if err != nil {
@@ -201,7 +206,12 @@ func printUnixFSNode(c *cli.Context, prefix string, node cid.Cid, ls *ipld.LinkS
 		i := hn.Iterator()
 		for !i.Done() {
 			n, l := i.Next()
-			fmt.Fprintf(outStream, "%s\n", path.Join(prefix, n.String()))
+			if c.Bool("unixfs-blocks") {
+				cl, _ := l.AsLink()
+				fmt.Fprintf(outStream, "%s %s\n", cl.(cidlink.Link).Cid, path.Join(prefix, n.String()))
+			} else {
+				fmt.Fprintf(outStream, "%s\n", path.Join(prefix, n.String()))
+			}
 			// recurse into the file/directory
 			cl, err := l.AsLink()
 			if err != nil {