Merge pull request #4411 from ipfs/feat/objput-quiet

object: --quiet flag to put
ipfs · Nov 21, 2017 · 586dd65 · 586dd65
2 parents b18b1e9 + 697afdd
commit 586dd65
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/core/commands/object/object.go b/core/commands/object/object.go
@@ -19,10 +19,10 @@ import (
 	path "github.com/ipfs/go-ipfs/path"
 	pin "github.com/ipfs/go-ipfs/pin"
 	ft "github.com/ipfs/go-ipfs/unixfs"
-	cmdkit "gx/ipfs/QmUyfy4QSr3NXym4etEiRyxBLqqAeKHJuRdi8AACxg63fZ/go-ipfs-cmdkit"
 
 	cid "gx/ipfs/QmNp85zy9RLrQ5oQD4hPyS39ezrrXpcaa7R4Y9kxdWQLLQ/go-cid"
 	node "gx/ipfs/QmPN7cwmpcc4DWXb4KTB9dNAJgjuPY69h3npsMfhRrQL9c/go-ipld-format"
+	cmdkit "gx/ipfs/QmUyfy4QSr3NXym4etEiRyxBLqqAeKHJuRdi8AACxg63fZ/go-ipfs-cmdkit"
 )
 
 // ErrObjectTooLarge is returned when too much data was read from stdin. current limit 2m
@@ -385,6 +385,7 @@ And then run:
 		cmdkit.StringOption("inputenc", "Encoding type of input data. One of: {\"protobuf\", \"json\"}.").WithDefault("json"),
 		cmdkit.StringOption("datafieldenc", "Encoding type of the data field, either \"text\" or \"base64\".").WithDefault("text"),
 		cmdkit.BoolOption("pin", "Pin this object when adding."),
+		cmdkit.BoolOption("quiet", "q", "Write minimal output."),
 	},
 	Run: func(req cmds.Request, res cmds.Response) {
 		n, err := req.InvocContext().GetNode()
@@ -444,6 +445,8 @@ And then run:
 	},
 	Marshalers: cmds.MarshalerMap{
 		cmds.Text: func(res cmds.Response) (io.Reader, error) {
+			quiet, _, _ := res.Request().Option("quiet").Bool()
+
 			v, err := unwrapOutput(res.Output())
 			if err != nil {
 				return nil, err
@@ -453,7 +456,12 @@ And then run:
 				return nil, e.TypeErr(obj, v)
 			}
 
-			return strings.NewReader("added " + obj.Hash + "\n"), nil
+			out := obj.Hash + "\n"
+			if !quiet {
+				out = "added " + out
+			}
+
+			return strings.NewReader(out), nil
 		},
 	},
 	Type: Object{},

diff --git a/test/sharness/t0051-object.sh b/test/sharness/t0051-object.sh
@@ -70,6 +70,16 @@ test_object_cmd() {
     test_cmp expected_putOut actual_putOut
   '
 
+  test_expect_success "'ipfs object put --quiet file.json' succeeds" '
+    ipfs object put --quiet ../t0051-object-data/testPut.json > actual_putOut
+  '
+
+  test_expect_success "'ipfs object put --quiet file.json' output looks good" '
+    HASH="QmUTSAdDi2xsNkDtLqjFgQDMEn5di3Ab9eqbrt4gaiNbUD" &&
+    printf "$HASH\n" > expected_putOut &&
+    test_cmp expected_putOut actual_putOut
+  '
+
   test_expect_success "'ipfs object put file.xml' succeeds" '
     ipfs object put  ../t0051-object-data/testPut.xml --inputenc=xml > actual_putOut
   '