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

Refactor gravity parsing

Browse Source
This commit is contained in:
DarthSim
2024-11-21 21:27:33 +03:00
parent 700617403f
commit f7433303e6
1 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
options/processing_options.go
View File

@@ -220,35 +220,44 @@ func isGravityOffcetValid(gravity GravityType, offset float64) bool {
func parseGravity(g *GravityOptions, args []string, allowedTypes []GravityType) error { func parseGravity(g *GravityOptions, args []string, allowedTypes []GravityType) error {
nArgs := len(args) nArgs := len(args)
if nArgs > 3 {
return fmt.Errorf("Invalid gravity arguments: %v", args)
}
if t, ok := gravityTypes[args[0]]; ok && slices.Contains(allowedTypes, t) { if t, ok := gravityTypes[args[0]]; ok && slices.Contains(allowedTypes, t) {
g.Type = t g.Type = t
} else { } else {
return fmt.Errorf("Invalid gravity: %s", args[0]) return fmt.Errorf("Invalid gravity: %s", args[0])
} }
if g.Type == GravitySmart && nArgs > 1 { switch g.Type {
return fmt.Errorf("Invalid gravity arguments: %v", args) case GravitySmart:
} else if g.Type == GravityFocusPoint && nArgs != 3 { if nArgs > 1 {
return fmt.Errorf("Invalid gravity arguments: %v", args) return fmt.Errorf("Invalid gravity arguments: %v", args)
}
if nArgs > 1 {
if x, err := strconv.ParseFloat(args[1], 64); err == nil && isGravityOffcetValid(g.Type, x) {
g.X = x
} else {
return fmt.Errorf("Invalid gravity X: %s", args[1])
} }
} g.X, g.Y = 0.0, 0.0
if nArgs > 2 { case GravityFocusPoint:
if y, err := strconv.ParseFloat(args[2], 64); err == nil && isGravityOffcetValid(g.Type, y) { if nArgs != 3 {
g.Y = y return fmt.Errorf("Invalid gravity arguments: %v", args)
} else { }
return fmt.Errorf("Invalid gravity Y: %s", args[2]) fallthrough
default:
if nArgs > 3 {
return fmt.Errorf("Invalid gravity arguments: %v", args)
}
if nArgs > 1 {
if x, err := strconv.ParseFloat(args[1], 64); err == nil && isGravityOffcetValid(g.Type, x) {
g.X = x
} else {
return fmt.Errorf("Invalid gravity X: %s", args[1])
}
}
if nArgs > 2 {
if y, err := strconv.ParseFloat(args[2], 64); err == nil && isGravityOffcetValid(g.Type, y) {
g.Y = y
} else {
return fmt.Errorf("Invalid gravity Y: %s", args[2])
}
} }
} }