refactor: move shared/storage to storage

Commit `d51ab87`

Eric Bower · 2026-03-28 21:06:26 -0400 EDT

parent b229935

refactor: move shared/storage to storage

31 files changed, +19, -21

M .gitignore

M cmd/pgs/ssh/main.go

M cmd/pgs/standalone/main.go

M cmd/pgs/web/main.go

M pkg/apps/pgs/access_test.go

M pkg/apps/pgs/cli.go

M pkg/apps/pgs/config.go

M pkg/apps/pgs/cron_bin.go

M pkg/apps/pgs/gen_dir_listing.go

M pkg/apps/pgs/gen_dir_listing_test.go

M pkg/apps/pgs/souin_truncation_test.go

M pkg/apps/pgs/ssh_test.go

M pkg/apps/pgs/uploader.go

M pkg/apps/pgs/web.go

M pkg/apps/pgs/web_asset_handler.go

M pkg/apps/pgs/web_test.go

M pkg/apps/prose/api.go

M pkg/apps/prose/ssh.go

M pkg/filehandlers/imgs/handler.go

M pkg/shared/router/router.go

R pkg/storage/asset.go

R pkg/storage/base.go

R pkg/storage/fs.go

R pkg/storage/fs_test.go

R pkg/storage/handler.go

R pkg/storage/memory.go

R pkg/storage/proxy.go

R pkg/storage/proxy_test.go

R pkg/storage/ratio.go

R pkg/storage/reader.go

R pkg/storage/storage.go

M .gitignore

+0, -2

...	...		@@ -14,7 +14,5 @@ __debug_bin
14	14		.bin
15	15		/public/
16	16		.aider*
17		-	ssh
18		-	web
19	17		.beads/
20	18		.vg/

M cmd/pgs/ssh/main.go

+1, -1

......@@ -7,7 +7,7 @@ import (
	"github.com/picosh/pico/pkg/apps/pgs"
	pgsdb "github.com/picosh/pico/pkg/apps/pgs/db"
	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
)

func main() {

M cmd/pgs/standalone/main.go

+1, -1

......@@ -7,7 +7,7 @@ import (
	"github.com/picosh/pico/pkg/apps/pgs"
	pgsdb "github.com/picosh/pico/pkg/apps/pgs/db"
	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
	"golang.org/x/crypto/ssh"
)

M cmd/pgs/web/main.go

+1, -1

......@@ -7,7 +7,7 @@ import (
	"github.com/picosh/pico/pkg/apps/pgs"
	pgsdb "github.com/picosh/pico/pkg/apps/pgs/db"
	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
)

func main() {

M pkg/apps/pgs/access_test.go

+1, -1

......@@ -8,7 +8,7 @@ import (
	"testing"

	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
)

func TestPrivateProjectDeniesWebAccess(t *testing.T) {

M pkg/apps/pgs/cli.go

+1, -1

......@@ -14,7 +14,7 @@ import (
	pgsdb "github.com/picosh/pico/pkg/apps/pgs/db"
	"github.com/picosh/pico/pkg/db"
	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
)

func NewTabWriter(out io.Writer) *tabwriter.Writer {

M pkg/apps/pgs/config.go

+1, -1

......@@ -8,7 +8,7 @@ import (

	pgsdb "github.com/picosh/pico/pkg/apps/pgs/db"
	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
)

type PgsConfig struct {

M pkg/apps/pgs/cron_bin.go

+1, -1

......@@ -6,7 +6,7 @@ import (

	pgsdb "github.com/picosh/pico/pkg/apps/pgs/db"
	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
)

const binRetentionDays = 14

M pkg/apps/pgs/gen_dir_listing.go

+1, -1

......@@ -9,7 +9,7 @@ import (
	"sort"
	"strings"

	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
)

//go:embed html/*

M pkg/apps/pgs/gen_dir_listing_test.go

+1, -1

......@@ -7,7 +7,7 @@ import (
	"time"

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

func TestGenerateDirectoryHTML(t *testing.T) {

M pkg/apps/pgs/souin_truncation_test.go

+1, -1

......@@ -9,7 +9,7 @@ import (
	"testing"

	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
)

// TestLargeFileNotTruncatedOnCacheHit reproduces the Souin truncation bug.

M pkg/apps/pgs/ssh_test.go

+1, -1

......@@ -20,7 +20,7 @@ import (
	"github.com/picosh/pico/pkg/db"
	"github.com/picosh/pico/pkg/pssh"
	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
	"github.com/pkg/sftp"
	"github.com/prometheus/client_golang/prometheus"
	"golang.org/x/crypto/ssh"

M pkg/apps/pgs/uploader.go

+1, -1

......@@ -20,7 +20,7 @@ import (
	"github.com/picosh/pico/pkg/pssh"
	sendutils "github.com/picosh/pico/pkg/send/utils"
	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
	ignore "github.com/sabhiram/go-gitignore"
)

M pkg/apps/pgs/web.go

+1, -1

......@@ -26,7 +26,7 @@ import (
	"github.com/picosh/pico/pkg/db"
	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/router"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
	"github.com/prometheus/client_golang/prometheus/promhttp"
	"google.golang.org/protobuf/proto"
)

M pkg/apps/pgs/web_asset_handler.go

+1, -1

......@@ -14,7 +14,7 @@ import (
	"net/http/httputil"
	_ "net/http/pprof"

	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
)

type ApiAssetHandler struct {

M pkg/apps/pgs/web_test.go

+1, -1

......@@ -12,7 +12,7 @@ import (

	pgsdb "github.com/picosh/pico/pkg/apps/pgs/db"
	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
)

type ApiExample struct {

M pkg/apps/prose/api.go

+1, -1

......@@ -20,7 +20,7 @@ import (
	"github.com/picosh/pico/pkg/db/postgres"
	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/router"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
	"github.com/prometheus/client_golang/prometheus/promhttp"
)

M pkg/apps/prose/ssh.go

+1, -1

......@@ -18,7 +18,7 @@ import (
	"github.com/picosh/pico/pkg/send/protocols/scp"
	"github.com/picosh/pico/pkg/send/protocols/sftp"
	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
)

func StartSshServer() {

M pkg/filehandlers/imgs/handler.go

+1, -1

......@@ -16,7 +16,7 @@ import (
	"github.com/picosh/pico/pkg/pssh"
	sendutils "github.com/picosh/pico/pkg/send/utils"
	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
)

var Space = "imgs"

M pkg/shared/router/router.go

+1, -1

......@@ -14,7 +14,7 @@ import (
	"github.com/picosh/pico/pkg/db"
	"github.com/picosh/pico/pkg/pssh"
	"github.com/picosh/pico/pkg/shared"
	"github.com/picosh/pico/pkg/shared/storage"
	"github.com/picosh/pico/pkg/storage"
)

type Route struct {

R pkg/shared/storage/asset.go => pkg/storage/asset.go

+0, -0

R pkg/shared/storage/base.go => pkg/storage/base.go

+0, -0

R pkg/shared/storage/fs.go => pkg/storage/fs.go

+0, -0

R pkg/shared/storage/fs_test.go => pkg/storage/fs_test.go

+0, -0

R pkg/shared/storage/handler.go => pkg/storage/handler.go

+0, -0

R pkg/shared/storage/memory.go => pkg/storage/memory.go

+0, -0

R pkg/shared/storage/proxy.go => pkg/storage/proxy.go

+0, -0

R pkg/shared/storage/proxy_test.go => pkg/storage/proxy_test.go

+0, -0

R pkg/shared/storage/ratio.go => pkg/storage/ratio.go

+0, -0

R pkg/shared/storage/reader.go => pkg/storage/reader.go

+0, -0

R pkg/shared/storage/storage.go => pkg/storage/storage.go

+0, -0

...	...		@@ -7,7 +7,7 @@ import (
7	7		"github.com/picosh/pico/pkg/apps/pgs"
8	8		pgsdb "github.com/picosh/pico/pkg/apps/pgs/db"
9	9		"github.com/picosh/pico/pkg/shared"
10		-	"github.com/picosh/pico/pkg/shared/storage"
	10	+	"github.com/picosh/pico/pkg/storage"
11	11		)
12	12
13	13		func main() {

...	...		@@ -8,7 +8,7 @@ import (
8	8		"testing"
9	9
10	10		"github.com/picosh/pico/pkg/shared"
11		-	"github.com/picosh/pico/pkg/shared/storage"
	11	+	"github.com/picosh/pico/pkg/storage"
12	12		)
13	13
14	14		func TestPrivateProjectDeniesWebAccess(t *testing.T) {

...	...		@@ -14,7 +14,7 @@ import (
14	14		pgsdb "github.com/picosh/pico/pkg/apps/pgs/db"
15	15		"github.com/picosh/pico/pkg/db"
16	16		"github.com/picosh/pico/pkg/shared"
17		-	"github.com/picosh/pico/pkg/shared/storage"
	17	+	"github.com/picosh/pico/pkg/storage"
18	18		)
19	19
20	20		func NewTabWriter(out io.Writer) *tabwriter.Writer {

...	...		@@ -6,7 +6,7 @@ import (
6	6
7	7		pgsdb "github.com/picosh/pico/pkg/apps/pgs/db"
8	8		"github.com/picosh/pico/pkg/shared"
9		-	"github.com/picosh/pico/pkg/shared/storage"
	9	+	"github.com/picosh/pico/pkg/storage"
10	10		)
11	11
12	12		const binRetentionDays = 14

...	...		@@ -9,7 +9,7 @@ import (
9	9		"sort"
10	10		"strings"
11	11
12		-	"github.com/picosh/pico/pkg/shared/storage"
	12	+	"github.com/picosh/pico/pkg/storage"
13	13		)
14	14
15	15		//go:embed html/*

...	...		@@ -7,7 +7,7 @@ import (
7	7		"time"
8	8
9	9		"github.com/picosh/pico/pkg/send/utils"
10		-	"github.com/picosh/pico/pkg/shared/storage"
	10	+	"github.com/picosh/pico/pkg/storage"
11	11		)
12	12
13	13		func TestGenerateDirectoryHTML(t *testing.T) {

...	...		@@ -20,7 +20,7 @@ import (
20	20		"github.com/picosh/pico/pkg/db"
21	21		"github.com/picosh/pico/pkg/pssh"
22	22		"github.com/picosh/pico/pkg/shared"
23		-	"github.com/picosh/pico/pkg/shared/storage"
	23	+	"github.com/picosh/pico/pkg/storage"
24	24		"github.com/pkg/sftp"
25	25		"github.com/prometheus/client_golang/prometheus"
26	26		"golang.org/x/crypto/ssh"

...	...		@@ -20,7 +20,7 @@ import (
20	20		"github.com/picosh/pico/pkg/pssh"
21	21		sendutils "github.com/picosh/pico/pkg/send/utils"
22	22		"github.com/picosh/pico/pkg/shared"
23		-	"github.com/picosh/pico/pkg/shared/storage"
	23	+	"github.com/picosh/pico/pkg/storage"
24	24		ignore "github.com/sabhiram/go-gitignore"
25	25		)
26	26

...	...		@@ -26,7 +26,7 @@ import (
26	26		"github.com/picosh/pico/pkg/db"
27	27		"github.com/picosh/pico/pkg/shared"
28	28		"github.com/picosh/pico/pkg/shared/router"
29		-	"github.com/picosh/pico/pkg/shared/storage"
	29	+	"github.com/picosh/pico/pkg/storage"
30	30		"github.com/prometheus/client_golang/prometheus/promhttp"
31	31		"google.golang.org/protobuf/proto"
32	32		)

...	...		@@ -14,7 +14,7 @@ import (
14	14		"net/http/httputil"
15	15		_ "net/http/pprof"
16	16
17		-	"github.com/picosh/pico/pkg/shared/storage"
	17	+	"github.com/picosh/pico/pkg/storage"
18	18		)
19	19
20	20		type ApiAssetHandler struct {

...	...		@@ -12,7 +12,7 @@ import (
12	12
13	13		pgsdb "github.com/picosh/pico/pkg/apps/pgs/db"
14	14		"github.com/picosh/pico/pkg/shared"
15		-	"github.com/picosh/pico/pkg/shared/storage"
	15	+	"github.com/picosh/pico/pkg/storage"
16	16		)
17	17
18	18		type ApiExample struct {

...	...		@@ -20,7 +20,7 @@ import (
20	20		"github.com/picosh/pico/pkg/db/postgres"
21	21		"github.com/picosh/pico/pkg/shared"
22	22		"github.com/picosh/pico/pkg/shared/router"
23		-	"github.com/picosh/pico/pkg/shared/storage"
	23	+	"github.com/picosh/pico/pkg/storage"
24	24		"github.com/prometheus/client_golang/prometheus/promhttp"
25	25		)
26	26

...	...		@@ -18,7 +18,7 @@ import (
18	18		"github.com/picosh/pico/pkg/send/protocols/scp"
19	19		"github.com/picosh/pico/pkg/send/protocols/sftp"
20	20		"github.com/picosh/pico/pkg/shared"
21		-	"github.com/picosh/pico/pkg/shared/storage"
	21	+	"github.com/picosh/pico/pkg/storage"
22	22		)
23	23
24	24		func StartSshServer() {

...	...		@@ -16,7 +16,7 @@ import (
16	16		"github.com/picosh/pico/pkg/pssh"
17	17		sendutils "github.com/picosh/pico/pkg/send/utils"
18	18		"github.com/picosh/pico/pkg/shared"
19		-	"github.com/picosh/pico/pkg/shared/storage"
	19	+	"github.com/picosh/pico/pkg/storage"
20	20		)
21	21
22	22		var Space = "imgs"

Commit d51ab87

Commit `d51ab87`