chore(storage): cleanup

Commit `c0208b3`

Eric Bower · 2026-03-28 21:28:51 -0400 EDT

parent d51ab87

chore(storage): cleanup

6 files changed, +18, -15

M pkg/apps/pgs/cli.go

M pkg/apps/pgs/gen_dir_listing.go

M pkg/storage/fs.go

M pkg/storage/handler.go

M pkg/storage/memory.go

M pkg/storage/storage.go

M pkg/apps/pgs/cli.go

+1, -1

......@@ -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

M pkg/apps/pgs/gen_dir_listing.go

+1, -1

......@@ -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 + "/"

M pkg/storage/fs.go

+2, -2

......@@ -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

M pkg/storage/handler.go

+1, -1

......@@ -39,7 +39,7 @@ type FileData struct {

type Config struct {
	Logger     *slog.Logger
	Storage    ObjectStorage
	Storage    StorageServe
	AssetNames AssetNames
}

M pkg/storage/memory.go

+2, -2

......@@ -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{

M pkg/storage/storage.go

+11, -8

......@@ -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)
}

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

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

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

...	...		@@ -39,7 +39,7 @@ type FileData struct {
39	39
40	40		type Config struct {
41	41		Logger *slog.Logger
42		-	Storage ObjectStorage
	42	+	Storage StorageServe
43	43		AssetNames AssetNames
44	44		}
45	45

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

...	...		@@ -15,27 +15,30 @@ type Bucket struct {
15	15		Root string
16	16		}
17	17
18		-	type ObjectStorage interface {
	18	+	type ObjectInfo struct {
	19	+	Size int64
	20	+	LastModified time.Time
	21	+	ETag string
	22	+	Metadata http.Header
	23	+	}
	24	+
	25	+	type BucketStorage interface {
19	26		GetBucket(name string) (Bucket, error)
20	27		GetBucketQuota(bucket Bucket) (uint64, error)
21	28		UpsertBucket(name string) (Bucket, error)
22	29		ListBuckets() ([]string, error)
23	30		DeleteBucket(bucket Bucket) error
	31	+	}
24	32
	33	+	type ObjectStorage interface {
25	34		GetObject(bucket Bucket, fpath string) (utils.ReadAndReaderAtCloser, *ObjectInfo, error)
26	35		PutObject(bucket Bucket, fpath string, contents io.Reader, entry *utils.FileEntry) (string, int64, error)
27	36		DeleteObject(bucket Bucket, fpath string) error
28	37		ListObjects(bucket Bucket, dir string, recursive bool) ([]os.FileInfo, error)
29	38		}
30	39
31		-	type ObjectInfo struct {
32		-	Size int64
33		-	LastModified time.Time
34		-	ETag string
35		-	Metadata http.Header
36		-	}
37		-
38	40		type StorageServe interface {
	41	+	BucketStorage
39	42		ObjectStorage
40	43		ServeObject(r http.Request, bucket Bucket, fpath string, opts ImgProcessOpts) (io.ReadCloser, *ObjectInfo, error)
41	44		}

Commit c0208b3

Commit `c0208b3`