heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

return and error from writeResp

Browse Source
This commit is contained in:
sentriz
2019-08-01 11:28:09 +01:00
parent ee6f9b4d96
commit 0b929bd326
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server/ctrlsubsonic/ctrl.go
View File

@@ -7,6 +7,8 @@ import (
"log" "log"
"net/http" "net/http"
"github.com/pkg/errors"
"senan.xyz/g/gonic/server/ctrlbase" "senan.xyz/g/gonic/server/ctrlbase"
"senan.xyz/g/gonic/server/ctrlsubsonic/spec" "senan.xyz/g/gonic/server/ctrlsubsonic/spec"
"senan.xyz/g/gonic/server/parsing" "senan.xyz/g/gonic/server/parsing"
@@ -39,7 +41,10 @@ func (ew *errWriter) write(buf []byte) {
_, ew.err = ew.w.Write(buf) _, ew.err = ew.w.Write(buf)
} }
func writeResp(w http.ResponseWriter, r *http.Request, resp *spec.Response) { func writeResp(w http.ResponseWriter, r *http.Request, resp *spec.Response) error {
if resp.Error != nil {
w.WriteHeader(http.StatusBadRequest)
}
res := metaResponse{Response: resp} res := metaResponse{Response: resp}
ew := &errWriter{w: w} ew := &errWriter{w: w}
switch parsing.GetStrParam(r, "f") { switch parsing.GetStrParam(r, "f") {
@@ -47,18 +52,18 @@ func writeResp(w http.ResponseWriter, r *http.Request, resp *spec.Response) {
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
data, err := json.Marshal(res) data, err := json.Marshal(res)
if err != nil { if err != nil {
log.Printf("could not marshall to json: %v\n", err) return errors.Wrap(err, "marshal to json")
return
} }
ew.write(data) ew.write(data)
case "jsonp": case "jsonp":
w.Header().Set("Content-Type", "application/javascript") w.Header().Set("Content-Type", "application/javascript")
data, err := json.Marshal(res) data, err := json.Marshal(res)
if err != nil { if err != nil {
log.Printf("could not marshall to json: %v\n", err) return errors.Wrap(err, "marshal to jsonp")
return
} }
ew.write([]byte(parsing.GetStrParamOr(r, "callback", "cb"))) // TODO: error if no callback provided instead of using a default
pCall := parsing.GetStrParamOr(r, "callback", "cb")
ew.write([]byte(pCall))
ew.write([]byte("(")) ew.write([]byte("("))
ew.write(data) ew.write(data)
ew.write([]byte(");")) ew.write([]byte(");"))
@@ -66,23 +71,21 @@ func writeResp(w http.ResponseWriter, r *http.Request, resp *spec.Response) {
w.Header().Set("Content-Type", "application/xml") w.Header().Set("Content-Type", "application/xml")
data, err := xml.MarshalIndent(res, "", " ") data, err := xml.MarshalIndent(res, "", " ")
if err != nil { if err != nil {
log.Printf("could not marshall to xml: %v\n", err) return errors.Wrap(err, "marshal to xml")
return
} }
ew.write(data) ew.write(data)
} }
if ew.err != nil { return ew.err
log.Printf("error writing to response: %v\n", ew.err)
}
} }
type subsonicHandler func(r *http.Request) *spec.Response type subsonicHandler func(r *http.Request) *spec.Response
func (c *Controller) H(h subsonicHandler) http.Handler { func (c *Controller) H(h subsonicHandler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// TODO: write a non 200 if has err
response := h(r) response := h(r)
writeResp(w, r, response) if err := writeResp(w, r, response); err != nil {
log.Printf("error writing subsonic response (normal handler): %v\n", err)
}
}) })
} }
@@ -90,9 +93,10 @@ type subsonicHandlerRaw func(w http.ResponseWriter, r *http.Request) *spec.Respo
func (c *Controller) HR(h subsonicHandlerRaw) http.Handler { func (c *Controller) HR(h subsonicHandlerRaw) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// TODO: write a non 200 if has err // TODO: log if both response writer written and non nil spec return
// TODO: ensure no mixed return/writer
response := h(w, r) response := h(w, r)
writeResp(w, r, response) if err := writeResp(w, r, response); err != nil {
log.Printf("error writing subsonic response (raw handler): %v\n", err)
}
}) })
} }