diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2021-12-09 16:57:05 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2021-12-10 11:10:41 +0100 |
commit | e4d6ec94b5c1ea1c670f1e7127fc20ff2371cb0b (patch) | |
tree | 89b9017705262c6c19058e7d9b2d3decb508cf90 /tpl | |
parent | 6260455ba73e2f2bd16b068a72e98e48b037a179 (diff) |
Allow user to handle/ignore errors in resources.Get
In Hugo 0.90.0 we introduced remote support in `resources.Get`.
But with remote resources comes with a higher chance of failing a build (network issues, remote server down etc.).
Before this commit we always failed the build on any unexpected error.
This commit allows the user to check for any error (and potentially fall back to a default local resource):
```htmlbars
{{ $result := resources.Get "https://gohugo.io/img/hugo-logo.png" }}
{{ with $result }}
{{ if .Err }}
{{/* log the error, insert a default image etc. *}}
{{ else }}
<img src="{{ .RelPermalink }}" width="{{ .Width }}" height="{{ .Height }}" alt="">
{{ end }}
{{ end }}
```
Note that the default behaviour is still to fail the build, but we will delay that error until you start using the `Resource`.
Fixes #9529
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/resources/resources.go | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/tpl/resources/resources.go b/tpl/resources/resources.go index a3f3aaa3e..0be52ad05 100644 --- a/tpl/resources/resources.go +++ b/tpl/resources/resources.go @@ -113,30 +113,40 @@ func (ns *Namespace) getscssClientDartSass() (*dartsass.Client, error) { // further transformations. // // For URLs an additional argument with options can be provided. -func (ns *Namespace) Get(args ...interface{}) (resource.Resource, error) { - if len(args) != 1 && len(args) != 2 { - return nil, errors.New("must provide a filename or URL") - } +func (ns *Namespace) Get(args ...interface{}) resource.Resource { + get := func(args ...interface{}) (resource.Resource, error) { + if len(args) != 1 && len(args) != 2 { + return nil, errors.New("must provide a filename or URL") + } - filenamestr, err := cast.ToStringE(args[0]) - if err != nil { - return nil, err - } + filenamestr, err := cast.ToStringE(args[0]) + if err != nil { + return nil, err + } - if u, err := url.Parse(filenamestr); err == nil && u.Scheme != "" { - if len(args) == 2 { - options, err := maps.ToStringMapE(args[1]) - if err != nil { - return nil, err + if u, err := url.Parse(filenamestr); err == nil && u.Scheme != "" { + if len(args) == 2 { + options, err := maps.ToStringMapE(args[1]) + if err != nil { + return nil, err + } + return ns.createClient.FromRemote(filenamestr, options) } - return ns.createClient.FromRemote(filenamestr, options) + return ns.createClient.FromRemote(filenamestr, nil) } - return ns.createClient.FromRemote(filenamestr, nil) + + filenamestr = filepath.Clean(filenamestr) + + return ns.createClient.Get(filenamestr) } - filenamestr = filepath.Clean(filenamestr) + r, err := get(args...) + if err != nil { + // This allows the client to reason about the .Err in the template. + return resources.NewErrorResource(errors.Wrap(err, "error calling resources.Get")) + } + return r - return ns.createClient.Get(filenamestr) } // GetMatch finds the first Resource matching the given pattern, or nil if none found. |