From b4b6fc6906dd1279c1d09bef7383c7af3628194e Mon Sep 17 00:00:00 2001
From: Overbool <overbool.xu@gmail.com>
Date: Sat, 3 Nov 2018 22:56:42 +0800
Subject: [PATCH] cmds/filestore: use PostRun in verify

License: MIT
Signed-off-by: Overbool <overbool.xu@gmail.com>
---
 core/commands/filestore.go | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/core/commands/filestore.go b/core/commands/filestore.go
index fd83ee943fa..70c02a3a41e 100644
--- a/core/commands/filestore.go
+++ b/core/commands/filestore.go
@@ -7,6 +7,7 @@ import (
 
 	core "github.com/ipfs/go-ipfs/core"
 	cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
+	e "github.com/ipfs/go-ipfs/core/commands/e"
 	filestore "github.com/ipfs/go-ipfs/filestore"
 
 	cid "gx/ipfs/QmR8BauakNcBa3RbE4nbQu76PDiJgoQgz8AJdhJuiU4TAw/go-cid"
@@ -148,14 +149,28 @@ For ERROR entries the error will also be printed to stderr.
 
 		return nil
 	},
-	Encoders: cmds.EncoderMap{
-		cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *filestore.ListRes) error {
-			if out.Status == filestore.StatusOtherError {
-				fmt.Fprintf(os.Stderr, "%s\n", out.ErrorMsg)
+	PostRun: cmds.PostRunMap{
+		cmds.CLI: func(res cmds.Response, re cmds.ResponseEmitter) error {
+			for {
+				v, err := res.Next()
+				if err != nil {
+					if err == io.EOF {
+						return nil
+					}
+					return err
+				}
+
+				list, ok := v.(*filestore.ListRes)
+				if !ok {
+					return e.TypeErr(list, v)
+				}
+
+				if list.Status == filestore.StatusOtherError {
+					fmt.Fprintf(os.Stderr, "%s\n", list.ErrorMsg)
+				}
+				fmt.Fprintf(os.Stdout, "%s %s\n", list.Status.Format(), list.FormatLong())
 			}
-			fmt.Fprintf(w, "%s %s\n", out.Status.Format(), out.FormatLong())
-			return nil
-		}),
+		},
 	},
 	Type: filestore.ListRes{},
 }