highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-10-10 04:02:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix options rewrite

Browse Source
This commit is contained in:
DarthSim
2019-07-22 17:27:18 +06:00
parent 5426c309f3
commit ee54296249
3 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
processing_options.go
View File

@@ -12,7 +12,11 @@ import (
"strings"
)
type urlOptions map[string][]string
type urlOption struct {
Name string
Args []string
}
type urlOptions []urlOption
type processingHeaders struct {
Accept string
@@ -713,8 +717,8 @@ func applyProcessingOption(po *processingOptions, name string, args []string) er
}
func applyProcessingOptions(po *processingOptions, options urlOptions) error {
for name, args := range options {
if err := applyProcessingOption(po, name, args); err != nil {
for _, opt := range options {
if err := applyProcessingOption(po, opt.Name, opt.Args); err != nil {
return err
}
}
@@ -723,7 +727,7 @@ func applyProcessingOptions(po *processingOptions, options urlOptions) error {
}
func parseURLOptions(opts []string) (urlOptions, []string) {
parsed := make(urlOptions)
parsed := make(urlOptions, 0, len(opts))
urlStart := len(opts) + 1
for i, opt := range opts {
@@ -734,7 +738,7 @@ func parseURLOptions(opts []string) (urlOptions, []string) {
break
}
parsed[args[0]] = args[1:]
parsed = append(parsed, urlOption{Name: args[0], Args: args[1:]})
}
var rest []string