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

Merge pull request #2477 from Stebalien/pin-fixes

Browse Source 
Pin command fixes
This commit is contained in:
Jeromy Johnson
2016-03-31 08:10:18 -07:00
parent 87cf84ebc0 f15abc223c
commit 8acd87d799
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/commands/pin.go
View File

@ -28,7 +28,7 @@ var PinCmd = &cmds.Command{
}
type PinOutput struct {
Pinned []key.Key
Pins []key.Key
}
var addPinCmd = &cmds.Command{
@ -84,7 +84,7 @@ var addPinCmd = &cmds.Command{
}
buf := new(bytes.Buffer)
for _, k := range added.Pinned {
for _, k := range added.Pins {
fmt.Fprintf(buf, "pinned %s %s\n", k, pintype)
}
return buf, nil
@ -138,7 +138,7 @@ collected if needed. (By default, recursively. Use -r=false for direct pins)
}
buf := new(bytes.Buffer)
for _, k := range added.Pinned {
for _, k := range added.Pins {
fmt.Fprintf(buf, "unpinned %s\n", k)
}
return buf, nil
@ -187,7 +187,7 @@ Example:
cmds.StringArg("ipfs-path", false, true, "Path to object(s) to be listed."),
},
Options: []cmds.Option{
cmds.StringOption("type", "t", "The type of pinned keys to list. Can be \"direct\", \"indirect\", \"recursive\", or \"all\". Defaults to \"recursive\"."),
cmds.StringOption("type", "t", "The type of pinned keys to list. Can be \"direct\", \"indirect\", \"recursive\", or \"all\".").Default("all"),
cmds.BoolOption("count", "n", "Show refcount when listing indirect pins."),
cmds.BoolOption("quiet", "q", "Write just hashes of objects."),
},
@ -198,22 +198,18 @@ Example:
return
}
typeStr, typeStrFound, err := req.Option("type").String()
typeStr, _, err := req.Option("type").String()
if err != nil {
res.SetError(err, cmds.ErrNormal)
return
}
if typeStrFound {
switch typeStr {
case "all", "direct", "indirect", "recursive":
default:
err = fmt.Errorf("Invalid type '%s', must be one of {direct, indirect, recursive, all}", typeStr)
res.SetError(err, cmds.ErrClient)
return
}
} else {
typeStr = "all"
switch typeStr {
case "all", "direct", "indirect", "recursive":
default:
err = fmt.Errorf("Invalid type '%s', must be one of {direct, indirect, recursive, all}", typeStr)
res.SetError(err, cmds.ErrClient)
return
}
var keys map[string]RefKeyObject