From 4fa22c837cb00b87cd43c0aceec26729b8c3fa48 Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Wed, 16 Jul 2025 13:36:07 +0700 Subject: format: rename processor to converter --- config/config.go | 6 +- config/config.json | 2 +- internal/converter/processor_interface.go | 8 +++ internal/converter/webp.go | 95 +++++++++++++++++++++++++++++++ internal/processor/processor_interface.go | 8 --- internal/processor/webp.go | 95 ------------------------------- main.go | 20 ++++--- 7 files changed, 119 insertions(+), 115 deletions(-) create mode 100644 internal/converter/processor_interface.go create mode 100644 internal/converter/webp.go delete mode 100644 internal/processor/processor_interface.go delete mode 100644 internal/processor/webp.go diff --git a/config/config.go b/config/config.go index 66533a6..3ca8f84 100644 --- a/config/config.go +++ b/config/config.go @@ -11,7 +11,7 @@ import ( type Config struct { Input InputConfig `json:"Input" validate:"required"` - Processor ProcessorConfig `json:"Processor" validate:"required"` + Converter ConverterConfig `json:"Converter" validate:"required"` Output OutputConfig `json:"Output" validate:"required"` MaxConcurrentJobs int `json:"MaxConcurrentJobs" validate:"required,min=1"` ForceRewrite bool `json:"ForceRewrite" validate:"required"` @@ -72,12 +72,12 @@ type LocalConfig struct { Path string `json:"Path" validate:"required,min=1"` } -type ProcessorConfig struct { +type ConverterConfig struct { Type string `json:"Type" validate:"required,oneof=webp"` Config any `json:"Config" validate:"required"` } -func (pc *ProcessorConfig) UnmarshalJSON(data []byte) error { +func (pc *ConverterConfig) UnmarshalJSON(data []byte) error { var tmp struct { Type string `json:"Type"` Config json.RawMessage `json:"Config"` diff --git a/config/config.json b/config/config.json index acf3e02..db4ddd4 100644 --- a/config/config.json +++ b/config/config.json @@ -19,7 +19,7 @@ "png" ] }, - "Processor": { + "Converter": { "Type": "webp", "Config": { "Quality": 80, diff --git a/internal/converter/processor_interface.go b/internal/converter/processor_interface.go new file mode 100644 index 0000000..88b5ac3 --- /dev/null +++ b/internal/converter/processor_interface.go @@ -0,0 +1,8 @@ +package converter + +import "io" + +type Converter interface { + DeductOutputPath(inputPath string) string + Process(ext string, reader io.ReadCloser, writer io.WriteCloser) error +} diff --git a/internal/converter/webp.go b/internal/converter/webp.go new file mode 100644 index 0000000..b7f1216 --- /dev/null +++ b/internal/converter/webp.go @@ -0,0 +1,95 @@ +package converter + +import ( + "fmt" + "image" + "image/jpeg" + "image/png" + "io" + "log/slog" + "strings" + + "golang.org/x/image/draw" + + "github.com/SayaAndy/saya-today-thumbnail-generator/config" + "github.com/kolesa-team/go-webp/encoder" + "github.com/kolesa-team/go-webp/webp" +) + +var _ Converter = (*WebpConverter)(nil) + +type WebpConverter struct { + maxWidth int + maxHeight int + quality int +} + +func NewWebpConverter(cfg *config.ConverterConfig) (*WebpConverter, error) { + if cfg.Type != "webp" { + return nil, fmt.Errorf("invalid storage type for WebpConverter") + } + webpCfg := cfg.Config.(*config.WebpConfig) + + return &WebpConverter{webpCfg.Size.MaxWidth, webpCfg.Size.MaxHeight, webpCfg.Quality}, nil +} + +func (p *WebpConverter) DeductOutputPath(inputPath string) string { + pathParts := strings.Split(inputPath, ".") + if len(pathParts) < 2 { + return inputPath + ".webp" + } + pathParts[len(pathParts)-1] = "webp" + return strings.Join(pathParts, ".") +} + +func (p *WebpConverter) Process(contentType string, reader io.ReadCloser, writer io.WriteCloser) error { + var src image.Image + var err error + + defer reader.Close() + defer writer.Close() + + switch contentType { + case "image/jpeg": + src, err = jpeg.Decode(reader) + if err != nil { + return fmt.Errorf("decode jpeg: %w", err) + } + case "image/png": + src, err = png.Decode(reader) + if err != nil { + return fmt.Errorf("decode png: %w", err) + } + default: + return fmt.Errorf("unsupported content type: %s", contentType) + } + + opts, err := encoder.NewLossyEncoderOptions(encoder.PresetDefault, float32(p.quality)) + if err != nil { + return fmt.Errorf("create webp encoder options: %w", err) + } + + xCoef := float64(p.maxWidth) / float64(src.Bounds().Max.X) + if p.maxWidth == 0 { + xCoef = 1 + } + yCoef := float64(p.maxHeight) / float64(src.Bounds().Max.Y) + if p.maxHeight == 0 { + yCoef = 1 + } + 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 + } + + 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) + + return webp.Encode(writer, dst, opts) +} diff --git a/internal/processor/processor_interface.go b/internal/processor/processor_interface.go deleted file mode 100644 index 7cf20f2..0000000 --- a/internal/processor/processor_interface.go +++ /dev/null @@ -1,8 +0,0 @@ -package processor - -import "io" - -type Processor interface { - DeductOutputPath(inputPath string) string - Process(ext string, reader io.ReadCloser, writer io.WriteCloser) error -} diff --git a/internal/processor/webp.go b/internal/processor/webp.go deleted file mode 100644 index 86ff567..0000000 --- a/internal/processor/webp.go +++ /dev/null @@ -1,95 +0,0 @@ -package processor - -import ( - "fmt" - "image" - "image/jpeg" - "image/png" - "io" - "log/slog" - "strings" - - "golang.org/x/image/draw" - - "github.com/SayaAndy/saya-today-thumbnail-generator/config" - "github.com/kolesa-team/go-webp/encoder" - "github.com/kolesa-team/go-webp/webp" -) - -var _ Processor = (*WebpProcessor)(nil) - -type WebpProcessor struct { - maxWidth int - maxHeight int - quality int -} - -func NewWebpProcessor(cfg *config.ProcessorConfig) (*WebpProcessor, error) { - if cfg.Type != "webp" { - return nil, fmt.Errorf("invalid storage type for WebpProcessor") - } - webpCfg := cfg.Config.(*config.WebpConfig) - - return &WebpProcessor{webpCfg.Size.MaxWidth, webpCfg.Size.MaxHeight, webpCfg.Quality}, nil -} - -func (p *WebpProcessor) DeductOutputPath(inputPath string) string { - pathParts := strings.Split(inputPath, ".") - if len(pathParts) < 2 { - return inputPath + ".webp" - } - pathParts[len(pathParts)-1] = "webp" - return strings.Join(pathParts, ".") -} - -func (p *WebpProcessor) Process(contentType string, reader io.ReadCloser, writer io.WriteCloser) error { - var src image.Image - var err error - - defer reader.Close() - defer writer.Close() - - switch contentType { - case "image/jpeg": - src, err = jpeg.Decode(reader) - if err != nil { - return fmt.Errorf("decode jpeg: %w", err) - } - case "image/png": - src, err = png.Decode(reader) - if err != nil { - return fmt.Errorf("decode png: %w", err) - } - default: - return fmt.Errorf("unsupported content type: %s", contentType) - } - - opts, err := encoder.NewLossyEncoderOptions(encoder.PresetDefault, float32(p.quality)) - if err != nil { - return fmt.Errorf("create webp encoder options: %w", err) - } - - xCoef := float64(p.maxWidth) / float64(src.Bounds().Max.X) - if p.maxWidth == 0 { - xCoef = 1 - } - yCoef := float64(p.maxHeight) / float64(src.Bounds().Max.Y) - if p.maxHeight == 0 { - yCoef = 1 - } - 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 - } - - 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) - - return webp.Encode(writer, dst, opts) -} diff --git a/main.go b/main.go index 32ff634..16523fd 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,7 @@ import ( "github.com/SayaAndy/saya-today-thumbnail-generator/config" "github.com/SayaAndy/saya-today-thumbnail-generator/internal/client/input" "github.com/SayaAndy/saya-today-thumbnail-generator/internal/client/output" - "github.com/SayaAndy/saya-today-thumbnail-generator/internal/processor" + "github.com/SayaAndy/saya-today-thumbnail-generator/internal/converter" ) var ( @@ -20,6 +20,7 @@ var ( ) func main() { + var err error signal.Notify(sigTermChan, os.Interrupt, syscall.SIGTERM) flag.Parse() @@ -40,19 +41,22 @@ func main() { default: } - inputClient, err := input.NewB2InputClient(&cfg.Input) + var inputClient input.InputClient + inputClient, err = input.NewB2InputClient(&cfg.Input) if err != nil { slog.Error("fail to initialize input client", slog.String("error", err.Error())) os.Exit(1) } - outputClient, err := output.NewB2OutputClient(&cfg.Output) + var outputClient output.OutputClient + outputClient, err = output.NewB2OutputClient(&cfg.Output) if err != nil { slog.Error("fail to initialize output client", slog.String("error", err.Error())) os.Exit(1) } - converter, err := processor.NewWebpProcessor(&cfg.Processor) + var conv converter.Converter + conv, err = converter.NewWebpConverter(&cfg.Converter) if err != nil { slog.Error("fail to initialize converter", slog.String("error", err.Error())) os.Exit(1) @@ -60,10 +64,10 @@ func main() { generalLogger := slog.With( slog.String("input_storage", cfg.Input.Storage.Type), - slog.String("processor_type", cfg.Processor.Type), + slog.String("converter_type", cfg.Converter.Type), slog.String("output_storage", cfg.Output.Storage.Type), ) - generalLogger.Info("initialized clients and processor") + generalLogger.Info("initialized clients and converter") select { case <-sigTermChan: @@ -92,7 +96,7 @@ func main() { for i, file := range files { go func(index int, inputName string) { - outputName := converter.DeductOutputPath(inputName) + outputName := conv.DeductOutputPath(inputName) fileLogger := generalLogger.With(slog.String("input_path", inputName), slog.String("output_path", outputName), slog.Int("file_index", index)) threadSigTermChannel := make(chan os.Signal, 1) @@ -139,7 +143,7 @@ func main() { return } - if err := converter.Process(inputMetadata.ContentType, reader, writer); err != nil { + if err := conv.Process(inputMetadata.ContentType, reader, writer); err != nil { fileLogger.Warn("fail to convert file", slog.String("error", err.Error())) return } -- cgit v1.3.1+13