refactor: PutObject only needs io.Reader

picosh · Jun 12, 2024 · 4f5e944 · 4f5e944
1 parent 7b5398c
commit 4f5e944
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/storage/fs.go b/storage/fs.go
@@ -101,7 +101,7 @@ func (s *StorageFS) GetObject(bucket Bucket, fpath string) (utils.ReaderAtCloser
 	return dat, info.Size(), info.ModTime(), nil
 }
 
-func (s *StorageFS) PutObject(bucket Bucket, fpath string, contents utils.ReaderAtCloser, entry *utils.FileEntry) (string, error) {
+func (s *StorageFS) PutObject(bucket Bucket, fpath string, contents io.Reader, entry *utils.FileEntry) (string, error) {
 	loc := filepath.Join(bucket.Path, fpath)
 	err := os.MkdirAll(filepath.Dir(loc), os.ModePerm)
 	if err != nil {

diff --git a/storage/minio.go b/storage/minio.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"io"
 	"net/url"
 	"os"
 	"strconv"
@@ -176,7 +177,7 @@ func (s *StorageMinio) GetObject(bucket Bucket, fpath string) (utils.ReaderAtClo
 	return obj, info.Size, modTime, nil
 }
 
-func (s *StorageMinio) PutObject(bucket Bucket, fpath string, contents utils.ReaderAtCloser, entry *utils.FileEntry) (string, error) {
+func (s *StorageMinio) PutObject(bucket Bucket, fpath string, contents io.Reader, entry *utils.FileEntry) (string, error) {
 	opts := minio.PutObjectOptions{
 		UserMetadata: map[string]string{
 			"Mtime": fmt.Sprint(time.Now().Unix()),

diff --git a/storage/storage.go b/storage/storage.go
@@ -1,6 +1,7 @@
 package storage
 
 import (
+	"io"
 	"os"
 	"time"
 
@@ -21,7 +22,7 @@ type ObjectStorage interface {
 	DeleteBucket(bucket Bucket) error
 
 	GetObject(bucket Bucket, fpath string) (utils.ReaderAtCloser, int64, time.Time, error)
-	PutObject(bucket Bucket, fpath string, contents utils.ReaderAtCloser, entry *utils.FileEntry) (string, error)
+	PutObject(bucket Bucket, fpath string, contents io.Reader, entry *utils.FileEntry) (string, error)
 	DeleteObject(bucket Bucket, fpath string) error
 	ListObjects(bucket Bucket, dir string, recursive bool) ([]os.FileInfo, error)
 }