1 files changed, 23 insertions, 29 deletions

diff --git a/internal/client/input/b2.go b/internal/client/input/b2.go
index fe94333..67fb14e 100644
--- a/internal/client/input/b2.go
+++ b/internal/client/input/b2.go
@@ -16,12 +16,11 @@ var _ InputClient = (*B2InputClient)(nil)
 type B2InputClient struct {
 	prefix          string
 	bucket          *b2.Bucket
-	bucketName      string
 	b2cl            *b2.Client
 	knownExtensions []string
 }
 
-func NewB2InputClient(cfg *config.InputConfig) (InputClient, error) {
+func NewB2InputClient(cfg *config.InputConfig) (*B2InputClient, error) {
 	if cfg.Storage.Type != "b2" {
 		return nil, fmt.Errorf("invalid storage type for B2InputClient")
 	}
@@ -37,7 +36,7 @@ func NewB2InputClient(cfg *config.InputConfig) (InputClient, error) {
 		return nil, err
 	}
 
-	return &B2InputClient{b2cl: b2cl, bucket: bucket, bucketName: b2cfg.BucketName, prefix: b2cfg.Prefix, knownExtensions: cfg.KnownExtensions}, nil
+	return &B2InputClient{b2cl: b2cl, bucket: bucket, prefix: b2cfg.Prefix, knownExtensions: cfg.KnownExtensions}, nil
 }
 
 func (c *B2InputClient) Scan() ([]string, error) {
@@ -73,7 +72,7 @@ func (c *B2InputClient) Scan() ([]string, error) {
 			}
 		}
 
-		filePaths = append(filePaths, strings.TrimPrefix(name, c.prefix))
+		filePaths = append(filePaths, name)
 	}
 
 	if err := iter.Err(); err != nil {
@@ -83,8 +82,8 @@ func (c *B2InputClient) Scan() ([]string, error) {
 	return filePaths, nil
 }
 
-func (c *B2InputClient) ReadMetadata(path string) (*MetadataStruct, error) {
-	obj := c.bucket.Object(c.prefix + path)
+func (c *B2InputClient) ReadMetadata(path string) (map[string]string, error) {
+	obj := c.bucket.Object(path)
 	if obj == nil {
 		return nil, fmt.Errorf("object not found in B2 bucket")
 	}
@@ -94,42 +93,37 @@ func (c *B2InputClient) 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,
-		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
-}
-
-func (c *B2InputClient) ID(path string) string {
-	return fmt.Sprintf("b2://%s/%s%s", c.bucketName, c.prefix, path)
+	return metadata, nil
 }
 
-func (c *B2InputClient) GetReader(path string) (io.ReadCloser, error) {
-	obj := c.bucket.Object(c.prefix + path)
+func (c *B2InputClient) GetReader(path string) (io.Reader, error) {
+	obj := c.bucket.Object(path)
 	if obj == nil {
 		return nil, fmt.Errorf("failed to reference object in B2 bucket")
 	}
 
-	return obj.NewReader(context.Background()), nil
+	reader := obj.NewReader(context.Background())
+
+	return reader, nil
 }