Factor out boiler plate code for PostRun in "ipfs filestore ls".

License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>

core/commands/commands.go

@@ -8,6 +8,7 @@ package commands
 import (
 	"fmt"
 	"io"
+	"os"
 	"sort"
 	"strings"
 
@@ -149,3 +150,42 @@ func unwrapOutput(i interface{}) (interface{}, error) {
 
 	return <-ch, nil
 }
+
+type nonFatalError string
+
+// streamRes is a helper function to stream results, that possibly
+// contain with non-fatal, the helper function is allowed to panic on
+// internal errors
+func streamRes(procVal func(interface{}, io.Writer) nonFatalError) func(cmds.Response, cmds.ResponseEmitter) error {
+	return func(res cmds.Response, re cmds.ResponseEmitter) (err error) {
+		defer func() {
+			if r := recover(); r != nil {
+				err = fmt.Errorf("internal error: %v", r)
+			}
+			re.Close()
+		}()
+
+		var errors bool
+		for {
+			v, err := res.Next()
+			if err != nil {
+				if err == io.EOF {
+					break
+				}
+				return err
+			}
+
+			errorMsg := procVal(v, os.Stdout)
+
+			if errorMsg != "" {
+				errors = true
+				fmt.Fprintf(os.Stderr, "%s\n", errorMsg)
+			}
+		}
+
+		if errors {
+			return fmt.Errorf("errors while displaying some entries")
+		}
+		return nil
+	}
+}

core/commands/filestore.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"os"
 
 	oldCmds "github.com/ipfs/go-ipfs/commands"
 	lgc "github.com/ipfs/go-ipfs/commands/legacy"
@@ -73,36 +72,14 @@ The output is:
 		return res.Emit(out)
 	},
 	PostRun: cmds.PostRunMap{
-		cmds.CLI: func(res cmds.Response, re cmds.ResponseEmitter) error {
+		cmds.CLI: streamRes(func(v interface{}, out io.Writer) nonFatalError {
-			var errors bool
+			r := v.(*filestore.ListRes)
-			for {
-				v, err := res.Next()
-				if err != nil {
-					if err == io.EOF {
-						break
-					}
-					return err
-				}
-
-				r, ok := v.(*filestore.ListRes)
-				if !ok {
-					return e.New(e.TypeErr(r, v))
-				}
-
 			if r.ErrorMsg != "" {
-					errors = true
+				return nonFatalError(r.ErrorMsg)
-					fmt.Fprintf(os.Stderr, "%s\n", r.ErrorMsg)
-				} else {
-					fmt.Fprintf(os.Stdout, "%s\n", r.FormatLong())
 			}
-			}
+			fmt.Fprintf(out, "%s\n", r.FormatLong())
-
+			return ""
-			if errors {
+		}),
-				return fmt.Errorf("errors while displaying some entries")
-			}
-
-			return nil
-		},
 	},
 	Type: filestore.ListRes{},
 }