refactor APIs

1 files changed, 44 insertions, 38 deletions

diff --git a/weed/pb/filer_pb/filer_client.go b/weed/pb/filer_pb/filer_client.go
index 9fe5fd146..079fbd671 100644
--- a/weed/pb/filer_pb/filer_client.go
+++ b/weed/pb/filer_pb/filer_client.go
@@ -85,57 +85,63 @@ func ReadDirAllEntries(filerClient FilerClient, fullDirPath util.FullPath, prefi
 }
 
 func List(filerClient FilerClient, parentDirectoryPath, prefix string, fn EachEntryFunciton, startFrom string, inclusive bool, limit uint32) (err error) {
-	return doList(filerClient, util.FullPath(parentDirectoryPath), prefix, fn, startFrom, inclusive, limit)
+	return filerClient.WithFilerClient(func(client SeaweedFilerClient) error {
+		return doSeaweedList(client, util.FullPath(parentDirectoryPath), prefix, fn, startFrom, inclusive, limit)
+	})
 }
 
 func doList(filerClient FilerClient, fullDirPath util.FullPath, prefix string, fn EachEntryFunciton, startFrom string, inclusive bool, limit uint32) (err error) {
+	return filerClient.WithFilerClient(func(client SeaweedFilerClient) error {
+		return doSeaweedList(client, fullDirPath, prefix, fn, startFrom, inclusive, limit)
+	})
+}
 
-	err = filerClient.WithFilerClient(func(client SeaweedFilerClient) error {
+func SeaweedList(client SeaweedFilerClient, parentDirectoryPath, prefix string, fn EachEntryFunciton, startFrom string, inclusive bool, limit uint32) (err error) {
+	return doSeaweedList(client, util.FullPath(parentDirectoryPath), prefix, fn, startFrom, inclusive, limit)
+}
 
-		request := &ListEntriesRequest{
-			Directory:          string(fullDirPath),
-			Prefix:             prefix,
-			StartFromFileName:  startFrom,
-			Limit:              limit,
-			InclusiveStartFrom: inclusive,
-		}
+func doSeaweedList(client SeaweedFilerClient, fullDirPath util.FullPath, prefix string, fn EachEntryFunciton, startFrom string, inclusive bool, limit uint32) (err error) {
 
-		glog.V(4).Infof("read directory: %v", request)
-		ctx, cancel := context.WithCancel(context.Background())
-		defer cancel()
-		stream, err := client.ListEntries(ctx, request)
-		if err != nil {
-			return fmt.Errorf("list %s: %v", fullDirPath, err)
-		}
+	request := &ListEntriesRequest{
+		Directory:          string(fullDirPath),
+		Prefix:             prefix,
+		StartFromFileName:  startFrom,
+		Limit:              limit,
+		InclusiveStartFrom: inclusive,
+	}
 
-		var prevEntry *Entry
-		for {
-			resp, recvErr := stream.Recv()
-			if recvErr != nil {
-				if recvErr == io.EOF {
-					if prevEntry != nil {
-						if err := fn(prevEntry, true); err != nil {
-							return err
-						}
+	glog.V(4).Infof("read directory: %v", request)
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	stream, err := client.ListEntries(ctx, request)
+	if err != nil {
+		return fmt.Errorf("list %s: %v", fullDirPath, err)
+	}
+
+	var prevEntry *Entry
+	for {
+		resp, recvErr := stream.Recv()
+		if recvErr != nil {
+			if recvErr == io.EOF {
+				if prevEntry != nil {
+					if err := fn(prevEntry, true); err != nil {
+						return err
 					}
-					break
-				} else {
-					return recvErr
 				}
+				break
+			} else {
+				return recvErr
 			}
-			if prevEntry != nil {
-				if err := fn(prevEntry, false); err != nil {
-					return err
-				}
+		}
+		if prevEntry != nil {
+			if err := fn(prevEntry, false); err != nil {
+				return err
 			}
-			prevEntry = resp.Entry
 		}
+		prevEntry = resp.Entry
+	}
 
-		return nil
-
-	})
-
-	return
+	return nil
 }
 
 func Exists(filerClient FilerClient, parentDirectoryPath string, entryName string, isDirectory bool) (exists bool, err error) {