提交 32a29593 作者: Matt Bell 提交者: Juan Batiz-Benet

commands/http: Don't try to parse HTTP response into a Response, just read the output

上级 714e13b6
package http package http
import ( import (
"encoding/json" //"encoding/json"
"fmt" //"fmt"
"net/http" "net/http"
"strings" "strings"
...@@ -28,11 +28,6 @@ func Send(req cmds.Request) (cmds.Response, error) { ...@@ -28,11 +28,6 @@ func Send(req cmds.Request) (cmds.Response, error) {
url := "http://" + host + ApiPath url := "http://" + host + ApiPath
url += "/" + strings.Join(req.Path(), "/") url += "/" + strings.Join(req.Path(), "/")
// TODO: support other encodings once we have multicodec to decode response
// (we shouldn't have to set this here)
encoding := cmds.JSON
req.SetOption(cmds.EncShort, encoding)
query := "?" query := "?"
for k, v := range req.Options() { for k, v := range req.Options() {
query += "&" + k + "=" + v.(string) query += "&" + k + "=" + v.(string)
...@@ -46,7 +41,11 @@ func Send(req cmds.Request) (cmds.Response, error) { ...@@ -46,7 +41,11 @@ func Send(req cmds.Request) (cmds.Response, error) {
return nil, err return nil, err
} }
// commented out: code to parse HTTP response and turn it into a cmds.Response
// for now, we are simply reading the data as a stream
res := cmds.NewResponse(req) res := cmds.NewResponse(req)
res.SetValue(httpRes.Body)
/*res := cmds.NewResponse(req)
contentType := httpRes.Header["Content-Type"][0] contentType := httpRes.Header["Content-Type"][0]
contentType = strings.Split(contentType, ";")[0] contentType = strings.Split(contentType, ";")[0]
...@@ -78,7 +77,7 @@ func Send(req cmds.Request) (cmds.Response, error) { ...@@ -78,7 +77,7 @@ func Send(req cmds.Request) (cmds.Response, error) {
} }
res.SetValue(v) res.SetValue(v)
} }*/
return res, nil return res, nil
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论