github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Add FileInfo to resources created with resources.Match etc.

Browse source 
Without it, image resize fails.

See #6190
This commit is contained in:
Bjørn Erik Pedersen 2019-08-13 18:45:08 +02:00
parent cd575023af
commit 1089cfe4e1
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hugolib/image_test.go
View file

@ -55,12 +55,14 @@ title: "My bundle"
{{ $p := .Site.GetPage "mybundle" }} {{ $p := .Site.GetPage "mybundle" }}
{{ $img1 := resources.Get "images/sunset.jpg" }} {{ $img1 := resources.Get "images/sunset.jpg" }}
{{ $img2 := $p.Resources.GetMatch "sunset.jpg" }} {{ $img2 := $p.Resources.GetMatch "sunset.jpg" }}
{{ $img3 := resources.GetMatch "images/*.jpg" }}
{{ $r := $img1.Resize "123x234" }} {{ $r := $img1.Resize "123x234" }}
{{ $r2 := $r.Resize "12x23" }} {{ $r2 := $r.Resize "12x23" }}
{{ $b := $img2.Resize "345x678" }} {{ $b := $img2.Resize "345x678" }}
{{ $b2 := $b.Resize "34x67" }} {{ $b2 := $b.Resize "34x67" }}
{{ $c := $img3.Resize "456x789" }}
{{ $images := slice $r $r2 $b $b2 }} {{ $images := slice $r $r2 $b $b2 $c }}
{{ range $i, $r := $images }} {{ range $i, $r := $images }}
{{ printf "Resized%d:" (add $i 1) }} {{ $r.Name }}|{{ $r.Width }}|{{ $r.Height }}|{{ $r.MediaType }}|{{ $r.RelPermalink }}| {{ printf "Resized%d:" (add $i 1) }} {{ $r.Name }}|{{ $r.Width }}|{{ $r.Height }}|{{ $r.MediaType }}|{{ $r.RelPermalink }}|
@ -101,6 +103,7 @@ title: "My bundle"
"Resized2: images/sunset.jpg|12|23|image/jpg|/images/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_ada4bb1a57f77a63306e3bd67286248e.jpg|", "Resized2: images/sunset.jpg|12|23|image/jpg|/images/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_ada4bb1a57f77a63306e3bd67286248e.jpg|",
"Resized3: sunset.jpg|345|678|image/jpg|/mybundle/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_345x678_resize_q75_box.jpg|", "Resized3: sunset.jpg|345|678|image/jpg|/mybundle/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_345x678_resize_q75_box.jpg|",
"Resized4: sunset.jpg|34|67|image/jpg|/mybundle/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_44d8c928664d7c5a67377c6ec58425ce.jpg|", "Resized4: sunset.jpg|34|67|image/jpg|/mybundle/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_44d8c928664d7c5a67377c6ec58425ce.jpg|",
" Resized5: images/sunset.jpg|456|789|image/jpg|/images/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_456x789_resize_q75_box.jpg|",
} }
b.AssertFileContent(filepath.Join(workDir, "public/index.html"), imgExpect...) b.AssertFileContent(filepath.Join(workDir, "public/index.html"), imgExpect...)

1
resources/resource_factories/create/create.go
View file

@ -89,6 +89,7 @@ func (c *Client) match(pattern string, firstOnly bool) (resource.Resources, erro
meta := info.Meta() meta := info.Meta()
r, err := c.rs.New(resources.ResourceSourceDescriptor{ r, err := c.rs.New(resources.ResourceSourceDescriptor{
LazyPublish: true, LazyPublish: true,
FileInfo: info,
OpenReadSeekCloser: func() (hugio.ReadSeekCloser, error) { OpenReadSeekCloser: func() (hugio.ReadSeekCloser, error) {
return meta.Open() return meta.Open()
}, },