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

commands/http: Decomposed Client#Send function

Browse Source
This commit is contained in:
Matt Bell
2014-11-04 00:11:54 -08:00
committed by Juan Batiz-Benet
parent e57cd9b857
commit c8ae4b6f42
1 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
commands/http/client.go
View File

@ -41,6 +41,33 @@ func (c *client) Send(req cmds.Request) (cmds.Response, error) {
req.SetOption(cmds.EncLong, cmds.JSON) req.SetOption(cmds.EncLong, cmds.JSON)
} }
query, in, err := getQuery(req)
if err != nil {
return nil, err
}
path := strings.Join(req.Path(), "/")
url := fmt.Sprintf(ApiUrlFormat, c.serverAddress, ApiPath, path, query)
httpRes, err := http.Post(url, "application/octet-stream", in)
if err != nil {
return nil, err
}
res, err := getResponse(httpRes, req)
if err != nil {
return nil, err
}
if len(userEncoding) > 0 {
req.SetOption(cmds.EncShort, userEncoding)
req.SetOption(cmds.EncLong, userEncoding)
}
return res, nil
}
func getQuery(req cmds.Request) (string, io.Reader, error) {
// TODO: handle multiple files with multipart // TODO: handle multiple files with multipart
var in io.Reader var in io.Reader
@ -64,20 +91,18 @@ func (c *client) Send(req cmds.Request) (cmds.Response, error) {
} else { } else {
// TODO: multipart // TODO: multipart
if in != nil { if in != nil {
return nil, fmt.Errorf("Currently, only one file stream is possible per request") return "", nil, fmt.Errorf("Currently, only one file stream is possible per request")
} }
in = arg.(io.Reader) in = arg.(io.Reader)
} }
} }
path := strings.Join(req.Path(), "/") return query.Encode(), in, nil
url := fmt.Sprintf(ApiUrlFormat, c.serverAddress, ApiPath, path, query.Encode()) }
httpRes, err := http.Post(url, "application/octet-stream", in)
if err != nil {
return nil, err
}
// getResponse decodes a http.Response to create a cmds.Response
func getResponse(httpRes *http.Response, req cmds.Request) (cmds.Response, error) {
var err error
res := cmds.NewResponse(req) res := cmds.NewResponse(req)
contentType := httpRes.Header["Content-Type"][0] contentType := httpRes.Header["Content-Type"][0]
@ -109,7 +134,6 @@ func (c *client) Send(req cmds.Request) (cmds.Response, error) {
// handle marshalled errors // handle marshalled errors
err = dec.Decode(&e) err = dec.Decode(&e)
if err != nil { if err != nil {
fmt.Println(err)
return nil, err return nil, err
} }
} }
@ -120,17 +144,11 @@ func (c *client) Send(req cmds.Request) (cmds.Response, error) {
v := req.Command().Type v := req.Command().Type
err = dec.Decode(&v) err = dec.Decode(&v)
if err != nil { if err != nil {
fmt.Println(err)
return nil, err return nil, err
} }
res.SetOutput(v) res.SetOutput(v)
} }
if len(userEncoding) > 0 {
req.SetOption(cmds.EncShort, userEncoding)
req.SetOption(cmds.EncLong, userEncoding)
}
return res, nil return res, nil
} }