abstract rest.UploadedFile to allow loading local files

tools/rest/uploaded_file.go

@@ -1,43 +1,18 @@
 package rest
 
 import (
-	"fmt"
-	"mime/multipart"
 	"net/http"
-	"path/filepath"
-	"regexp"
-	"strings"
 
-	"github.com/gabriel-vasile/mimetype"
-	"github.com/pocketbase/pocketbase/tools/inflector"
-	"github.com/pocketbase/pocketbase/tools/security"
+	"github.com/pocketbase/pocketbase/tools/filesystem"
 )
 
 // DefaultMaxMemory defines the default max memory bytes that
 // will be used when parsing a form request body.
 const DefaultMaxMemory = 32 << 20 // 32mb
 
-var extensionInvalidCharsRegex = regexp.MustCompile(`[^\w\.\*\-\+\=\#]+`)
-
-// UploadedFile defines a single multipart uploaded file instance.
-type UploadedFile struct {
-	name   string
-	header *multipart.FileHeader
-}
-
-// Name returns an assigned unique name to the uploaded file.
-func (f *UploadedFile) Name() string {
-	return f.name
-}
-
-// Header returns the file header that comes with the multipart request.
-func (f *UploadedFile) Header() *multipart.FileHeader {
-	return f.header
-}
-
-// FindUploadedFiles extracts all form files of `key` from a http request
-// and returns a slice with `UploadedFile` instances (if any).
-func FindUploadedFiles(r *http.Request, key string) ([]*UploadedFile, error) {
+// FindUploadedFiles extracts all form files of "key" from a http request
+// and returns a slice with filesystem.File instances (if any).
+func FindUploadedFiles(r *http.Request, key string) ([]*filesystem.File, error) {
 	if r.MultipartForm == nil {
 		err := r.ParseMultipartForm(DefaultMaxMemory)
 		if err != nil {
@@ -49,51 +24,15 @@ func FindUploadedFiles(r *http.Request, key string) ([]*UploadedFile, error) {
 		return nil, http.ErrMissingFile
 	}
 
-	result := make([]*UploadedFile, 0, len(r.MultipartForm.File[key]))
+	result := make([]*filesystem.File, 0, len(r.MultipartForm.File[key]))
 
 	for _, fh := range r.MultipartForm.File[key] {
-		file, err := fh.Open()
+		file, err := filesystem.NewFileFromMultipart(fh)
 		if err != nil {
 			return nil, err
 		}
-		defer file.Close()
 
-		// extension
-		// ---
-		originalExt := filepath.Ext(fh.Filename)
-		sanitizedExt := extensionInvalidCharsRegex.ReplaceAllString(originalExt, "")
-		if sanitizedExt == "" {
-			// try to detect the extension from the mime type
-			mt, err := mimetype.DetectReader(file)
-			if err != nil {
-				return nil, err
-			}
-			sanitizedExt = mt.Extension()
-		}
-
-		// name
-		// ---
-		originalName := strings.TrimSuffix(fh.Filename, originalExt)
-		sanitizedName := inflector.Snakecase(originalName)
-		if length := len(sanitizedName); length < 3 {
-			// the name is too short so we concatenate an additional random part
-			sanitizedName += security.RandomString(10)
-		} else if length > 100 {
-			// keep only the first 100 characters (it is multibyte safe after Snakecase)
-			sanitizedName = sanitizedName[:100]
-		}
-
-		uploadedFilename := fmt.Sprintf(
-			"%s_%s%s",
-			sanitizedName,
-			security.RandomString(10), // ensure that there is always a random part
-			sanitizedExt,
-		)
-
-		result = append(result, &UploadedFile{
-			name:   uploadedFilename,
-			header: fh,
-		})
+		result = append(result, file)
 	}
 
 	return result, nil

tools/rest/uploaded_file_test.go

@@ -47,16 +47,16 @@ func TestFindUploadedFiles(t *testing.T) {
 			t.Errorf("[%d] Expected 1 file, got %d", i, len(result))
 		}
 
-		if result[0].Header().Size != 4 {
-			t.Errorf("[%d] Expected the file size to be 4 bytes, got %d", i, result[0].Header().Size)
+		if result[0].Size != 4 {
+			t.Errorf("[%d] Expected the file size to be 4 bytes, got %d", i, result[0].Size)
 		}
 
 		pattern, err := regexp.Compile(s.expectedPattern)
 		if err != nil {
 			t.Errorf("[%d] Invalid filename pattern %q: %v", i, s.expectedPattern, err)
 		}
-		if !pattern.MatchString(result[0].Name()) {
-			t.Fatalf("Expected filename to match %s, got filename %s", s.expectedPattern, result[0].Name())
+		if !pattern.MatchString(result[0].Name) {
+			t.Fatalf("Expected filename to match %s, got filename %s", s.expectedPattern, result[0].Name)
 		}
 	}
 }