]> git.maquefel.me Git - brevno-suite/hugo/commit
resources: Fix 2 image file cache key issues
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Thu, 16 Jan 2025 18:15:30 +0000 (19:15 +0100)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Sat, 18 Jan 2025 11:23:18 +0000 (12:23 +0100)
commit1f5a15aba0fc7cc4f4cf4ce1afc8d6db81c63e06
tree5a8cf37158d2c700ecf9f059c464697a0e2cbc56
parent8897113666c9e7e62fed945602910ebcd0ec6421
resources: Fix 2 image file cache key issues

* Always include the content hash in the cache key for unprocessed images.
* Always include the image config hash in the cache key.

This is also a major cleanup/simplification of the implementation in this area.

Note that this, unfortunately, forces new hashes/filenames for generated images.

Fixes #13273
Fixes #13272
38 files changed:
config/namespace.go
config/namespace_test.go
hugolib/hugo_sites_multihost_test.go
hugolib/image_test.go
hugolib/pagesfromdata/pagesfromgotmpl_integration_test.go
hugolib/resource_chain_test.go
resources/image.go
resources/image_cache.go
resources/image_extended_test.go
resources/image_test.go
resources/images/config.go
resources/images/config_test.go
resources/images/filters.go
resources/images/image.go
resources/images/images_golden_integration_test.go
resources/images/imagetesting/testing.go
resources/images/smartcrop.go
resources/images/testdata/images_golden/filters/mask2/green.jpg [new file with mode: 0644]
resources/images/testdata/images_golden/filters/mask2/pink.jpg [new file with mode: 0644]
resources/images/testdata/images_golden/methods/crop-sunsetjpg-200x200.jpg [new file with mode: 0644]
resources/images/testdata/images_golden/methods/crop-sunsetjpg-350x400-center-q20.jpg [new file with mode: 0644]
resources/images/testdata/images_golden/methods/crop-sunsetjpg-350x400-center-r90.jpg [new file with mode: 0644]
resources/images/testdata/images_golden/methods/crop-sunsetjpg-350x400-center.jpg [new file with mode: 0644]
resources/images/testdata/images_golden/methods/crop-sunsetjpg-350x400-smart.jpg [new file with mode: 0644]
resources/images/testdata/images_golden/methods/fill-sunsetjpg-90x120-left.jpg [new file with mode: 0644]
resources/images/testdata/images_golden/methods/fill-sunsetjpg-90x120-right.jpg [new file with mode: 0644]
resources/images/testdata/images_golden/methods/fit-sunsetjpg-200x200.jpg [new file with mode: 0644]
resources/images/testdata/images_golden/methods/resize-gopherpng-100x-03fc56-jpg.jpg [new file with mode: 0644]
resources/images/testdata/images_golden/methods/resize-gopherpng-100x-fc03ec.png [new file with mode: 0644]
resources/images/testdata/images_golden/methods/resize-gopherpng-100x.png [new file with mode: 0644]
resources/images/testdata/images_golden/methods/resize-sunsetjpg-300x.jpg [new file with mode: 0644]
resources/images/testdata/images_golden/methods/resize-sunsetjpg-x200.jpg [new file with mode: 0644]
resources/resource.go
resources/resource_spec.go
resources/resources_integration_test.go
resources/testdata/mask2.png [new file with mode: 0644]
resources/transform_test.go
tpl/resources/resources_integration_test.go