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

Fix file paths for uncached transformed images

Browse source 
This commit also fixes an existing test to work according to the correct logic. The test was written based on erroneous behavior. We resize the image to 300x200px, and are now trying to fit it within a 50px square. The longest edge is 300 pixels, so we need to divide it by 6 (300 / 50 == 6). And then scale the shortest edge with the same proportion (200 / 6 == 33.33).

The original test was transforming the original source image, hence the previous values:

900 x 562
900 / 50 == 18
562 / 18 == 31.22

Fixes #5012
This commit is contained in:
Rob Jackson 2018-07-31 12:31:35 +01:00 committed by Bjørn Erik Pedersen
parent 0ba19c57f1
commit b718d743b7
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resource/image_cache.go
View file

@ -100,16 +100,16 @@ func (c *imageCache) getOrCreate(
if exists { if exists {
img = parent.clone() img = parent.clone()
img.relTargetDirFile.file = relTarget.file
img.sourceFilename = cacheFilename
// We have to look in the resources file system for this.
img.overriddenSourceFs = img.spec.BaseFs.Resources.Fs
} else { } else {
img, err = create(cacheFilename) img, err = create(cacheFilename)
if err != nil { if err != nil {
return nil, err return nil, err
} }
} }
img.relTargetDirFile.file = relTarget.file
img.sourceFilename = cacheFilename
// We have to look in the resources file system for this.
img.overriddenSourceFs = img.spec.BaseFs.Resources.Fs
c.mu.Lock() c.mu.Lock()
if img2, found := c.store[key]; found { if img2, found := c.store[key]; found {

4
resource/image_test.go
View file

@ -73,6 +73,7 @@ func TestImageTransformBasic(t *testing.T) {
assert.NoError(err) assert.NoError(err)
assert.True(image != resized) assert.True(image != resized)
assert.True(image.genericResource != resized.genericResource) assert.True(image.genericResource != resized.genericResource)
assert.True(image.sourceFilename != resized.sourceFilename)
resized0x, err := image.Resize("x200") resized0x, err := image.Resize("x200")
assert.NoError(err) assert.NoError(err)
@ -100,7 +101,7 @@ func TestImageTransformBasic(t *testing.T) {
assert.NoError(err) assert.NoError(err)
assert.Equal("/a/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_625708021e2bb281c9f1002f88e4753f.jpg", fitted.RelPermalink()) assert.Equal("/a/sunset_hu59e56ffff1bc1d8d122b1403d34e039f_90587_625708021e2bb281c9f1002f88e4753f.jpg", fitted.RelPermalink())
assert.Equal(50, fitted.Width()) assert.Equal(50, fitted.Width())
assert.Equal(31, fitted.Height()) assert.Equal(33, fitted.Height())
// Check the MD5 key threshold // Check the MD5 key threshold
fittedAgain, _ := fitted.Fit("10x20") fittedAgain, _ := fitted.Fit("10x20")
@ -128,6 +129,7 @@ func TestImageTransformBasic(t *testing.T) {
filledAgain, err := image.Fill("200x100 bottomLeft") filledAgain, err := image.Fill("200x100 bottomLeft")
assert.NoError(err) assert.NoError(err)
assert.True(filled == filledAgain) assert.True(filled == filledAgain)
assert.True(filled.sourceFilename == filledAgain.sourceFilename)
assertFileCache(assert, image.spec.BaseFs.Resources.Fs, filledAgain.RelPermalink(), 200, 100) assertFileCache(assert, image.spec.BaseFs.Resources.Fs, filledAgain.RelPermalink(), 200, 100)
} }