Merge pull request #1 from chrislusf/master

sync

1 files changed, 35 insertions, 69 deletions

diff --git a/weed/shell/command_fs_ls.go b/weed/shell/command_fs_ls.go
index 6979635e1..69ebe1b30 100644
--- a/weed/shell/command_fs_ls.go
+++ b/weed/shell/command_fs_ls.go
@@ -1,15 +1,15 @@
 package shell
 
 import (
-	"context"
 	"fmt"
-	"github.com/chrislusf/seaweedfs/weed/filer2"
-	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
 	"io"
 	"os"
 	"os/user"
 	"strconv"
 	"strings"
+
+	"github.com/chrislusf/seaweedfs/weed/filer2"
+	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
 )
 
 func init() {
@@ -59,90 +59,56 @@ func (c *commandFsLs) Do(args []string, commandEnv *CommandEnv, writer io.Writer
 		return err
 	}
 
-	ctx := context.Background()
-
-	if commandEnv.isDirectory(ctx, filerServer, filerPort, path) {
+	if commandEnv.isDirectory(filerServer, filerPort, path) {
 		path = path + "/"
 	}
 
 	dir, name := filer2.FullPath(path).DirAndName()
+	entryCount := 0
 
-	return commandEnv.withFilerClient(ctx, filerServer, filerPort, func(client filer_pb.SeaweedFilerClient) error {
-
-		return paginateOneDirectory(ctx, writer, client, dir, name, 1000, isLongFormat, showHidden)
-
-	})
-
-}
-
-func paginateOneDirectory(ctx context.Context, writer io.Writer, client filer_pb.SeaweedFilerClient, dir, name string, paginateSize int, isLongFormat, showHidden bool) (err error) {
+	err = filer2.ReadDirAllEntries(commandEnv.getFilerClient(filerServer, filerPort), filer2.FullPath(dir), name, func(entry *filer_pb.Entry, isLast bool) {
 
-	entryCount := 0
-	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
+		if !showHidden && strings.HasPrefix(entry.Name, ".") {
 			return
 		}
 
-		paginatedCount = len(resp.Entries)
-
-		for _, entry := range resp.Entries {
+		entryCount++
 
-			if !showHidden && strings.HasPrefix(entry.Name, ".") {
-				continue
-			}
-
-			entryCount++
-
-			if isLongFormat {
-				fileMode := os.FileMode(entry.Attributes.FileMode)
-				userName, groupNames := entry.Attributes.UserName, entry.Attributes.GroupName
-				if userName == "" {
-					if user, userErr := user.LookupId(strconv.Itoa(int(entry.Attributes.Uid))); userErr == nil {
-						userName = user.Username
-					}
-				}
-				groupName := ""
-				if len(groupNames) > 0 {
-					groupName = groupNames[0]
+		if isLongFormat {
+			fileMode := os.FileMode(entry.Attributes.FileMode)
+			userName, groupNames := entry.Attributes.UserName, entry.Attributes.GroupName
+			if userName == "" {
+				if user, userErr := user.LookupId(strconv.Itoa(int(entry.Attributes.Uid))); userErr == nil {
+					userName = user.Username
 				}
-				if groupName == "" {
-					if group, groupErr := user.LookupGroupId(strconv.Itoa(int(entry.Attributes.Gid))); groupErr == nil {
-						groupName = group.Name
-					}
-				}
-
-				if dir == "/" {
-					// just for printing
-					dir = ""
+			}
+			groupName := ""
+			if len(groupNames) > 0 {
+				groupName = groupNames[0]
+			}
+			if groupName == "" {
+				if group, groupErr := user.LookupGroupId(strconv.Itoa(int(entry.Attributes.Gid))); groupErr == nil {
+					groupName = group.Name
 				}
-				fmt.Fprintf(writer, "%s %3d %s %s %6d %s/%s\n",
-					fileMode, len(entry.Chunks),
-					userName, groupName,
-					filer2.TotalSize(entry.Chunks), dir, entry.Name)
-			} else {
-				fmt.Fprintf(writer, "%s\n", entry.Name)
 			}
 
-			startFromFileName = entry.Name
-
+			if dir == "/" {
+				// just for printing
+				dir = ""
+			}
+			fmt.Fprintf(writer, "%s %3d %s %s %6d %s/%s\n",
+				fileMode, len(entry.Chunks),
+				userName, groupName,
+				filer2.TotalSize(entry.Chunks), dir, entry.Name)
+		} else {
+			fmt.Fprintf(writer, "%s\n", entry.Name)
 		}
-	}
 
-	if isLongFormat {
+	})
+
+	if isLongFormat && err == nil {
 		fmt.Fprintf(writer, "total %d\n", entryCount)
 	}
 
 	return
-
 }