2 files changed, 136 insertions, 4 deletions
diff --git a/weed/shell/command_fs_ls.go b/weed/shell/command_fs_ls.go
index 6ad96f5ac..39f356916 100644
--- a/weed/shell/command_fs_ls.go
+++ b/weed/shell/command_fs_ls.go
@@ -24,11 +24,11 @@ func (c *commandFsLs) Name() string {
 }
 
 func (c *commandFsLs) Help() string {
-	return `[-l] [-a] list all files under a directory
+	return `list all files under a directory
 
-	fs.ls http://<filer_server>:<port>/dir/
-	fs.ls http://<filer_server>:<port>/dir/file_name
-	fs.ls http://<filer_server>:<port>/dir/file_prefix
+	fs.ls [-l] [-a] http://<filer_server>:<port>/dir/
+	fs.ls [-l] [-a] http://<filer_server>:<port>/dir/file_name
+	fs.ls [-l] [-a] http://<filer_server>:<port>/dir/file_prefix
 `
 }
 
diff --git a/weed/shell/command_fs_tree.go b/weed/shell/command_fs_tree.go
new file mode 100644
index 000000000..1f0f2935f
--- /dev/null
+++ b/weed/shell/command_fs_tree.go
@@ -0,0 +1,132 @@
+package shell
+
+import (
+	"context"
+	"fmt"
+	"github.com/chrislusf/seaweedfs/weed/filer2"
+	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
+	"io"
+	"strings"
+)
+
+func init() {
+	commands = append(commands, &commandFsTree{})
+}
+
+type commandFsTree struct {
+}
+
+func (c *commandFsTree) Name() string {
+	return "fs.tree"
+}
+
+func (c *commandFsTree) Help() string {
+	return `recursively list all files under a directory
+
+	fs.tree http://<filer_server>:<port>/dir/
+`
+}
+
+func (c *commandFsTree) Do(args []string, commandEnv *commandEnv, writer io.Writer) (err error) {
+
+	filerServer, filerPort, path, err := parseFilerUrl(args[len(args)-1])
+	if err != nil {
+		return err
+	}
+
+	dir, name := filer2.FullPath(path).DirAndName()
+	if strings.HasSuffix(path, "/") {
+		if path == "/" {
+			dir, name = "/", ""
+		} else {
+			dir, name = path[0 : len(path)-1], ""
+		}
+	}
+
+	ctx := context.Background()
+
+	return commandEnv.withFilerClient(ctx, filerServer, filerPort, func(client filer_pb.SeaweedFilerClient) error {
+
+		return treeTraverseDirectory(ctx, writer, client, dir, name, 1000, newPrefix(), 0)
+
+	})
+
+}
+func treeTraverseDirectory(ctx context.Context, writer io.Writer, client filer_pb.SeaweedFilerClient, dir, name string, paginateSize int, prefix *Prefix, level int) (err error) {
+
+	paginatedCount := -1
+	startFromFileName := ""
+
+	for paginatedCount == -1 || paginatedCount == paginateSize {
+		resp, listErr := client.ListEntries(ctx, &filer_pb.ListEntriesRequest{
+			Directory:          dir,
+			Prefix:             name,
+			StartFromFileName:  startFromFileName,
+			InclusiveStartFrom: false,
+			Limit:              uint32(paginateSize),
+		})
+		if listErr != nil {
+			err = listErr
+			return
+		}
+
+		paginatedCount = len(resp.Entries)
+		if paginatedCount > 0 {
+			prefix.addMarker(level)
+		}
+
+		for i, entry := range resp.Entries {
+
+			isLast := paginatedCount < paginateSize && i == paginatedCount-1
+			fmt.Fprintf(writer, "%s%s\n", prefix.getPrefix(level, isLast), entry.Name)
+
+			if entry.IsDirectory {
+				subDir := fmt.Sprintf("%s/%s", dir, entry.Name)
+				if dir == "/" {
+					subDir = "/" + entry.Name
+				}
+				err = treeTraverseDirectory(ctx, writer, client, subDir, "", paginateSize, prefix, level+1)
+			} else {
+			}
+			startFromFileName = entry.Name
+
+		}
+	}
+
+	return
+
+}
+
+type Prefix struct {
+	markers map[int]bool
+}
+
+func newPrefix() *Prefix {
+	return &Prefix{
+		markers: make(map[int]bool),
+	}
+}
+func (p *Prefix) addMarker(marker int) {
+	p.markers[marker] = true
+}
+func (p *Prefix) removeMarker(marker int) {
+	delete(p.markers, marker)
+}
+func (p *Prefix) getPrefix(level int, isLastChild bool) string {
+	var sb strings.Builder
+	for i := 0; i < level; i++ {
+		if _, ok := p.markers[i]; ok {
+			sb.WriteString("│")
+		} else {
+			sb.WriteString(" ")
+		}
+		sb.WriteString("   ")
+	}
+	if isLastChild {
+		sb.WriteString("└──")
+		p.removeMarker(level);
+	} else {
+		sb.WriteString("├──")
+	}
+	return sb.String()
+}