chore(storage): cleanup

Author: neurosnap

pkg/apps/pgs/cli.go

@@ -48,7 +48,7 @@ type Cmd struct {
 	User    *db.User
 	Session shared.CmdSession
 	Log     *slog.Logger
-	Store   storage.ObjectStorage
+	Store   storage.StorageServe
 	Dbpool  pgsdb.PgsDB
 	Write   bool
 	Width   int

pkg/apps/pgs/gen_dir_listing.go

@@ -92,7 +92,7 @@ func toDisplayEntries(entries []os.FileInfo) []dirEntryDisplay {
 	return displayEntries
 }
 
-func shouldGenerateListing(st storage.ObjectStorage, bucket storage.Bucket, projectDir string, path string) bool {
+func shouldGenerateListing(st storage.StorageServe, bucket storage.Bucket, projectDir string, path string) bool {
 	dirPath := projectDir + path
 	if path == "/" {
 		dirPath = projectDir + "/"

pkg/storage/fs.go

@@ -43,8 +43,8 @@ type StorageFS struct {
 	Logger *slog.Logger
 }
 
-var _ ObjectStorage = &StorageFS{}
-var _ ObjectStorage = (*StorageFS)(nil)
+var _ StorageServe = &StorageFS{}
+var _ StorageServe = (*StorageFS)(nil)
 
 func NewStorageFS(logger *slog.Logger, dir string) (*StorageFS, error) {
 	return &StorageFS{Logger: logger, Dir: dir}, nil

pkg/storage/handler.go

@@ -39,7 +39,7 @@ type FileData struct {
 
 type Config struct {
 	Logger     *slog.Logger
-	Storage    ObjectStorage
+	Storage    StorageServe
 	AssetNames AssetNames
 }
 

pkg/storage/memory.go

@@ -19,8 +19,8 @@ type StorageMemory struct {
 	mu      sync.RWMutex
 }
 
-var _ ObjectStorage = &StorageMemory{}
-var _ ObjectStorage = (*StorageMemory)(nil)
+var _ StorageServe = &StorageMemory{}
+var _ StorageServe = (*StorageMemory)(nil)
 
 func NewStorageMemory(st map[string]map[string]string) (*StorageMemory, error) {
 	return &StorageMemory{

pkg/storage/storage.go

@@ -15,27 +15,30 @@ type Bucket struct {
 	Root string
 }
 
-type ObjectStorage interface {
+type ObjectInfo struct {
+	Size         int64
+	LastModified time.Time
+	ETag         string
+	Metadata     http.Header
+}
+
+type BucketStorage interface {
 	GetBucket(name string) (Bucket, error)
 	GetBucketQuota(bucket Bucket) (uint64, error)
 	UpsertBucket(name string) (Bucket, error)
 	ListBuckets() ([]string, error)
 	DeleteBucket(bucket Bucket) error
+}
 
+type ObjectStorage interface {
 	GetObject(bucket Bucket, fpath string) (utils.ReadAndReaderAtCloser, *ObjectInfo, error)
 	PutObject(bucket Bucket, fpath string, contents io.Reader, entry *utils.FileEntry) (string, int64, error)
 	DeleteObject(bucket Bucket, fpath string) error
 	ListObjects(bucket Bucket, dir string, recursive bool) ([]os.FileInfo, error)
 }
 
-type ObjectInfo struct {
-	Size         int64
-	LastModified time.Time
-	ETag         string
-	Metadata     http.Header
-}
-
 type StorageServe interface {
+	BucketStorage
 	ObjectStorage
 	ServeObject(r *http.Request, bucket Bucket, fpath string, opts *ImgProcessOpts) (io.ReadCloser, *ObjectInfo, error)
 }