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

commands: Replaced 'Formatter' with 'Marshaller'

Browse Source
This commit is contained in:
Matt Bell 2014-11-03 23:02:50 -08:00 committed by Juan Batiz-Benet
parent 3dd7a9a5c8
commit 0afd3391a8
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/commands2/add.go
View File

@ -55,17 +55,18 @@ var addCmd = &cmds.Command{
res.SetOutput(&AddOutput{added})
},
Format: func(res cmds.Response) (string, error) {
Format: func(res cmds.Response) ([]byte, error) {
v := res.Output().(*AddOutput).Added
if len(v) == 1 {
return fmt.Sprintf("Added object: %s\n", v[0].Hash), nil
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 s, nil
return []byte(s), nil
},
Type: &AddOutput{},
}

5
core/commands2/commands.go
View File

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

2
core/commands2/log.go
View File

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

4
core/commands2/ls.go
View File

@ -52,7 +52,7 @@ var lsCmd = &cmds.Command{
res.SetOutput(&LsOutput{output})
},
Format: func(res cmds.Response) (string, error) {
Format: func(res cmds.Response) ([]byte, error) {
s := ""
output := res.Output().(*LsOutput).Objects
@ -70,7 +70,7 @@ var lsCmd = &cmds.Command{
}
}
return s, nil
return []byte(s), nil
},
Type: &LsOutput{},
}

5
core/commands2/publish.go
View File

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

8
core/commands2/root.go
View File

@ -71,11 +71,11 @@ var rootSubcommands = map[string]*cmds.Command{
log.Info("beep")
res.SetOutput(v)
},
Format: func(res cmds.Response) (string, error) {
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 s, nil
return []byte(s), nil
},
Type: &TestOutput{},
},
@ -120,6 +120,6 @@ type MessageOutput struct {
Message string
}
func MessageFormatter(res cmds.Response) (string, error) {
return res.Output().(*MessageOutput).Message, nil
func MessageMarshaller(res cmds.Response) ([]byte, error) {
return []byte(res.Output().(*MessageOutput).Message), nil
}