1 files changed, 21 insertions, 39 deletions

diff --git a/internal/client/output/b2.go b/internal/client/output/b2.go
index 0616368..3c8b53c 100644
--- a/internal/client/output/b2.go
+++ b/internal/client/output/b2.go
@@ -2,14 +2,11 @@ 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)
@@ -20,7 +17,7 @@ type B2OutputClient struct {
 	b2cl   *b2.Client
 }
 
-func NewB2OutputClient(cfg *config.OutputConfig) (OutputClient, error) {
+func NewB2OutputClient(cfg *config.OutputConfig) (*B2OutputClient, error) {
 	if cfg.Storage.Type != "b2" {
 		return nil, fmt.Errorf("invalid storage type for B2OutputClient")
 	}
@@ -39,20 +36,16 @@ func NewB2OutputClient(cfg *config.OutputConfig) (OutputClient, error) {
 	return &B2OutputClient{b2cl: b2cl, bucket: bucket, prefix: b2cfg.Prefix}, nil
 }
 
-func (c *B2OutputClient) GetWriter(path string, inputMetadata *input.MetadataStruct, outputContentType string) (io.WriteCloser, error) {
+func (c *B2OutputClient) GetWriter(path string) (io.Writer, error) {
 	obj := c.bucket.Object(c.prefix + path)
 	if obj == nil {
 		return nil, fmt.Errorf("failed to reference object in B2 bucket")
 	}
 
-	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
+	return obj.NewWriter(context.Background()), nil
 }
 
-func (c *B2OutputClient) ReadMetadata(path string) (*MetadataStruct, error) {
+func (c *B2OutputClient) ReadMetadata(path string) (map[string]string, error) {
 	obj := c.bucket.Object(c.prefix + path)
 	if obj == nil {
 		return nil, fmt.Errorf("failed to reference object in B2 bucket")
@@ -63,51 +56,40 @@ func (c *B2OutputClient) ReadMetadata(path string) (*MetadataStruct, error) {
 		return nil, fmt.Errorf("get attributes for object: %w", err)
 	}
 
-	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,
-	}
+	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")
 
 	switch attrs.Status {
 	case b2.Uploaded:
-		metadata.Misc["b2-status"] = "Uploaded"
+		metadata["Status"] = "Uploaded"
 	case b2.Folder:
-		metadata.Misc["b2-status"] = "Folder"
+		metadata["Status"] = "Folder"
 	case b2.Hider:
-		metadata.Misc["b2-status"] = "Hider"
+		metadata["Status"] = "Hider"
 	case b2.Started:
-		metadata.Misc["b2-status"] = "Started"
+		metadata["Status"] = "Started"
 	default:
-		metadata.Misc["b2-status"] = "Unknown"
+		metadata["Status"] = "Unknown"
 	}
 
-	return &metadata, nil
+	return metadata, nil
 }
 
-func (c *B2OutputClient) IsMissing(path string) bool {
+func (c *B2OutputClient) IsMissing(path string) (bool, error) {
 	obj := c.bucket.Object(c.prefix + path)
 	if obj == nil {
-		return true
+		return false, fmt.Errorf("failed to reference object in B2 bucket")
 	}
 
 	attrs, err := obj.Attrs(context.Background())
 	if err != nil {
-		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 true, fmt.Errorf("get attributes for object: %w", err)
 	}
 
-	return attrs.Status == b2.Hider
+	return attrs.Status == b2.Hider, nil
 }