From 53180548083c0a100db2f703d5f5da047a9e0031 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Wed, 11 Jan 2023 11:13:13 +0000 Subject: [performance] media processing improvements (#1288) * media processor consolidation and reformatting, reduce amount of required syscalls Signed-off-by: kim * update go-store library, stream jpeg/png encoding + use buffer pools, improved media processing AlreadyExists error handling Signed-off-by: kim * fix duration not being set, fix mp4 test expecting error Signed-off-by: kim * fix test expecting media files with different extension Signed-off-by: kim * remove unused code Signed-off-by: kim * fix expected storage paths in tests, update expected test thumbnails Signed-off-by: kim * remove dead code Signed-off-by: kim * fix cached presigned s3 url fetching Signed-off-by: kim * fix tests Signed-off-by: kim * fix test models Signed-off-by: kim * update media processing to use sync.Once{} for concurrency protection Signed-off-by: kim * shutup linter Signed-off-by: kim * fix passing in KVStore GetStream() as stream to PutStream() Signed-off-by: kim * fix unlocks of storage keys Signed-off-by: kim * whoops, return the error... Signed-off-by: kim * pour one out for tobi's code <3 Signed-off-by: kim * add back the byte slurping code Signed-off-by: kim * check for both ErrUnexpectedEOF and EOF Signed-off-by: kim * add back links to file format header information Signed-off-by: kim Signed-off-by: kim --- internal/media/util.go | 96 +++++--------------------------------------------- 1 file changed, 9 insertions(+), 87 deletions(-) (limited to 'internal/media/util.go') diff --git a/internal/media/util.go b/internal/media/util.go index 8393d832e..b15583026 100644 --- a/internal/media/util.go +++ b/internal/media/util.go @@ -19,72 +19,22 @@ package media import ( - "context" - "errors" "fmt" - "io" - "github.com/h2non/filetype" "github.com/superseriousbusiness/gotosocial/internal/log" - "github.com/superseriousbusiness/gotosocial/internal/storage" ) -// AllSupportedMIMETypes just returns all media -// MIME types supported by this instance. -func AllSupportedMIMETypes() []string { - return []string{ - mimeImageJpeg, - mimeImageGif, - mimeImagePng, - mimeImageWebp, - mimeVideoMp4, - } -} - -// parseContentType parses the MIME content type from a file, returning it as a string in the form (eg., "image/jpeg"). -// Returns an error if the content type is not something we can process. -// -// Fileheader should be no longer than 262 bytes; anything more than this is inefficient. -func parseContentType(fileHeader []byte) (string, error) { - if fhLength := len(fileHeader); fhLength > maxFileHeaderBytes { - return "", fmt.Errorf("parseContentType requires %d bytes max, we got %d", maxFileHeaderBytes, fhLength) - } - - kind, err := filetype.Match(fileHeader) - if err != nil { - return "", err - } - - if kind == filetype.Unknown { - return "", errors.New("filetype unknown") - } - - return kind.MIME.Value, nil -} - -// supportedAttachment checks mime type of an attachment against a -// slice of accepted types, and returns True if the mime type is accepted. -func supportedAttachment(mimeType string) bool { - for _, accepted := range AllSupportedMIMETypes() { - if mimeType == accepted { - return true - } - } - return false +var SupportedMIMETypes = []string{ + mimeImageJpeg, + mimeImageGif, + mimeImagePng, + mimeImageWebp, + mimeVideoMp4, } -// supportedEmoji checks that the content type is image/png or image/gif -- the only types supported for emoji. -func supportedEmoji(mimeType string) bool { - acceptedEmojiTypes := []string{ - mimeImageGif, - mimeImagePng, - } - for _, accepted := range acceptedEmojiTypes { - if mimeType == accepted { - return true - } - } - return false +var SupportedEmojiMIMETypes = []string{ + mimeImageGif, + mimeImagePng, } // ParseMediaType converts s to a recognized MediaType, or returns an error if unrecognized @@ -127,31 +77,3 @@ func (l *logrusWrapper) Info(msg string, keysAndValues ...interface{}) { func (l *logrusWrapper) Error(err error, msg string, keysAndValues ...interface{}) { log.Error("media manager cron logger: ", err, msg, keysAndValues) } - -// lengthReader wraps a reader and reads the length of total bytes written as it goes. -type lengthReader struct { - source io.Reader - length int64 -} - -func (r *lengthReader) Read(b []byte) (int, error) { - n, err := r.source.Read(b) - r.length += int64(n) - return n, err -} - -// putStream either puts a file with a known fileSize into storage directly, and returns the -// fileSize unchanged, or it wraps the reader with a lengthReader and returns the discovered -// fileSize. -func putStream(ctx context.Context, storage *storage.Driver, key string, r io.Reader, fileSize int64) (int64, error) { - if fileSize > 0 { - return fileSize, storage.PutStream(ctx, key, r) - } - - lr := &lengthReader{ - source: r, - } - - err := storage.PutStream(ctx, key, lr) - return lr.length, err -} -- cgit v1.2.3