From ebfe3540c333ae7fa3effb410a20e5764627e307 Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Mon, 9 Feb 2026 06:33:35 +0700 Subject: feat: add jpeg converter fix: explicitly set content type for b2 feat: extend rewrite settings with "never overwrite" feat: move rewrite setting to converter config feat: allow to skip size config --- internal/converter/webp.go | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'internal/converter/webp.go') diff --git a/internal/converter/webp.go b/internal/converter/webp.go index 8cfe5a7..fbffd01 100644 --- a/internal/converter/webp.go +++ b/internal/converter/webp.go @@ -44,7 +44,7 @@ func NewWebpConverter(cfg *config.ConverterConfig) (Converter, error) { func (p *WebpConverter) Process(inputMetadata *input.MetadataStruct, reader io.Reader, outputName string) error { var src image.Image - writer, err := p.outputClient.GetWriter(outputName, inputMetadata) + writer, err := p.outputClient.GetWriter(outputName, inputMetadata, "image/webp") if err != nil { return fmt.Errorf("fail to initialize writer for output: %w", err) } @@ -61,6 +61,11 @@ func (p *WebpConverter) Process(inputMetadata *input.MetadataStruct, reader io.R if err != nil { return fmt.Errorf("decode png: %w", err) } + case "image/webp": + src, err = webp.Decode(reader, nil) + if err != nil { + return fmt.Errorf("decode webp: %w", err) + } default: return fmt.Errorf("unsupported content type: %s", inputMetadata.ContentType) } @@ -70,25 +75,25 @@ func (p *WebpConverter) Process(inputMetadata *input.MetadataStruct, reader io.R return fmt.Errorf("create webp encoder options: %w", err) } - xCoef := float64(p.maxWidth) / float64(src.Bounds().Max.X) - if p.maxWidth == 0 { - xCoef = 1 + xCoef := 1.0 + if p.maxWidth > 0 { + xCoef = float64(p.maxWidth) / float64(src.Bounds().Max.X) } - yCoef := float64(p.maxHeight) / float64(src.Bounds().Max.Y) - if p.maxHeight == 0 { - yCoef = 1 + yCoef := 1.0 + if p.maxHeight > 0 { + yCoef = float64(p.maxHeight) / float64(src.Bounds().Max.Y) } slog.Debug("calculated coefficients", slog.Float64("x_coef", xCoef), slog.Float64("y_coef", yCoef)) - if xCoef > 1 && yCoef > 1 { - return webp.Encode(writer, src, opts) - } - minCoef := xCoef if yCoef < minCoef { minCoef = yCoef } + if minCoef >= 1.0 { + return webp.Encode(writer, src, opts) + } + dst := image.NewRGBA(image.Rect(0, 0, int(float64(src.Bounds().Max.X)*minCoef+0.5), int(float64(src.Bounds().Max.Y)*minCoef+0.5))) draw.CatmullRom.Scale(dst, dst.Rect, src, src.Bounds(), draw.Over, nil) -- cgit v1.3.1+13