go/pocketbase
1
0
Fork 0
mirror of https://github.com/pocketbase/pocketbase.git synced 2025-02-16 09:21:45 +02:00
Code Issues Releases Activity

[#390] serve the mimetype detected during upload

Browse Source
This commit is contained in:
Gani Georgiev 2022-09-05 15:46:40 +03:00
parent 9d53aec9ee
commit b717896232
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/filesystem/filesystem.go
View File

@ -18,6 +18,7 @@ import (
"github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/disintegration/imaging" "github.com/disintegration/imaging"
"github.com/gabriel-vasile/mimetype"
"github.com/pocketbase/pocketbase/tools/list" "github.com/pocketbase/pocketbase/tools/list"
"gocloud.dev/blob" "gocloud.dev/blob"
"gocloud.dev/blob/fileblob" "gocloud.dev/blob/fileblob"
@ -98,7 +99,11 @@ func (s *System) Attributes(fileKey string) (*blob.Attributes, error) {
// Upload writes content into the fileKey location. // Upload writes content into the fileKey location.
func (s *System) Upload(content []byte, fileKey string) error { func (s *System) Upload(content []byte, fileKey string) error {
w, writerErr := s.bucket.NewWriter(s.ctx, fileKey, nil) opts := &blob.WriterOptions{
ContentType: mimetype.Detect(content).String(),
}
w, writerErr := s.bucket.NewWriter(s.ctx, fileKey, opts)
if writerErr != nil { if writerErr != nil {
return writerErr return writerErr
} }
@ -185,9 +190,10 @@ var inlineServeContentTypes = []string{
// video // video
"video/webm", "video/mp4", "video/3gpp", "video/quicktime", "video/x-ms-wmv", "video/webm", "video/mp4", "video/3gpp", "video/quicktime", "video/x-ms-wmv",
// audio // audio
"audio/basic", "audio/aiff", "audio/mpeg", "audio/midi", "audio/wave", "audio/basic", "audio/aiff", "audio/mpeg", "audio/midi", "audio/mp3", "audio/wave",
"audio/wav", "audio/x-wav", "audio/x-mpeg", "audio/x-m4a", "audio/aac",
// document // document
"application/pdf", "application/pdf", "application/x-pdf",
} }
// Serve serves the file at fileKey location to an HTTP response. // Serve serves the file at fileKey location to an HTTP response.
@ -204,11 +210,11 @@ func (s *System) Serve(response http.ResponseWriter, fileKey string, name string
disposition = "inline" disposition = "inline"
} }
// make an exception for svg and use a custom content type // make an exception for svg and force a custom content type
// to send in the response so that it can be loaded in a img tag // to send in the response so that it can be loaded in an img tag
// (see https://github.com/whatwg/mimesniff/issues/7) // (see https://github.com/whatwg/mimesniff/issues/7)
extContentType := realContentType extContentType := realContentType
if filepath.Ext(name) == ".svg" { if extContentType != "image/svg+xml" && filepath.Ext(name) == ".svg" {
extContentType = "image/svg+xml" extContentType = "image/svg+xml"
} }