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

move from pkg/errors to go1.13 errors

Browse Source
This commit is contained in:
sentriz
2020-05-01 21:32:56 +01:00
parent d583c2fbd8
commit 31b2b65ea6
11 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/ctrlsubsonic/ctrl.go
View File

@@ -3,12 +3,11 @@ package ctrlsubsonic
import (
"encoding/json"
"encoding/xml"
"fmt"
"io"
"log"
"net/http"
"github.com/pkg/errors"
"go.senan.xyz/gonic/server/ctrlbase"
"go.senan.xyz/gonic/server/ctrlsubsonic/params"
"go.senan.xyz/gonic/server/ctrlsubsonic/spec"
@@ -55,14 +54,14 @@ func writeResp(w http.ResponseWriter, r *http.Request, resp *spec.Response) erro
w.Header().Set("Content-Type", "application/json")
data, err := json.Marshal(res)
if err != nil {
return errors.Wrap(err, "marshal to json")
return fmt.Errorf("marshal to json: %w", err)
}
ew.write(data)
case "jsonp":
w.Header().Set("Content-Type", "application/javascript")
data, err := json.Marshal(res)
if err != nil {
return errors.Wrap(err, "marshal to jsonp")
return fmt.Errorf("marshal to jsonp: %w", err)
}
// TODO: error if no callback provided instead of using a default
pCall := params.GetOr("callback", "cb")
@@ -74,7 +73,7 @@ func writeResp(w http.ResponseWriter, r *http.Request, resp *spec.Response) erro
w.Header().Set("Content-Type", "application/xml")
data, err := xml.MarshalIndent(res, "", " ")
if err != nil {
return errors.Wrap(err, "marshal to xml")
return fmt.Errorf("marshal to xml: %w", err)
}
ew.write(data)
}