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

Closes #9696

diff --git a/resources/images/config.go b/resources/images/config.go
index e72bf548579c526259d236232b107cfb28643c29..d553bda0fc96313c80e7ad13a674c5105e9b4698 100644 (file)
--- a/resources/images/config.go
+++ b/resources/images/config.go
@@ -253,8 +253,17 @@ func DecodeImageConfig(action, config string, defaults ImagingConfig, sourceForm
                }
        }
 
-       if c.Width == 0 && c.Height == 0 {
-               return c, errors.New("must provide Width or Height")
+       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 {
+                       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 == "" {

diff --git a/resources/images/config_test.go b/resources/images/config_test.go
index 816a69cf9166daba282943625e9fdbfabb63e87b..1b785f7ca522fa234fb5d46d5d4c36dced27f2c5 100644 (file)
--- a/resources/images/config_test.go
+++ b/resources/images/config_test.go
@@ -80,25 +80,33 @@ func TestDecodeConfig(t *testing.T) {
 
 func TestDecodeImageConfig(t *testing.T) {
        for i, this := range []struct {
+               action string
                in     string
                expect any
        }{
-               {"300x400", newImageConfig(300, 400, 75, 0, "box", "smart", "")},
-               {"300x400 #fff", newImageConfig(300, 400, 75, 0, "box", "smart", "fff")},
-               {"100x200 bottomRight", newImageConfig(100, 200, 75, 0, "box", "BottomRight", "")},
-               {"10x20 topleft Lanczos", newImageConfig(10, 20, 75, 0, "Lanczos", "topleft", "")},
-               {"linear left 10x r180", newImageConfig(10, 0, 75, 180, "linear", "left", "")},
-               {"x20 riGht Cosine q95", newImageConfig(0, 20, 95, 0, "cosine", "right", "")},
-
-               {"", false},
-               {"foo", false},
+               {"resize", "300x400", newImageConfig("resize", 300, 400, 75, 0, "box", "smart", "")},
+               {"resize", "300x400 #fff", newImageConfig("resize", 300, 400, 75, 0, "box", "smart", "fff")},
+               {"resize", "100x200 bottomRight", newImageConfig("resize", 100, 200, 75, 0, "box", "BottomRight", "")},
+               {"resize", "10x20 topleft Lanczos", newImageConfig("resize", 10, 20, 75, 0, "Lanczos", "topleft", "")},
+               {"resize", "linear left 10x r180", newImageConfig("resize", 10, 0, 75, 180, "linear", "left", "")},
+               {"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", "")},
+
+               {"resize", "", false},
+               {"resize", "foo", false},
+               {"crop", "100x", false},
+               {"fill", "100x", false},
+               {"fit", "100x", false},
+               {"foo", "100x", false},
        } {
 
                cfg, err := DecodeConfig(nil)
                if err != nil {
                        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 err == nil {
                                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 {
-       var c ImageConfig = GetDefaultImageConfig("resize", ImagingConfig{})
+func newImageConfig(action string, width, height, quality, rotate int, filter, anchor, bgColor string) ImageConfig {
+       var c ImageConfig = GetDefaultImageConfig(action, ImagingConfig{})
        c.TargetFormat = PNG
        c.Hint = 2
        c.Width = width