tabshift/pocketbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjust code to new repository

Browse Source
This commit is contained in:
T. R. Bernstein
2025-10-09 21:02:10 +02:00
committed by T. R. Bernstein
parent 0a74d2f25d
commit 4128071070
335 changed files with 814 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/filesystem/file.go
+2 -2
View File
@@ -14,8 +14,8 @@ import (
"strings"
"github.com/gabriel-vasile/mimetype"
"github.com/pocketbase/pocketbase/tools/inflector"
"github.com/pocketbase/pocketbase/tools/security"
"github.com/tabshift-gh/pocketbase/tools/inflector"
"github.com/tabshift-gh/pocketbase/tools/security"
)
// FileReader defines an interface for a file resource reader.
tools/filesystem/file_test.go
+2 -2
View File
@@ -12,8 +12,8 @@ import (
"strings"
"testing"
"github.com/pocketbase/pocketbase/tests"
"github.com/pocketbase/pocketbase/tools/filesystem"
"github.com/tabshift-gh/pocketbase/tests"
"github.com/tabshift-gh/pocketbase/tools/filesystem"
)
func TestFileAsMap(t *testing.T) {
tools/filesystem/filesystem.go
+12 -6
View File
@@ -18,12 +18,12 @@ import (
"github.com/disintegration/imaging"
"github.com/fatih/color"
"github.com/gabriel-vasile/mimetype"
"github.com/pocketbase/pocketbase/tools/filesystem/blob"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/fileblob"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/pocketbase/pocketbase/tools/list"
"github.com/pocketbase/pocketbase/tools/routine"
"github.com/tabshift-gh/pocketbase/tools/filesystem/blob"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/fileblob"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/tabshift-gh/pocketbase/tools/list"
"github.com/tabshift-gh/pocketbase/tools/routine"
// explicit webp decoder because disintegration/imaging does not support webp
_ "golang.org/x/image/webp"
@@ -412,6 +412,7 @@ var inlineServeContentTypes = []string{
// manualExtensionContentTypes is a map of file extensions to content types.
var manualExtensionContentTypes = map[string]string{
<<<<<<< HEAD
// https://github.com/whatwg/mimesniff/issues/7
".svg": "image/svg+xml",
@@ -420,6 +421,11 @@ var manualExtensionContentTypes = map[string]string{
// https://github.com/pocketbase/pocketbase/issues/6597
".js": "text/javascript",
=======
".svg": "image/svg+xml", // (see https://github.com/whatwg/mimesniff/issues/7)
".css": "text/css", // (see https://github.com/gabriel-vasile/mimetype/pull/113)
".js": "text/javascript", // (see https://github.com/tabshift-gh/pocketbase/issues/6597)
>>>>>>> 795cd833 (adjust code to new repository)
".mjs": "text/javascript",
// https://github.com/pocketbase/pocketbase/discussions/7467
tools/filesystem/filesystem_test.go
+1 -1
View File
@@ -16,7 +16,7 @@ import (
"testing"
"github.com/gabriel-vasile/mimetype"
"github.com/pocketbase/pocketbase/tools/filesystem"
"github.com/tabshift-gh/pocketbase/tools/filesystem"
)
func TestFileSystemExists(t *testing.T) {
tools/filesystem/internal/fileblob/fileblob.go
+1 -1
View File
@@ -50,7 +50,7 @@ import (
"strings"
"time"
"github.com/pocketbase/pocketbase/tools/filesystem/blob"
"github.com/tabshift-gh/pocketbase/tools/filesystem/blob"
)
const defaultPageSize = 1000
tools/filesystem/internal/s3blob/s3/copy_object_test.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"strings"
"testing"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
)
func TestS3CopyObject(t *testing.T) {
tools/filesystem/internal/s3blob/s3/delete_object_test.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"net/http"
"testing"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
)
func TestS3DeleteObject(t *testing.T) {
tools/filesystem/internal/s3blob/s3/error_test.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"encoding/xml"
"testing"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3"
)
func TestResponseErrorSerialization(t *testing.T) {
tools/filesystem/internal/s3blob/s3/get_object_test.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"strings"
"testing"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
)
func TestS3GetObject(t *testing.T) {
tools/filesystem/internal/s3blob/s3/head_object_test.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"net/http"
"testing"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
)
func TestS3HeadObject(t *testing.T) {
tools/filesystem/internal/s3blob/s3/list_objects_test.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"strings"
"testing"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
)
func TestS3ListParamsEncode(t *testing.T) {
tools/filesystem/internal/s3blob/s3/s3.go
+2 -2
View File
@@ -5,7 +5,7 @@
// such as objects list, get, copy, delete and upload.
//
// For more details why we don't use the official aws-sdk-go-v2, you could check
// https://github.com/pocketbase/pocketbase/discussions/6562.
// https://github.com/tabshift-gh/pocketbase/discussions/6562.
//
// Example:
//
@@ -66,7 +66,7 @@ type S3 struct {
// Note that the path will be URL escaped based on the AWS [UriEncode rules]
// for broader compatibility with some providers that expect the same
// path format as the one in the canonical signed header
// (see also https://github.com/pocketbase/pocketbase/issues/7153).
// (see also https://github.com/tabshift-gh/pocketbase/issues/7153).
//
// [UriEncode rules]: https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_sigv-create-signed-request.html
func (s3 *S3) URL(path string) string {
tools/filesystem/internal/s3blob/s3/s3_test.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"strings"
"testing"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
)
func TestS3URL(t *testing.T) {
tools/filesystem/internal/s3blob/s3/uploader_test.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"strings"
"testing"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
)
func TestUploaderRequiredFields(t *testing.T) {
tools/filesystem/internal/s3blob/s3blob.go
+3 -3
View File
@@ -40,9 +40,9 @@ import (
"strconv"
"strings"
"github.com/pocketbase/pocketbase/tools/filesystem/blob"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/pocketbase/pocketbase/tools/routine"
"github.com/tabshift-gh/pocketbase/tools/filesystem/blob"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/tabshift-gh/pocketbase/tools/routine"
)
const defaultPageSize = 1000
tools/filesystem/internal/s3blob/s3blob_test.go
+4 -4
View File
@@ -10,10 +10,10 @@ import (
"strings"
"testing"
"github.com/pocketbase/pocketbase/tools/filesystem/blob"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/pocketbase/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
"github.com/tabshift-gh/pocketbase/tools/filesystem/blob"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3"
"github.com/tabshift-gh/pocketbase/tools/filesystem/internal/s3blob/s3/tests"
)
func TestNew(t *testing.T) {