From 5c15857e33bb279660161bcb4249cdde4124f27c Mon Sep 17 00:00:00 2001
From: Steven Allen <steven@stebalien.com>
Date: Wed, 7 Nov 2018 12:59:44 -0800
Subject: [PATCH] pin: handle progress in post-run, everything else in the
 encoder

Otherwise, we break the HTTP API (slightly).

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
---
 core/commands/pin.go | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/core/commands/pin.go b/core/commands/pin.go
index a62ae26b97d..10d99aa6020 100644
--- a/core/commands/pin.go
+++ b/core/commands/pin.go
@@ -135,6 +135,23 @@ var addPinCmd = &cmds.Command{
 			}
 		}
 	},
+	Encoders: cmds.EncoderMap{
+		cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *AddPinOutput) error {
+			rec, found := req.Options["recursive"].(bool)
+			var pintype string
+			if rec || !found {
+				pintype = "recursively"
+			} else {
+				pintype = "directly"
+			}
+
+			for _, k := range out.Pins {
+				fmt.Fprintf(w, "pinned %s %s\n", k, pintype)
+			}
+
+			return nil
+		}),
+	},
 	PostRun: cmds.PostRunMap{
 		cmds.CLI: func(res cmds.Response, re cmds.ResponseEmitter) error {
 			for {
@@ -150,25 +167,14 @@ var addPinCmd = &cmds.Command{
 				if !ok {
 					return e.TypeErr(out, v)
 				}
-				var added []string
-
-				if out.Pins != nil {
-					added = out.Pins
-				} else {
+				if out.Pins == nil {
 					// this can only happen if the progress option is set
 					fmt.Fprintf(os.Stderr, "Fetched/Processed %d nodes\r", out.Progress)
-				}
-
-				var pintype string
-				rec, found := res.Request().Options["recursive"].(bool)
-				if rec || !found {
-					pintype = "recursively"
 				} else {
-					pintype = "directly"
-				}
-
-				for _, k := range added {
-					fmt.Fprintf(os.Stdout, "pinned %s %s\n", k, pintype)
+					err = re.Emit(out)
+					if err != nil {
+						return err
+					}
 				}
 			}
 		},