mirror/gohugoio-hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-05-11 05:54:58 +00:00
Code Issues Releases Activity

resources/images: Require width and height for Crop, Fill, and Fit

Browse Source 
Closes #9696
This commit is contained in:
Joe Mooring
2022-03-20 10:55:02 -07:00
committed by Bjørn Erik Pedersen
parent b80853de90
commit cad2d8cc70
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/images/config.go
View File

@@ -253,9 +253,18 @@ func DecodeImageConfig(action, config string, defaults ImagingConfig, sourceForm
} }
} }
switch c.Action {
case "crop", "fill", "fit":
if c.Width == 0 || c.Height == 0 {
return c, errors.New("must provide Width and Height")
}
case "resize":
if c.Width == 0 && c.Height == 0 { if c.Width == 0 && c.Height == 0 {
return c, errors.New("must provide Width or Height") return c, errors.New("must provide Width or Height")
} }
default:
return c, errors.Errorf("BUG: unknown action %q encountered while decoding image configuration", c.Action)
}
if c.FilterStr == "" { if c.FilterStr == "" {
c.FilterStr = defaults.Cfg.ResampleFilter c.FilterStr = defaults.Cfg.ResampleFilter

30
resources/images/config_test.go
View File

@@ -80,25 +80,33 @@ func TestDecodeConfig(t *testing.T) {
func TestDecodeImageConfig(t *testing.T) { func TestDecodeImageConfig(t *testing.T) {
for i, this := range []struct { for i, this := range []struct {
action string
in string in string
expect any expect any
}{ }{
{"300x400", newImageConfig(300, 400, 75, 0, "box", "smart", "")}, {"resize", "300x400", newImageConfig("resize", 300, 400, 75, 0, "box", "smart", "")},
{"300x400 #fff", newImageConfig(300, 400, 75, 0, "box", "smart", "fff")}, {"resize", "300x400 #fff", newImageConfig("resize", 300, 400, 75, 0, "box", "smart", "fff")},
{"100x200 bottomRight", newImageConfig(100, 200, 75, 0, "box", "BottomRight", "")}, {"resize", "100x200 bottomRight", newImageConfig("resize", 100, 200, 75, 0, "box", "BottomRight", "")},
{"10x20 topleft Lanczos", newImageConfig(10, 20, 75, 0, "Lanczos", "topleft", "")}, {"resize", "10x20 topleft Lanczos", newImageConfig("resize", 10, 20, 75, 0, "Lanczos", "topleft", "")},
{"linear left 10x r180", newImageConfig(10, 0, 75, 180, "linear", "left", "")}, {"resize", "linear left 10x r180", newImageConfig("resize", 10, 0, 75, 180, "linear", "left", "")},
{"x20 riGht Cosine q95", newImageConfig(0, 20, 95, 0, "cosine", "right", "")}, {"resize", "x20 riGht Cosine q95", newImageConfig("resize", 0, 20, 95, 0, "cosine", "right", "")},
{"crop", "300x400", newImageConfig("crop", 300, 400, 75, 0, "box", "smart", "")},
{"fill", "300x400", newImageConfig("fill", 300, 400, 75, 0, "box", "smart", "")},
{"fit", "300x400", newImageConfig("fit", 300, 400, 75, 0, "box", "smart", "")},
{"", false}, {"resize", "", false},
{"foo", false}, {"resize", "foo", false},
{"crop", "100x", false},
{"fill", "100x", false},
{"fit", "100x", false},
{"foo", "100x", false},
} { } {
cfg, err := DecodeConfig(nil) cfg, err := DecodeConfig(nil)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
result, err := DecodeImageConfig("resize", this.in, cfg, PNG) result, err := DecodeImageConfig(this.action, this.in, cfg, PNG)
if b, ok := this.expect.(bool); ok && !b { if b, ok := this.expect.(bool); ok && !b {
if err == nil { if err == nil {
t.Errorf("[%d] parseImageConfig didn't return an expected error", i) t.Errorf("[%d] parseImageConfig didn't return an expected error", i)
@@ -114,8 +122,8 @@ func TestDecodeImageConfig(t *testing.T) {
} }
} }
func newImageConfig(width, height, quality, rotate int, filter, anchor, bgColor string) ImageConfig { func newImageConfig(action string, width, height, quality, rotate int, filter, anchor, bgColor string) ImageConfig {
var c ImageConfig = GetDefaultImageConfig("resize", ImagingConfig{}) var c ImageConfig = GetDefaultImageConfig(action, ImagingConfig{})
c.TargetFormat = PNG c.TargetFormat = PNG
c.Hint = 2 c.Hint = 2
c.Width = width c.Width = width