mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-21 20:46:30 -05:00
4b7d3e57a4
This commit also pulls down the log level for a set of WARN statements to INFO. There should be no ERRORs or WARNINGs in a regular Hugo build. That is the story about the Boy Who Cried Wolf. Since the WARN log is now more visible, this commit also improves on some of them, most notable the "layout not found", which now would look something like this: ```bash WARN 2018/11/02 09:02:18 Found no layout for "home", language "en", output format "CSS": create a template below /layouts with one of these filenames: index.en.css.css, home.en.css.css, list.en.css.css, index.css.css, home.css.css, list.css.css, index.en.css, home.en.css, list.en.css, index.css, home.css, list.css, _default/index.en.css.css, _default/home.en.css.css, _default/list.en.css.css, _default/index.css.css, _default/home.css.css, _default/list.css.css, _default/index.en.css, _default/home.en.css, _default/list.en.css, _default/index.css, _default/home.css, _default/list.css ``` Fixes #5203
138 lines
4 KiB
Go
138 lines
4 KiB
Go
// Copyright 2017 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package data
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/csv"
|
|
"encoding/json"
|
|
"errors"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/gohugoio/hugo/deps"
|
|
_errors "github.com/pkg/errors"
|
|
)
|
|
|
|
// New returns a new instance of the data-namespaced template functions.
|
|
func New(deps *deps.Deps) *Namespace {
|
|
return &Namespace{
|
|
deps: deps,
|
|
client: http.DefaultClient,
|
|
}
|
|
}
|
|
|
|
// Namespace provides template functions for the "data" namespace.
|
|
type Namespace struct {
|
|
deps *deps.Deps
|
|
|
|
client *http.Client
|
|
}
|
|
|
|
// GetCSV expects a data separator and one or n-parts of a URL to a resource which
|
|
// can either be a local or a remote one.
|
|
// The data separator can be a comma, semi-colon, pipe, etc, but only one character.
|
|
// If you provide multiple parts for the URL they will be joined together to the final URL.
|
|
// GetCSV returns nil or a slice slice to use in a short code.
|
|
func (ns *Namespace) GetCSV(sep string, urlParts ...string) (d [][]string, err error) {
|
|
url := strings.Join(urlParts, "")
|
|
|
|
var clearCacheSleep = func(i int, u string) {
|
|
ns.deps.Log.INFO.Printf("Retry #%d for %s and sleeping for %s", i, url, resSleep)
|
|
time.Sleep(resSleep)
|
|
deleteCache(url, ns.deps.Fs.Source, ns.deps.Cfg)
|
|
}
|
|
|
|
for i := 0; i <= resRetries; i++ {
|
|
var req *http.Request
|
|
req, err = http.NewRequest("GET", url, nil)
|
|
if err != nil {
|
|
return nil, _errors.Wrapf(err, "failed to create request for getCSV for resource %s", url)
|
|
}
|
|
|
|
req.Header.Add("Accept", "text/csv")
|
|
req.Header.Add("Accept", "text/plain")
|
|
|
|
var c []byte
|
|
c, err = ns.getResource(req)
|
|
if err != nil {
|
|
return nil, _errors.Wrapf(err, "failed to read CSV resource %q", url)
|
|
}
|
|
|
|
if !bytes.Contains(c, []byte(sep)) {
|
|
return nil, _errors.Errorf("cannot find separator %s in CSV for %s", sep, url)
|
|
}
|
|
|
|
if d, err = parseCSV(c, sep); err != nil {
|
|
err = _errors.Wrapf(err, "failed to parse CSV file %s", url)
|
|
|
|
clearCacheSleep(i, url)
|
|
continue
|
|
}
|
|
break
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
// GetJSON expects one or n-parts of a URL to a resource which can either be a local or a remote one.
|
|
// If you provide multiple parts they will be joined together to the final URL.
|
|
// GetJSON returns nil or parsed JSON to use in a short code.
|
|
func (ns *Namespace) GetJSON(urlParts ...string) (v interface{}, err error) {
|
|
url := strings.Join(urlParts, "")
|
|
|
|
for i := 0; i <= resRetries; i++ {
|
|
var req *http.Request
|
|
req, err = http.NewRequest("GET", url, nil)
|
|
if err != nil {
|
|
return nil, _errors.Wrapf(err, "Failed to create request for getJSON resource %s", url)
|
|
}
|
|
|
|
req.Header.Add("Accept", "application/json")
|
|
|
|
var c []byte
|
|
c, err = ns.getResource(req)
|
|
if err != nil {
|
|
return nil, _errors.Wrapf(err, "failed to get getJSON resource %q", url)
|
|
}
|
|
err = json.Unmarshal(c, &v)
|
|
if err != nil {
|
|
ns.deps.Log.INFO.Printf("Cannot read JSON from resource %s: %s", url, err)
|
|
ns.deps.Log.INFO.Printf("Retry #%d for %s and sleeping for %s", i, url, resSleep)
|
|
time.Sleep(resSleep)
|
|
deleteCache(url, ns.deps.Fs.Source, ns.deps.Cfg)
|
|
continue
|
|
}
|
|
break
|
|
}
|
|
|
|
if err != nil {
|
|
return nil, _errors.Wrapf(err, "failed to get getJSON resource %q", url)
|
|
}
|
|
return
|
|
}
|
|
|
|
// 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)
|
|
}
|
|
b := bytes.NewReader(c)
|
|
r := csv.NewReader(b)
|
|
rSep := []rune(sep)
|
|
r.Comma = rSep[0]
|
|
r.FieldsPerRecord = 0
|
|
return r.ReadAll()
|
|
}
|