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

commands: Renamed Response#Value to Response#Output

Browse Source
This commit is contained in:
Matt Bell
2014-11-03 15:47:00 -08:00
committed by Juan Batiz-Benet
parent 75649f3d49
commit 69a56de040
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
commands/http/client.go
View File

@ -80,7 +80,7 @@ func Send(req cmds.Request) (cmds.Response, error) {
contentType = strings.Split(contentType, ";")[0] contentType = strings.Split(contentType, ";")[0]
if contentType == "application/octet-stream" { if contentType == "application/octet-stream" {
res.SetValue(httpRes.Body) res.SetOutput(httpRes.Body)
return res, nil return res, nil
} }
@ -120,7 +120,7 @@ func Send(req cmds.Request) (cmds.Response, error) {
return nil, err return nil, err
} }
res.SetValue(v) res.SetOutput(v)
} }
if len(userEncoding) > 0 { if len(userEncoding) > 0 {

2
commands/http/handler.go
View File

@ -38,7 +38,7 @@ func (i Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
res := i.Root.Call(req) res := i.Root.Call(req)
// set the Content-Type based on res output // set the Content-Type based on res output
if _, ok := res.Value().(io.Reader); ok { if _, ok := res.Output().(io.Reader); ok {
// TODO: set based on actual Content-Type of file // TODO: set based on actual Content-Type of file
w.Header().Set("Content-Type", "application/octet-stream") w.Header().Set("Content-Type", "application/octet-stream")
} else { } else {

12
commands/response.go
View File

@ -49,13 +49,13 @@ var marshallers = map[EncodingType]Marshaller{
if res.Error() != nil { if res.Error() != nil {
return json.Marshal(res.Error()) return json.Marshal(res.Error())
} }
return json.Marshal(res.Value()) return json.Marshal(res.Output())
}, },
XML: func(res Response) ([]byte, error) { XML: func(res Response) ([]byte, error) {
if res.Error() != nil { if res.Error() != nil {
return xml.Marshal(res.Error()) return xml.Marshal(res.Error())
} }
return xml.Marshal(res.Value()) return xml.Marshal(res.Output())
}, },
Text: func(res Response) ([]byte, error) { Text: func(res Response) ([]byte, error) {
format := res.Request().Command().Format format := res.Request().Command().Format
@ -83,8 +83,8 @@ type Response interface {
Error() *Error Error() *Error
// Sets/Returns the response value // Sets/Returns the response value
SetValue(interface{}) SetOutput(interface{})
Value() interface{} Output() interface{}
// Marshal marshals out the response into a buffer. It uses the EncodingType // Marshal marshals out the response into a buffer. It uses the EncodingType
// on the Request to chose a Marshaller (Codec). // on the Request to chose a Marshaller (Codec).
@ -102,11 +102,11 @@ func (r *response) Request() Request {
return r.req return r.req
} }
func (r *response) Value() interface{} { func (r *response) Output() interface{} {
return r.value return r.value
} }
func (r *response) SetValue(v interface{}) { func (r *response) SetOutput(v interface{}) {
r.value = v r.value = v
} }

2
commands/response_test.go
View File

@ -14,7 +14,7 @@ func TestMarshalling(t *testing.T) {
req := NewEmptyRequest() req := NewEmptyRequest()
res := NewResponse(req) res := NewResponse(req)
res.SetValue(TestOutput{"beep", "boop", 1337}) res.SetOutput(TestOutput{"beep", "boop", 1337})
// get command global options so we can set the encoding option // get command global options so we can set the encoding option
cmd := Command{} cmd := Command{}