mirror of
https://github.com/willnorris/imageproxy.git
synced 2026-04-25 04:46:24 +02:00
allow more flexibility in specifying options
Options can be specified in any order (size no longer needs to be listed first), and may be repeated. Duplicated options overwrite previous values. Technically, non-size options could already be repeated... now size can as well. There's really not much value to this, it's just an side-effect of allowing any order. fixes #5
This commit is contained in:
parent
b4ed3507e3
commit
0a939cc19d
3 changed files with 47 additions and 27 deletions
|
|
@ -46,6 +46,7 @@ func TestParseOptions(t *testing.T) {
|
|||
{"", emptyOptions},
|
||||
{"x", emptyOptions},
|
||||
{"0", emptyOptions},
|
||||
{",,,,", emptyOptions},
|
||||
|
||||
// size variations
|
||||
{"1x", &Options{Width: 1}},
|
||||
|
|
@ -54,12 +55,23 @@ func TestParseOptions(t *testing.T) {
|
|||
{"0.1x0.2", &Options{Width: 0.1, Height: 0.2}},
|
||||
|
||||
// additional flags
|
||||
{",fit", &Options{Fit: true}},
|
||||
{",r90", &Options{Rotate: 90}},
|
||||
{",fv", &Options{FlipVertical: true}},
|
||||
{",fh", &Options{FlipHorizontal: true}},
|
||||
{"fit", &Options{Fit: true}},
|
||||
{"r90", &Options{Rotate: 90}},
|
||||
{"fv", &Options{FlipVertical: true}},
|
||||
{"fh", &Options{FlipHorizontal: true}},
|
||||
|
||||
// duplicate flags (last one wins)
|
||||
{"1x2,3x4", &Options{Width: 3, Height: 4}},
|
||||
{"1x2,3", &Options{Width: 3, Height: 3}},
|
||||
{"1x2,0x3", &Options{Width: 0, Height: 3}},
|
||||
{"1x,x2", &Options{Width: 1, Height: 2}},
|
||||
{"r90,r270", &Options{Rotate: 270}},
|
||||
|
||||
// mix of valid and invalid flags
|
||||
{"FOO,1,BAR,r90,BAZ", &Options{Width: 1, Height: 1, Rotate: 90}},
|
||||
|
||||
{"1x2,fit,r90,fv,fh", &Options{1, 2, true, 90, true, true}},
|
||||
{"r90,fh,1x2,fv,fit", &Options{1, 2, true, 90, true, true}},
|
||||
}
|
||||
|
||||
for i, tt := range tests {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue