coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-24 03:47:45 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

commands: Allow overriding marshaller for any encoding type

Browse Source
This commit is contained in:
Matt Bell 2014-11-03 23:17:39 -08:00 committed by Juan Batiz-Benet
parent 0afd3391a8
commit f95476c19a
7 changed files with 56 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ipfs2/main.go
View File

@ -58,7 +58,7 @@ func createRequest(args []string) (cmds.Request, *cmds.Command) {
ctx.Config = conf
if _, found := options.Option("encoding"); !found {
if req.Command().Format != nil {
if req.Command().Marshallers != nil && req.Command().Marshallers[cmds.Text] != nil {
req.SetOption("encoding", cmds.Text)
} else {
req.SetOption("encoding", cmds.JSON)

24
core/commands2/add.go
View File

@ -55,18 +55,20 @@ var addCmd = &cmds.Command{
res.SetOutput(&AddOutput{added})
},
Format: func(res cmds.Response) ([]byte, error) {
v := res.Output().(*AddOutput).Added
if len(v) == 1 {
s := fmt.Sprintf("Added object: %s\n", v[0].Hash)
return []byte(s), nil
}
Marshallers: map[cmds.EncodingType]cmds.Marshaller{
cmds.Text: func(res cmds.Response) ([]byte, error) {
v := res.Output().(*AddOutput).Added
if len(v) == 1 {
s := fmt.Sprintf("Added object: %s\n", v[0].Hash)
return []byte(s), nil
}
s := fmt.Sprintf("Added %v objects:\n", len(v))
for _, obj := range v {
s += fmt.Sprintf("- %s\n", obj.Hash)
}
return []byte(s), nil
s := fmt.Sprintf("Added %v objects:\n", len(v))
for _, obj := range v {
s += fmt.Sprintf("- %s\n", obj.Hash)
}
return []byte(s), nil
},
},
Type: &AddOutput{},
}

10
core/commands2/commands.go
View File

@ -18,10 +18,12 @@ var commandsCmd = &cmds.Command{
root := outputCommand("ipfs", Root)
res.SetOutput(&root)
},
Format: func(res cmds.Response) ([]byte, error) {
v := res.Output().(*Command)
s := formatCommand(v, 0)
return []byte(s), nil
Marshallers: map[cmds.EncodingType]cmds.Marshaller{
cmds.Text: func(res cmds.Response) ([]byte, error) {
v := res.Output().(*Command)
s := formatCommand(v, 0)
return []byte(s), nil
},
},
Type: &Command{},
}

6
core/commands2/log.go
View File

@ -23,6 +23,8 @@ var logCmd = &cmds.Command{
s := fmt.Sprintf("Changed log level of '%s' to '%s'", args[0], args[1])
res.SetOutput(&MessageOutput{s})
},
Format: MessageMarshaller,
Type: &MessageOutput{},
Marshallers: map[cmds.EncodingType]cmds.Marshaller{
cmds.Text: MessageTextMarshaller,
},
Type: &MessageOutput{},
}

34
core/commands2/ls.go
View File

@ -52,25 +52,27 @@ var lsCmd = &cmds.Command{
res.SetOutput(&LsOutput{output})
},
Format: func(res cmds.Response) ([]byte, error) {
s := ""
output := res.Output().(*LsOutput).Objects
Marshallers: map[cmds.EncodingType]cmds.Marshaller{
cmds.Text: func(res cmds.Response) ([]byte, error) {
s := ""
output := res.Output().(*LsOutput).Objects
for _, object := range output {
if len(output) > 1 {
s += fmt.Sprintf("%s:\n", object.Hash)
for _, object := range output {
if len(output) > 1 {
s += fmt.Sprintf("%s:\n", object.Hash)
}
for _, link := range object.Links {
s += fmt.Sprintf("-> %s %s (%v bytes)\n", link.Name, link.Hash, link.Size)
}
if len(output) > 1 {
s += "\n"
}
}
for _, link := range object.Links {
s += fmt.Sprintf("-> %s %s (%v bytes)\n", link.Name, link.Hash, link.Size)
}
if len(output) > 1 {
s += "\n"
}
}
return []byte(s), nil
return []byte(s), nil
},
},
Type: &LsOutput{},
}

10
core/commands2/publish.go
View File

@ -61,10 +61,12 @@ var publishCmd = &cmds.Command{
Value: ref,
})
},
Format: func(res cmds.Response) ([]byte, error) {
v := res.Output().(*PublishOutput)
s := fmt.Sprintf("Published name %s to %s\n", v.Name, v.Value)
return []byte(s), nil
Marshallers: map[cmds.EncodingType]cmds.Marshaller{
cmds.Text: func(res cmds.Response) ([]byte, error) {
v := res.Output().(*PublishOutput)
s := fmt.Sprintf("Published name %s to %s\n", v.Name, v.Value)
return []byte(s), nil
},
},
Type: &PublishOutput{},
}

14
core/commands2/root.go
View File

@ -71,11 +71,13 @@ var rootSubcommands = map[string]*cmds.Command{
log.Info("beep")
res.SetOutput(v)
},
Format: func(res cmds.Response) ([]byte, error) {
v := res.Output().(*TestOutput)
s := fmt.Sprintf("Foo: %s\n", v.Foo)
s += fmt.Sprintf("Bar: %v\n", v.Bar)
return []byte(s), nil
Marshallers: map[cmds.EncodingType]cmds.Marshaller{
cmds.Text: func(res cmds.Response) ([]byte, error) {
v := res.Output().(*TestOutput)
s := fmt.Sprintf("Foo: %s\n", v.Foo)
s += fmt.Sprintf("Bar: %v\n", v.Bar)
return []byte(s), nil
},
},
Type: &TestOutput{},
},
@ -120,6 +122,6 @@ type MessageOutput struct {
Message string
}
func MessageMarshaller(res cmds.Response) ([]byte, error) {
func MessageTextMarshaller(res cmds.Response) ([]byte, error) {
return []byte(res.Output().(*MessageOutput).Message), nil
}