opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-01 02:30:39 +08:00
Code Issues Projects Releases Wiki Activity

object: --quiet flag to put

Browse Source 
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
This commit is contained in:
Łukasz Magiera
2017-11-21 19:39:39 +01:00
parent b18b1e90c2
commit 697afddbcc
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/commands/object/object.go
View File

@ -19,10 +19,10 @@ import (
path "github.com/ipfs/go-ipfs/path" path "github.com/ipfs/go-ipfs/path"
pin "github.com/ipfs/go-ipfs/pin" pin "github.com/ipfs/go-ipfs/pin"
ft "github.com/ipfs/go-ipfs/unixfs" ft "github.com/ipfs/go-ipfs/unixfs"
cmdkit "gx/ipfs/QmUyfy4QSr3NXym4etEiRyxBLqqAeKHJuRdi8AACxg63fZ/go-ipfs-cmdkit"
cid "gx/ipfs/QmNp85zy9RLrQ5oQD4hPyS39ezrrXpcaa7R4Y9kxdWQLLQ/go-cid" cid "gx/ipfs/QmNp85zy9RLrQ5oQD4hPyS39ezrrXpcaa7R4Y9kxdWQLLQ/go-cid"
node "gx/ipfs/QmPN7cwmpcc4DWXb4KTB9dNAJgjuPY69h3npsMfhRrQL9c/go-ipld-format" 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 // 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("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.StringOption("datafieldenc", "Encoding type of the data field, either \"text\" or \"base64\".").WithDefault("text"),
cmdkit.BoolOption("pin", "Pin this object when adding."), cmdkit.BoolOption("pin", "Pin this object when adding."),
cmdkit.BoolOption("quiet", "q", "Write minimal output."),
}, },
Run: func(req cmds.Request, res cmds.Response) { Run: func(req cmds.Request, res cmds.Response) {
n, err := req.InvocContext().GetNode() n, err := req.InvocContext().GetNode()
@ -444,6 +445,8 @@ And then run:
}, },
Marshalers: cmds.MarshalerMap{ Marshalers: cmds.MarshalerMap{
cmds.Text: func(res cmds.Response) (io.Reader, error) { cmds.Text: func(res cmds.Response) (io.Reader, error) {
quiet, _, _ := res.Request().Option("quiet").Bool()
v, err := unwrapOutput(res.Output()) v, err := unwrapOutput(res.Output())
if err != nil { if err != nil {
return nil, err return nil, err
@ -453,7 +456,12 @@ And then run:
return nil, e.TypeErr(obj, v) 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{}, Type: Object{},

10
test/sharness/t0051-object.sh
View File

@ -70,6 +70,16 @@ test_object_cmd() {
test_cmp expected_putOut actual_putOut 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" ' test_expect_success "'ipfs object put file.xml' succeeds" '
ipfs object put ../t0051-object-data/testPut.xml --inputenc=xml > actual_putOut ipfs object put ../t0051-object-data/testPut.xml --inputenc=xml > actual_putOut
' '