Browse Source

Softer preferred formats check

DarthSim 2 years ago
parent
commit
067481dc6b
1 changed files with 12 additions and 1 deletions
  1. 12 1
      processing/processing.go

+ 12 - 1
processing/processing.go

@@ -2,6 +2,7 @@ package processing
 
 
 import (
 import (
 	"context"
 	"context"
+	"errors"
 	"fmt"
 	"fmt"
 	"runtime"
 	"runtime"
 	"strconv"
 	"strconv"
@@ -64,12 +65,22 @@ func findBestFormat(srcType imagetype.Type, animated, expectAlpha bool) imagetyp
 }
 }
 
 
 func ValidatePreferredFormats() error {
 func ValidatePreferredFormats() error {
+	filtered := config.PreferredFormats[:0]
+
 	for _, t := range config.PreferredFormats {
 	for _, t := range config.PreferredFormats {
 		if !vips.SupportsSave(t) {
 		if !vips.SupportsSave(t) {
-			return fmt.Errorf("%s can't be a preferred format as it's saving is not supported", t)
+			log.Warnf("%s can't be a preferred format as it's saving is not supported", t)
+		} else {
+			filtered = append(filtered, t)
 		}
 		}
 	}
 	}
 
 
+	if len(filtered) == 0 {
+		return errors.New("No supported preferred formats specified")
+	}
+
+	config.PreferredFormats = filtered
+
 	return nil
 	return nil
 }
 }