Skip to content

Add MIME type when uploading to S3 #778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mxpv merged 7 commits into from
Dec 5, 2025
Merged

Add MIME type when uploading to S3 #778

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
474f93e
Add MIME type when uploading to S3
skauk Sep 25, 2025
3b4ad4c
Update dependencies
skauk Sep 25, 2025
1b18cfd
Merge branch 'main' into feature/mime-type
skauk Oct 25, 2025
35a6ab8
Merge branch 'mxpv:main' into feature/mime-type
skauk Nov 6, 2025
1c8f586
Merge branch 'main' into feature/mime-type
skauk Dec 5, 2025
0ee9610
Run go mod tidy
mxpv Dec 5, 2025
61ffa05
Add error handling
mxpv Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ require (
github.com/dgraph-io/ristretto v0.0.2 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/gabriel-vasile/mimetype v1.4.10 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ github.com/eduncan911/podcast v1.4.2/go.mod h1:mSxiK1z5KeNO0YFaQ3ElJlUZbbDV9dA7R
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIpU+bX4+ZK0=
github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
github.com/gilliek/go-opml v1.0.0 h1:X8xVjtySRXU/x6KvaiXkn7OV3a4DHqxY8Rpv6U/JvCY=
github.com/gilliek/go-opml v1.0.0/go.mod h1:fOxmtlzyBvUjU6bjpdjyxCGlWz+pgtAHrHf/xRZl3lk=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
Expand Down
18 changes: 14 additions & 4 deletions pkg/fs/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package fs

import (
"bytes"
"context"
"io"
"net/http"
Expand All @@ -13,6 +14,7 @@ import (
"github.com/aws/aws-sdk-go/service/s3"
"github.com/aws/aws-sdk-go/service/s3/s3iface"
"github.com/aws/aws-sdk-go/service/s3/s3manager"
"github.com/gabriel-vasile/mimetype"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
)
Expand Down Expand Up @@ -79,12 +81,20 @@ func (s *S3) Create(ctx context.Context, name string, reader io.Reader) (int64,
key := s.buildKey(name)
logger := log.WithField("key", key)

// Detect MIME type from the first 512 bytes and then replay them with the rest of the stream.
buf := make([]byte, 512)
n, _ := io.ReadFull(reader, buf)
head := buf[:n]
m := mimetype.Detect(head)
body := io.MultiReader(bytes.NewReader(head), reader)

logger.Infof("uploading file to %s", s.bucket)
r := &readerWithN{Reader: reader}
r := &readerWithN{Reader: body}
_, err := s.uploader.UploadWithContext(ctx, &s3manager.UploadInput{
Bucket: &s.bucket,
Key: &key,
Body: r,
Body: r,
Bucket: &s.bucket,
ContentType: aws.String(m.String()),
Key: &key,
})
if err != nil {
return 0, errors.Wrap(err, "failed to upload file")
Expand Down
Loading