quentin/hugo-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

resources: Add full filename to image when processing fails

Browse source 
Fixes #7000
This commit is contained in:
Bjørn Erik Pedersen 2020-03-02 12:39:26 +01:00
parent 3e9db2ad95
commit 305ce1c9ec
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
resources/image.go
View file

@ -36,6 +36,7 @@ import (
"github.com/gohugoio/hugo/resources/resource" "github.com/gohugoio/hugo/resources/resource"
"github.com/pkg/errors"
_errors "github.com/pkg/errors" _errors "github.com/pkg/errors"
"github.com/gohugoio/hugo/helpers" "github.com/gohugoio/hugo/helpers"
@ -234,7 +235,7 @@ const imageProcWorkers = 1
var imageProcSem = make(chan bool, imageProcWorkers) var imageProcSem = make(chan bool, imageProcWorkers)
func (i *imageResource) doWithImageConfig(conf images.ImageConfig, f func(src image.Image) (image.Image, error)) (resource.Image, error) { func (i *imageResource) doWithImageConfig(conf images.ImageConfig, f func(src image.Image) (image.Image, error)) (resource.Image, error) {
return i.getSpec().imageCache.getOrCreate(i, conf, func() (*imageResource, image.Image, error) { img, err := i.getSpec().imageCache.getOrCreate(i, conf, func() (*imageResource, image.Image, error) {
imageProcSem <- true imageProcSem <- true
defer func() { defer func() {
<-imageProcSem <-imageProcSem
@ -291,6 +292,13 @@ func (i *imageResource) doWithImageConfig(conf images.ImageConfig, f func(src im
return ci, converted, nil return ci, converted, nil
}) })
if err != nil {
if i.root != nil && i.root.getFileInfo() != nil {
return nil, errors.Wrapf(err, "image %q", i.root.getFileInfo().Meta().Filename())
}
}
return img, nil
} }
func (i *imageResource) decodeImageConfig(action, spec string) (images.ImageConfig, error) { func (i *imageResource) decodeImageConfig(action, spec string) (images.ImageConfig, error) {