2 files changed, 18 insertions, 40 deletions
diff --git a/internal/converter/converter_interface.go b/internal/converter/converter_interface.go
index fda23d1..342ca1e 100644
--- a/internal/converter/converter_interface.go
+++ b/internal/converter/converter_interface.go
@@ -4,15 +4,11 @@ import (
 	"io"
 
 	"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"
 )
 
 type Converter interface {
-	Process(inputMetadata *input.MetadataStruct, reader io.Reader, outputName string) error
 	DeductOutputPath(inputPath string) string
-	ReadMetadata(path string) (*output.MetadataStruct, error)
-	IsMissing(path string) bool
+	Process(ext string, reader io.ReadCloser, writer io.WriteCloser) error
 }
 
 var NewConverterMap = map[string]func(cfg *config.ConverterConfig) (Converter, error){
diff --git a/internal/converter/webp.go b/internal/converter/webp.go
index 8cfe5a7..8a9c09a 100644
--- a/internal/converter/webp.go
+++ b/internal/converter/webp.go
@@ -12,8 +12,6 @@ import (
 	"golang.org/x/image/draw"
 
 	"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/kolesa-team/go-webp/encoder"
 	"github.com/kolesa-team/go-webp/webp"
 )
@@ -21,10 +19,9 @@ import (
 var _ Converter = (*WebpConverter)(nil)
 
 type WebpConverter struct {
-	maxWidth     int
-	maxHeight    int
-	quality      int
-	outputClient output.OutputClient
+	maxWidth  int
+	maxHeight int
+	quality   int
 }
 
 func NewWebpConverter(cfg *config.ConverterConfig) (Converter, error) {
@@ -33,24 +30,26 @@ func NewWebpConverter(cfg *config.ConverterConfig) (Converter, error) {
 	}
 	webpCfg := cfg.Config.(*config.WebpConfig)
 
-	outputClient, err := output.NewOutputClientMap[cfg.Output.Storage.Type](&cfg.Output)
-	if err != nil {
-		return nil, fmt.Errorf("fail to initialize output client: %w", err)
-	}
+	return &WebpConverter{webpCfg.Size.MaxWidth, webpCfg.Size.MaxHeight, webpCfg.Quality}, nil
+}
 
-	return &WebpConverter{webpCfg.Size.MaxWidth, webpCfg.Size.MaxHeight, webpCfg.Quality, outputClient}, 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(inputMetadata *input.MetadataStruct, reader io.Reader, outputName string) error {
+func (p *WebpConverter) Process(contentType string, reader io.ReadCloser, writer io.WriteCloser) error {
 	var src image.Image
+	var err error
 
-	writer, err := p.outputClient.GetWriter(outputName, inputMetadata)
-	if err != nil {
-		return fmt.Errorf("fail to initialize writer for output: %w", err)
-	}
+	defer reader.Close()
 	defer writer.Close()
 
-	switch inputMetadata.ContentType {
+	switch contentType {
 	case "image/jpeg":
 		src, err = jpeg.Decode(reader)
 		if err != nil {
@@ -62,7 +61,7 @@ func (p *WebpConverter) Process(inputMetadata *input.MetadataStruct, reader io.R
 			return fmt.Errorf("decode png: %w", err)
 		}
 	default:
-		return fmt.Errorf("unsupported content type: %s", inputMetadata.ContentType)
+		return fmt.Errorf("unsupported content type: %s", contentType)
 	}
 
 	opts, err := encoder.NewLossyEncoderOptions(encoder.PresetDefault, float32(p.quality))
@@ -94,20 +93,3 @@ func (p *WebpConverter) Process(inputMetadata *input.MetadataStruct, reader io.R
 
 	return webp.Encode(writer, dst, opts)
 }
-
-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) ReadMetadata(path string) (*output.MetadataStruct, error) {
-	return p.outputClient.ReadMetadata(path)
-}
-
-func (p *WebpConverter) IsMissing(path string) bool {
-	return p.outputClient.IsMissing(path)
-}