1 files changed, 39 insertions, 21 deletions

diff --git a/internal/client/output/b2.go b/internal/client/output/b2.go
index 3c8b53c..0616368 100644
--- a/internal/client/output/b2.go
+++ b/internal/client/output/b2.go
@@ -2,11 +2,14 @@ package output
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
+	"log/slog"
 
 	"github.com/Backblaze/blazer/b2"
 	"github.com/SayaAndy/saya-today-thumbnail-generator/config"
+	"github.com/SayaAndy/saya-today-thumbnail-generator/internal/client/input"
 )
 
 var _ OutputClient = (*B2OutputClient)(nil)
@@ -17,7 +20,7 @@ type B2OutputClient struct {
 	b2cl   *b2.Client
 }
 
-func NewB2OutputClient(cfg *config.OutputConfig) (*B2OutputClient, error) {
+func NewB2OutputClient(cfg *config.OutputConfig) (OutputClient, error) {
 	if cfg.Storage.Type != "b2" {
 		return nil, fmt.Errorf("invalid storage type for B2OutputClient")
 	}
@@ -36,16 +39,20 @@ func NewB2OutputClient(cfg *config.OutputConfig) (*B2OutputClient, error) {
 	return &B2OutputClient{b2cl: b2cl, bucket: bucket, prefix: b2cfg.Prefix}, nil
 }
 
-func (c *B2OutputClient) GetWriter(path string) (io.Writer, error) {
+func (c *B2OutputClient) GetWriter(path string, inputMetadata *input.MetadataStruct, outputContentType string) (io.WriteCloser, error) {
 	obj := c.bucket.Object(c.prefix + path)
 	if obj == nil {
 		return nil, fmt.Errorf("failed to reference object in B2 bucket")
 	}
 
-	return obj.NewWriter(context.Background()), nil
+	attrs := &b2.Attrs{Info: make(map[string]string)}
+	attrs.Info["sha1-original"] = inputMetadata.Hash
+	attrs.ContentType = outputContentType
+
+	return obj.NewWriter(context.Background(), b2.WithAttrsOption(attrs)), nil
 }
 
-func (c *B2OutputClient) ReadMetadata(path string) (map[string]string, error) {
+func (c *B2OutputClient) ReadMetadata(path string) (*MetadataStruct, error) {
 	obj := c.bucket.Object(c.prefix + path)
 	if obj == nil {
 		return nil, fmt.Errorf("failed to reference object in B2 bucket")
@@ -56,40 +63,51 @@ func (c *B2OutputClient) ReadMetadata(path string) (map[string]string, error) {
 		return nil, fmt.Errorf("get attributes for object: %w", err)
 	}
 
-	metadata := attrs.Info
-	metadata["Name"] = attrs.Name
-	metadata["Size"] = fmt.Sprintf("%d", attrs.Size)
-	metadata["ContentType"] = attrs.ContentType
-	metadata["LastModified"] = attrs.LastModified.Format("2006-01-02T15:04:05Z")
-	metadata["SHA1"] = attrs.SHA1
-	metadata["UploadTimestamp"] = attrs.UploadTimestamp.Format("2006-01-02T15:04:05Z")
+	metadata := MetadataStruct{
+		Name:         attrs.Name,
+		StorageType:  "b2",
+		Hash:         attrs.SHA1,
+		HashOriginal: attrs.Info["sha1-original"],
+		ContentType:  attrs.ContentType,
+		FirstCreated: attrs.UploadTimestamp,
+		LastModified: attrs.LastModified,
+		Misc:         attrs.Info,
+		Size:         attrs.Size,
+	}
 
 	switch attrs.Status {
 	case b2.Uploaded:
-		metadata["Status"] = "Uploaded"
+		metadata.Misc["b2-status"] = "Uploaded"
 	case b2.Folder:
-		metadata["Status"] = "Folder"
+		metadata.Misc["b2-status"] = "Folder"
 	case b2.Hider:
-		metadata["Status"] = "Hider"
+		metadata.Misc["b2-status"] = "Hider"
 	case b2.Started:
-		metadata["Status"] = "Started"
+		metadata.Misc["b2-status"] = "Started"
 	default:
-		metadata["Status"] = "Unknown"
+		metadata.Misc["b2-status"] = "Unknown"
 	}
 
-	return metadata, nil
+	return &metadata, nil
 }
 
-func (c *B2OutputClient) IsMissing(path string) (bool, error) {
+func (c *B2OutputClient) IsMissing(path string) bool {
 	obj := c.bucket.Object(c.prefix + path)
 	if obj == nil {
-		return false, fmt.Errorf("failed to reference object in B2 bucket")
+		return true
 	}
 
 	attrs, err := obj.Attrs(context.Background())
 	if err != nil {
-		return true, fmt.Errorf("get attributes for object: %w", err)
+		return true
+	}
+
+	attrsJson, _ := json.Marshal(attrs)
+	slog.Debug("got object attrs", slog.String("path", path), slog.String("attrs", string(attrsJson)))
+
+	if attrs.Size == 0 {
+		return true
 	}
 
-	return attrs.Status == b2.Hider, nil
+	return attrs.Status == b2.Hider
 }