From 0b4bbb18087fe7e280a302f031e19852ef741a48 Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Tue, 19 Aug 2025 00:14:30 +0700 Subject: feat: allow multiple converters for processing --- internal/client/input/b2.go | 3 +- internal/client/input/input_client_interface.go | 1 + internal/client/input/local_unix.go | 7 +-- internal/client/output/b2.go | 3 +- internal/client/output/local_unix.go | 7 +-- internal/client/output/output_client_interface.go | 3 +- internal/converter/converter_interface.go | 6 ++- internal/converter/webp.go | 52 +++++++++++++++-------- 8 files changed, 49 insertions(+), 33 deletions(-) (limited to 'internal') diff --git a/internal/client/input/b2.go b/internal/client/input/b2.go index 0092313..db68268 100644 --- a/internal/client/input/b2.go +++ b/internal/client/input/b2.go @@ -5,7 +5,6 @@ import ( "fmt" "io" "slices" - "strconv" "strings" "github.com/Backblaze/blazer/b2" @@ -102,8 +101,8 @@ func (c *B2InputClient) ReadMetadata(path string) (*MetadataStruct, error) { FirstCreated: attrs.UploadTimestamp, LastModified: attrs.LastModified, Misc: attrs.Info, + Size: attrs.Size, } - metadata.Misc["Size"] = strconv.FormatInt(attrs.Size, 10) switch attrs.Status { case b2.Uploaded: diff --git a/internal/client/input/input_client_interface.go b/internal/client/input/input_client_interface.go index 5d12fa8..4930aa0 100644 --- a/internal/client/input/input_client_interface.go +++ b/internal/client/input/input_client_interface.go @@ -20,6 +20,7 @@ type MetadataStruct struct { ContentType string FirstCreated time.Time LastModified time.Time + Size int64 Misc map[string]string } diff --git a/internal/client/input/local_unix.go b/internal/client/input/local_unix.go index 2df3a41..27a7947 100644 --- a/internal/client/input/local_unix.go +++ b/internal/client/input/local_unix.go @@ -87,10 +87,6 @@ func (c *LocalUnixInputClient) ReadMetadata(path string) (*MetadataStruct, error stat_t := fileInfo.Sys().(*syscall.Stat_t) creationTime := time.Unix(stat_t.Ctim.Sec, stat_t.Ctim.Nsec) - misc := map[string]string{ - "Size": strconv.FormatInt(fileInfo.Size(), 10), - } - return &MetadataStruct{ Name: fileInfo.Name(), StorageType: "local-unix", @@ -98,7 +94,8 @@ func (c *LocalUnixInputClient) ReadMetadata(path string) (*MetadataStruct, error ContentType: mime.TypeByExtension("." + nodeExt), FirstCreated: creationTime, LastModified: fileInfo.ModTime(), - Misc: misc, + Size: fileInfo.Size(), + Misc: map[string]string{}, }, nil } diff --git a/internal/client/output/b2.go b/internal/client/output/b2.go index e741e25..f53532a 100644 --- a/internal/client/output/b2.go +++ b/internal/client/output/b2.go @@ -4,7 +4,6 @@ import ( "context" "fmt" "io" - "strconv" "github.com/Backblaze/blazer/b2" "github.com/SayaAndy/saya-today-thumbnail-generator/config" @@ -70,8 +69,8 @@ func (c *B2OutputClient) ReadMetadata(path string) (*MetadataStruct, error) { FirstCreated: attrs.UploadTimestamp, LastModified: attrs.LastModified, Misc: attrs.Info, + Size: attrs.Size, } - metadata.Misc["Size"] = strconv.FormatInt(attrs.Size, 10) switch attrs.Status { case b2.Uploaded: diff --git a/internal/client/output/local_unix.go b/internal/client/output/local_unix.go index b106726..dd53e79 100644 --- a/internal/client/output/local_unix.go +++ b/internal/client/output/local_unix.go @@ -93,10 +93,6 @@ func (c *LocalUnixOutputClient) ReadMetadata(path string) (*MetadataStruct, erro stat_t := fileInfo.Sys().(*syscall.Stat_t) creationTime := time.Unix(stat_t.Ctim.Sec, stat_t.Ctim.Nsec) - misc := map[string]string{ - "Size": strconv.FormatInt(fileInfo.Size(), 10), - } - mddateOriginal := make([]byte, 0) switch c.attrMode { case "xattr": @@ -122,7 +118,8 @@ func (c *LocalUnixOutputClient) ReadMetadata(path string) (*MetadataStruct, erro ContentType: mime.TypeByExtension("." + nodeExt), FirstCreated: creationTime, LastModified: fileInfo.ModTime(), - Misc: misc, + Size: fileInfo.Size(), + Misc: map[string]string{}, }, nil } diff --git a/internal/client/output/output_client_interface.go b/internal/client/output/output_client_interface.go index 437895c..c74851d 100644 --- a/internal/client/output/output_client_interface.go +++ b/internal/client/output/output_client_interface.go @@ -10,7 +10,7 @@ import ( type OutputClient interface { GetWriter(path string, inputMetadata *input.MetadataStruct) (io.WriteCloser, error) - ReadMetadata(string) (*MetadataStruct, error) + ReadMetadata(path string) (*MetadataStruct, error) IsMissing(path string) bool } @@ -22,6 +22,7 @@ type MetadataStruct struct { ContentType string FirstCreated time.Time LastModified time.Time + Size int64 Misc map[string]string } diff --git a/internal/converter/converter_interface.go b/internal/converter/converter_interface.go index 342ca1e..fda23d1 100644 --- a/internal/converter/converter_interface.go +++ b/internal/converter/converter_interface.go @@ -4,11 +4,15 @@ 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 - Process(ext string, reader io.ReadCloser, writer io.WriteCloser) error + ReadMetadata(path string) (*output.MetadataStruct, error) + IsMissing(path string) bool } var NewConverterMap = map[string]func(cfg *config.ConverterConfig) (Converter, error){ diff --git a/internal/converter/webp.go b/internal/converter/webp.go index 8a9c09a..8cfe5a7 100644 --- a/internal/converter/webp.go +++ b/internal/converter/webp.go @@ -12,6 +12,8 @@ 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" ) @@ -19,9 +21,10 @@ import ( var _ Converter = (*WebpConverter)(nil) type WebpConverter struct { - maxWidth int - maxHeight int - quality int + maxWidth int + maxHeight int + quality int + outputClient output.OutputClient } func NewWebpConverter(cfg *config.ConverterConfig) (Converter, error) { @@ -30,26 +33,24 @@ func NewWebpConverter(cfg *config.ConverterConfig) (Converter, error) { } 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" + outputClient, err := output.NewOutputClientMap[cfg.Output.Storage.Type](&cfg.Output) + if err != nil { + return nil, fmt.Errorf("fail to initialize output client: %w", err) } - pathParts[len(pathParts)-1] = "webp" - return strings.Join(pathParts, ".") + + return &WebpConverter{webpCfg.Size.MaxWidth, webpCfg.Size.MaxHeight, webpCfg.Quality, outputClient}, nil } -func (p *WebpConverter) Process(contentType string, reader io.ReadCloser, writer io.WriteCloser) error { +func (p *WebpConverter) Process(inputMetadata *input.MetadataStruct, reader io.Reader, outputName string) error { var src image.Image - var err error - defer reader.Close() + writer, err := p.outputClient.GetWriter(outputName, inputMetadata) + if err != nil { + return fmt.Errorf("fail to initialize writer for output: %w", err) + } defer writer.Close() - switch contentType { + switch inputMetadata.ContentType { case "image/jpeg": src, err = jpeg.Decode(reader) if err != nil { @@ -61,7 +62,7 @@ func (p *WebpConverter) Process(contentType string, reader io.ReadCloser, writer return fmt.Errorf("decode png: %w", err) } default: - return fmt.Errorf("unsupported content type: %s", contentType) + return fmt.Errorf("unsupported content type: %s", inputMetadata.ContentType) } opts, err := encoder.NewLossyEncoderOptions(encoder.PresetDefault, float32(p.quality)) @@ -93,3 +94,20 @@ func (p *WebpConverter) Process(contentType string, reader io.ReadCloser, writer 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) +} -- cgit v1.3.1+13