feat: allow multiple converters for processing

6 files changed, 9 insertions, 15 deletions

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
 }