pico

chore(pobj.fs): feature parity with minio rss

created pr with 66.1 on 2025-04-18T17:16:07Z · by c8ef7d19

changed pr name to chore(pobj.fs): feature parity with minio on 2025-04-18T17:18:11Z · by c8ef7d19

added 66.2 on 2025-04-21T18:44:44Z · by c8ef7d19


                      1:  a3f9ef2 = 1:  a3f9ef2 chore: rm UserMetadata


                      2:  ccd89b0 = 2:  ccd89b0 refactor(shared): mime type pkg


                      3:  8621e35 = 3:  8621e35 chore(pobj.fs): provide metadata


                      -:  ------- > 4:  831b150 chore(storage.fs): add tests

cmds

checkout latest patchset:

ssh pr.pico.sh print 66 | git am -3

checkout any patchset in a patch request:

ssh pr.pico.sh print 66.[rev] | git am -3

add changes to patch request:

git format-patch main --stdout | ssh pr.pico.sh pr add 66

Patchset `66.2` on 2025-04-21T18:44:44Z · commit 8621e35

chore: rm UserMetadata

Eric Bower 2025-04-18T17:01:42Z

refactor(shared): mime type pkg

Eric Bower 2025-04-18T17:09:48Z

→ chore(pobj.fs): provide metadata

Eric Bower 2025-04-18T17:15:37Z

chore(storage.fs): add tests

Eric Bower 2025-04-21T18:43:56Z

chore(pobj.fs): provide metadata

Eric Bower 2025-04-18T17:15:37Z

fix(pobj.fs): attempt to delete empty folder

Semantic diff summary

0 added, 5 modified, 0 signature changed, 0 removed across 1 analyzed file

pkg/pobj/storage/fs.go

chunk lines 5-11 modified
chunk lines 13-19 modified
method_declaration GetObject modified
function_declaration GetObject modified
function_declaration DeleteObject modified

+8 -1 pkg/pobj/storage/fs.go #

......@@ -5,6 +5,7 @@ import (
	"io"
	"io/fs"
	"log/slog"
	"net/http"
	"os"
	"path"
	"path/filepath"

......@@ -12,6 +13,7 @@ import (
	"time"

	"github.com/picosh/pico/pkg/send/utils"
	"github.com/picosh/pico/pkg/shared/mime"
)

// https://stackoverflow.com/a/32482941

......@@ -96,7 +98,7 @@ func (s *StorageFS) DeleteBucket(bucket Bucket) error {
func (s *StorageFS) GetObject(bucket Bucket, fpath string) (utils.ReadAndReaderAtCloser, *ObjectInfo, error) {
	objInfo := &ObjectInfo{
		LastModified: time.Time{},
		Metadata:     nil,
		Metadata:     make(http.Header),
	}

	dat, err := os.Open(filepath.Join(bucket.Path, fpath))

......@@ -111,6 +113,7 @@ func (s *StorageFS) GetObject(bucket Bucket, fpath string) (utils.ReadAndReaderA

	objInfo.Size = info.Size()
	objInfo.LastModified = info.ModTime()
	objInfo.Metadata.Set("content-type", mime.GetMimeType(fpath))
	return dat, objInfo, nil
}

......@@ -147,6 +150,10 @@ func (s *StorageFS) DeleteObject(bucket Bucket, fpath string) error {
		return err
	}

	// try to remove dir if it is empty
	dir := filepath.Dir(loc)
	_ = os.Remove(dir)

	return nil
}

...	...		@@ -147,6 +150,10 @@ func (s *StorageFS) DeleteObject(bucket Bucket, fpath string) error {
147	150		return err
148	151		}
149	152
	153	+	// try to remove dir if it is empty
	154	+	dir := filepath.Dir(loc)
	155	+	_ = os.Remove(dir)
	156	+
150	157		return nil
151	158		}
152	159

...	...		@@ -5,6 +5,7 @@ import (
5	5		"io"
6	6		"io/fs"
7	7		"log/slog"
	8	+	"net/http"
8	9		"os"
9	10		"path"
10	11		"path/filepath"

...	...		@@ -12,6 +13,7 @@ import (
12	13		"time"
13	14
14	15		"github.com/picosh/pico/pkg/send/utils"
	16	+	"github.com/picosh/pico/pkg/shared/mime"
15	17		)
16	18
17	19		// https://stackoverflow.com/a/32482941

...	...		@@ -96,7 +98,7 @@ func (s *StorageFS) DeleteBucket(bucket Bucket) error {
96	98		func (s StorageFS) GetObject(bucket Bucket, fpath string) (utils.ReadAndReaderAtCloser, ObjectInfo, error) {
97	99		objInfo := &ObjectInfo{
98	100		LastModified: time.Time{},
99		-	Metadata: nil,
	101	+	Metadata: make(http.Header),
100	102		}
101	103
102	104		dat, err := os.Open(filepath.Join(bucket.Path, fpath))

...	...		@@ -111,6 +113,7 @@ func (s *StorageFS) GetObject(bucket Bucket, fpath string) (utils.ReadAndReaderA
111	113
112	114		objInfo.Size = info.Size()
113	115		objInfo.LastModified = info.ModTime()
	116	+	objInfo.Metadata.Set("content-type", mime.GetMimeType(fpath))
114	117		return dat, objInfo, nil
115	118		}
116	119

pico

Patchset 66.2 on 2025-04-21T18:44:44Z · commit 8621e35

Patchset `66.2` on 2025-04-21T18:44:44Z · commit 8621e35