phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-02 10:44:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

tpl/data: Prevent getJSON and getCSV fetch failure from aborting build

Browse source 
Fixes #5643
This commit is contained in:
Anthony Fok 2019-01-28 16:27:43 -07:00 committed by Bjørn Erik Pedersen
parent 59d87044a4
commit 6a2bfcbec8
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tpl/data/data.go
View file

@ -83,7 +83,8 @@ func (ns *Namespace) GetCSV(sep string, urlParts ...string) (d [][]string, err e
err = ns.getResource(cache, unmarshal, req)
if err != nil {
return nil, _errors.Wrapf(err, "failed to read CSV resource %q", url)
ns.deps.Log.ERROR.Printf("Failed to get CSV resource %q: %s", url, err)
return nil, nil
}
return
@ -113,19 +114,18 @@ func (ns *Namespace) GetJSON(urlParts ...string) (interface{}, error) {
req.Header.Add("Accept", "application/json")
err = ns.getResource(cache, unmarshal, req)
if err != nil {
return nil, _errors.Wrapf(err, "failed to get getJSON resource %q", url)
ns.deps.Log.ERROR.Printf("Failed to get JSON resource %q: %s", url, err)
return nil, nil
}
return v, nil
}
// parseCSV parses bytes of CSV data into a slice slice string or an error
func parseCSV(c []byte, sep string) ([][]string, error) {
if len(sep) != 1 {
return nil, errors.New("Incorrect length of csv separator: " + sep)
return nil, errors.New("Incorrect length of CSV separator: " + sep)
}
b := bytes.NewReader(c)
r := csv.NewReader(b)