Skip to content
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

Jump to bottom

feat(internal/gensupport): use gax DetermineContentType #1716

Merged
merged 3 commits into from Oct 18, 2022
Merged

feat(internal/gensupport): use gax DetermineContentType #1716

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
beef5e9
feat(internal/gensupport): use gax DetermineContentType
noahdietz Oct 17, 2022
af6e455
remove deprecated DetermineContentType
noahdietz Oct 18, 2022
1483d54
Merge branch 'main' into gax-determine-ct
noahdietz Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 13 additions & 2 deletions internal/gensupport/media.go
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@ import (
"sync"
"time"

gax "github.com/googleapis/gax-go/v2"
"google.golang.org/api/googleapi"
)

Expand Down Expand Up @@ -81,6 +82,9 @@ func (cs *contentSniffer) ContentType() (string, bool) {
// instead of sniffing the content.
// After calling DetectContentType the caller must not perform further reads on
// media, but rather read from the Reader that is returned.
//
// Deprecated: Use [gax.DetermineContentType](https://pkg.go.dev/github.com/googleapis/gax-go/v2#DetermineContentType)
// instead.
func DetermineContentType(media io.Reader, ctype string) (io.Reader, string) {
// Note: callers could avoid calling DetectContentType if ctype != "",
// but doing the check inside this function reduces the amount of
Expand Down Expand Up @@ -234,7 +238,10 @@ func NewInfoFromMedia(r io.Reader, options []googleapi.MediaOption) *MediaInfo {
mi := &MediaInfo{}
opts := googleapi.ProcessMediaOptions(options)
if !opts.ForceEmptyContentType {
r, mi.mType = DetermineContentType(r, opts.ContentType)
mi.mType = opts.ContentType
if mi.mType == "" {
r, mi.mType = gax.DetermineContentType(r)
}
}
mi.chunkRetryDeadline = opts.ChunkRetryDeadline
mi.media, mi.buffer, mi.singleChunk = PrepareUpload(r, opts.ChunkSize)
Expand All @@ -245,7 +252,11 @@ func NewInfoFromMedia(r io.Reader, options []googleapi.MediaOption) *MediaInfo {
// call. It returns a MediaInfo using the given reader, size and media type.
func NewInfoFromResumableMedia(r io.ReaderAt, size int64, mediaType string) *MediaInfo {
rdr := ReaderAtToReader(r, size)
rdr, mType := DetermineContentType(rdr, mediaType)
mType := mediaType
if mType == "" {
rdr, mType = gax.DetermineContentType(rdr)
}

return &MediaInfo{
size: size,
mType: mType,
Expand Down