ref: 93d02aabe6e611d65c428a9c5669b422e1bcf5e8
parent: 508db1906beb84058e6d4394c8805532035e7bd2
author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
date: Sat Jul 27 14:16:13 EDT 2019
resources: Fix image Width/Height regression Fixes #6120
--- /dev/null
+++ b/hugolib/image_test.go
@@ -1,0 +1,114 @@
+// Copyright 2019 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 hugolib
+
+import (
+ "io"
+ "os"
+ "path/filepath"
+ "testing"
+
+ "github.com/gohugoio/hugo/htesting"
+
+ "github.com/gohugoio/hugo/hugofs"
+ "github.com/spf13/viper"
+ "github.com/stretchr/testify/require"
+)
+
+// We have many tests for the different resize operations etc. in the resource package,
+// this is an integration test.
+func TestImageResize(t *testing.T) {+ assert := require.New(t)
+ // Make this a real as possible.
+ workDir, clean, err := htesting.CreateTempDir(hugofs.Os, "image-resize")
+ assert.NoError(err)
+ defer clean()
+
+ newBuilder := func() *sitesBuilder {+
+ v := viper.New()
+ v.Set("workingDir", workDir)+ v.Set("baseURL", "https://example.org")+
+ b := newTestSitesBuilder(t).WithWorkingDir(workDir)
+ b.Fs = hugofs.NewDefault(v)
+ b.WithViper(v)
+ b.WithContent("mybundle/index.md", `+---
+title: "My bundle"
+---
+
+`)
+
+ b.WithTemplatesAdded("index.html", `+{{ $p := .Site.GetPage "mybundle" }}+{{ $img1 := resources.Get "images/sunset.jpg" }}+{{ $img2 := $p.Resources.GetMatch "sunset.jpg" }}+{{ $r := $img1.Resize "123x234" }}+{{ $r2 := $r.Resize "12x23" }}+{{ $b := $img2.Resize "345x678" }}+{{ $b2 := $b.Resize "34x67" }}+
+{{ $images := slice $r $r2 $b $b2 }}+
+{{ range $i, $r := $images }}+{{ printf "Resized%d:" (add $i 1) }} {{ $r.Name }}|{{ $r.Width }}|{{ $r.Height }}|{{ $r.MediaType }}|{{ $r.RelPermalink }}|+{{ end }}+
+`)
+
+ return b
+ }
+
+ imageDir := filepath.Join(workDir, "assets", "images")
+ bundleDir := filepath.Join(workDir, "content", "mybundle")
+
+ assert.NoError(os.MkdirAll(imageDir, 0777))
+ assert.NoError(os.MkdirAll(bundleDir, 0777))
+ src, err := os.Open("testdata/sunset.jpg")+ assert.NoError(err)
+ out, err := os.Create(filepath.Join(imageDir, "sunset.jpg"))
+ assert.NoError(err)
+ _, err = io.Copy(out, src)
+ assert.NoError(err)
+ out.Close()
+
+ src.Seek(0, 0)
+
+ out, err = os.Create(filepath.Join(bundleDir, "sunset.jpg"))
+ assert.NoError(err)
+ _, err = io.Copy(out, src)
+ assert.NoError(err)
+ out.Close()
+ src.Close()
+
+ b := newBuilder()
+ b.Build(BuildCfg{})+
+ imgExpect := []string{+ "Resized1: images/sunset.jpg|123|234|image/jpg|/images/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_123x234_resize_q75_box.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|",
+ "Resized4: sunset.jpg|34|67|image/jpg|/mybundle/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_44d8c928664d7c5a67377c6ec58425ce.jpg|",
+ }
+
+ b.AssertFileContent(filepath.Join(workDir, "public/index.html"), imgExpect...)
+
+ // Build it again to make sure we read images from file cache.
+ b = newBuilder()
+ b.Build(BuildCfg{})+
+ b.AssertFileContent(filepath.Join(workDir, "public/index.html"), imgExpect...)
+
+}
--- a/resources/image_cache.go
+++ b/resources/image_cache.go
@@ -91,6 +91,8 @@
img = parent.clone()
img.relTargetDirFile.file = relTarget.file
img.sourceFilename = info.Name
+ // Make sure it's always loaded by sourceFilename.
+ img.openReadSeekerCloser = nil
w, err := img.openDestinationsForWriting()
if err != nil {