Merge pull request #3820 from ipfs/kevina/filestore-util-fix

filestore util: Use a Marshaler instead of PostRun...

core/commands/filestore.go

@@ -3,6 +3,7 @@ package commands
 import (
 	"context"
 	"fmt"
+	"io"
 
 	cmds "github.com/ipfs/go-ipfs/commands"
 	"github.com/ipfs/go-ipfs/core"
@@ -61,29 +62,27 @@ The output is:
 			res.SetOutput(out)
 		}
 	},
-	PostRun: func(req cmds.Request, res cmds.Response) {
-		if res.Error() != nil {
-			return
-		}
-		outChan, ok := res.Output().(<-chan interface{})
-		if !ok {
-			res.SetError(u.ErrCast(), cmds.ErrNormal)
-			return
-		}
-		res.SetOutput(nil)
-		errors := false
-		for r0 := range outChan {
-			r := r0.(*filestore.ListRes)
-			if r.ErrorMsg != "" {
-				errors = true
-				fmt.Fprintf(res.Stderr(), "%s\n", r.ErrorMsg)
-			} else {
-				fmt.Fprintf(res.Stdout(), "%s\n", r.FormatLong())
+	Marshalers: cmds.MarshalerMap{
+		cmds.Text: func(res cmds.Response) (io.Reader, error) {
+			outChan, ok := res.Output().(<-chan interface{})
+			if !ok {
+				return nil, u.ErrCast()
 			}
-		}
-		if errors {
-			res.SetError(fmt.Errorf("errors while displaying some entries"), cmds.ErrNormal)
-		}
+			errors := false
+			for r0 := range outChan {
+				r := r0.(*filestore.ListRes)
+				if r.ErrorMsg != "" {
+					errors = true
+					fmt.Fprintf(res.Stderr(), "%s\n", r.ErrorMsg)
+				} else {
+					fmt.Fprintf(res.Stdout(), "%s\n", r.FormatLong())
+				}
+			}
+			if errors {
+				return nil, fmt.Errorf("errors while displaying some entries")
+			}
+			return nil, nil
+		},
 	},
 	Type: filestore.ListRes{},
 }
@@ -137,23 +136,22 @@ For ERROR entries the error will also be printed to stderr.
 			res.SetOutput(out)
 		}
 	},
-	PostRun: func(req cmds.Request, res cmds.Response) {
-		if res.Error() != nil {
-			return
-		}
-		outChan, ok := res.Output().(<-chan interface{})
-		if !ok {
-			res.SetError(u.ErrCast(), cmds.ErrNormal)
-			return
-		}
-		res.SetOutput(nil)
-		for r0 := range outChan {
-			r := r0.(*filestore.ListRes)
-			if r.Status == filestore.StatusOtherError {
-				fmt.Fprintf(res.Stderr(), "%s\n", r.ErrorMsg)
+	Marshalers: cmds.MarshalerMap{
+		cmds.Text: func(res cmds.Response) (io.Reader, error) {
+			outChan, ok := res.Output().(<-chan interface{})
+			if !ok {
+				return nil, u.ErrCast()
 			}
-			fmt.Fprintf(res.Stdout(), "%s %s\n", r.Status.Format(), r.FormatLong())
-		}
+			res.SetOutput(nil)
+			for r0 := range outChan {
+				r := r0.(*filestore.ListRes)
+				if r.Status == filestore.StatusOtherError {
+					fmt.Fprintf(res.Stderr(), "%s\n", r.ErrorMsg)
+				}
+				fmt.Fprintf(res.Stdout(), "%s %s\n", r.Status.Format(), r.FormatLong())
+			}
+			return nil, nil
+		},
 	},
 	Type: filestore.ListRes{},
 }