summaryrefslogtreecommitdiff
path: root/internal
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'internal')
-rw-r--r--internal/client/input/b2.go3
-rw-r--r--internal/client/input/input_client_interface.go1
-rw-r--r--internal/client/input/local_unix.go7
-rw-r--r--internal/client/output/b2.go3
-rw-r--r--internal/client/output/local_unix.go7
-rw-r--r--internal/client/output/output_client_interface.go3
-rw-r--r--internal/converter/converter_interface.go6
-rw-r--r--internal/converter/webp.go52
8 files changed, 33 insertions, 49 deletions
diff --git a/internal/client/input/b2.go b/internal/client/input/b2.go
index db68268..0092313 100644
--- a/internal/client/input/b2.go
+++ b/internal/client/input/b2.go
@@ -5,6 +5,7 @@ import (
"fmt"
"io"
"slices"
+ "strconv"
"strings"
"github.com/Backblaze/blazer/b2"
@@ -101,8 +102,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 4930aa0..5d12fa8 100644
--- a/internal/client/input/input_client_interface.go
+++ b/internal/client/input/input_client_interface.go
@@ -20,7 +20,6 @@ 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 27a7947..2df3a41 100644
--- a/internal/client/input/local_unix.go
+++ b/internal/client/input/local_unix.go
@@ -87,6 +87,10 @@ 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",
@@ -94,8 +98,7 @@ func (c *LocalUnixInputClient) ReadMetadata(path string) (*MetadataStruct, error
ContentType: mime.TypeByExtension("." + nodeExt),
FirstCreated: creationTime,
LastModified: fileInfo.ModTime(),
- Size: fileInfo.Size(),
- Misc: map[string]string{},
+ Misc: misc,
}, nil
}
diff --git a/internal/client/output/b2.go b/internal/client/output/b2.go
index f53532a..e741e25 100644
--- a/internal/client/output/b2.go
+++ b/internal/client/output/b2.go
@@ -4,6 +4,7 @@ import (
"context"
"fmt"
"io"
+ "strconv"
"github.com/Backblaze/blazer/b2"
"github.com/SayaAndy/saya-today-thumbnail-generator/config"
@@ -69,8 +70,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 dd53e79..b106726 100644
--- a/internal/client/output/local_unix.go
+++ b/internal/client/output/local_unix.go
@@ -93,6 +93,10 @@ 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":
@@ -118,8 +122,7 @@ func (c *LocalUnixOutputClient) ReadMetadata(path string) (*MetadataStruct, erro
ContentType: mime.TypeByExtension("." + nodeExt),
FirstCreated: creationTime,
LastModified: fileInfo.ModTime(),
- Size: fileInfo.Size(),
- Misc: map[string]string{},
+ Misc: misc,
}, nil
}
diff --git a/internal/client/output/output_client_interface.go b/internal/client/output/output_client_interface.go
index c74851d..437895c 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(path string) (*MetadataStruct, error)
+ ReadMetadata(string) (*MetadataStruct, error)
IsMissing(path string) bool
}
@@ -22,7 +22,6 @@ 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 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)
-}
generated by cgitext v1.3.1+17 (git 2.54.0) at 2026-10-03 15:32:28 +0000