summaryrefslogtreecommitdiff
path: root/internal/media/image.go
diff options
context:
space:
mode:
authorLibravatar tsmethurst <tobi.smethurst@protonmail.com>2022-01-08 13:45:42 +0100
committerLibravatar tsmethurst <tobi.smethurst@protonmail.com>2022-01-08 13:45:42 +0100
commitc2ff8f392b6320d45d8667d4e093e8eb8ddf59c1 (patch)
treed8592837da9e591b50e4fded43c8b14b77ee5f6c /internal/media/image.go
parentstart working on thumb + full funcs (diff)
downloadgotosocial-c2ff8f392b6320d45d8667d4e093e8eb8ddf59c1.tar.xz
further refinements
Diffstat (limited to 'internal/media/image.go')
-rw-r--r--internal/media/image.go70
1 files changed, 0 insertions, 70 deletions
diff --git a/internal/media/image.go b/internal/media/image.go
index 157ae0f4a..acc62a28b 100644
--- a/internal/media/image.go
+++ b/internal/media/image.go
@@ -20,22 +20,16 @@ package media
import (
"bytes"
- "context"
"errors"
"fmt"
"image"
"image/gif"
"image/jpeg"
"image/png"
- "strings"
- "time"
"github.com/buckket/go-blurhash"
"github.com/nfnt/resize"
"github.com/superseriousbusiness/exifremove/pkg/exifremove"
- "github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
- "github.com/superseriousbusiness/gotosocial/internal/id"
- "github.com/superseriousbusiness/gotosocial/internal/uris"
)
const (
@@ -53,70 +47,6 @@ type ImageMeta struct {
blurhash string
}
-func (m *manager) preProcessImage(ctx context.Context, data []byte, contentType string, accountID string) (*Media, error) {
- if !supportedImage(contentType) {
- return nil, fmt.Errorf("image type %s not supported", contentType)
- }
-
- if len(data) == 0 {
- return nil, errors.New("image was of size 0")
- }
-
- id, err := id.NewRandomULID()
- if err != nil {
- return nil, err
- }
-
- extension := strings.Split(contentType, "/")[1]
-
- attachment := &gtsmodel.MediaAttachment{
- ID: id,
- UpdatedAt: time.Now(),
- URL: uris.GenerateURIForAttachment(accountID, string(TypeAttachment), string(SizeOriginal), id, extension),
- Type: gtsmodel.FileTypeImage,
- AccountID: accountID,
- Processing: 0,
- File: gtsmodel.File{
- Path: fmt.Sprintf("%s/%s/%s/%s.%s", accountID, TypeAttachment, SizeOriginal, id, extension),
- ContentType: contentType,
- UpdatedAt: time.Now(),
- },
- Thumbnail: gtsmodel.Thumbnail{
- URL: uris.GenerateURIForAttachment(accountID, string(TypeAttachment), string(SizeSmall), id, mimeJpeg), // all thumbnails are encoded as jpeg,
- Path: fmt.Sprintf("%s/%s/%s/%s.%s", accountID, TypeAttachment, SizeSmall, id, mimeJpeg), // all thumbnails are encoded as jpeg,
- ContentType: mimeJpeg,
- UpdatedAt: time.Now(),
- },
- Avatar: false,
- Header: false,
- }
-
- media := &Media{
- attachment: attachment,
- }
-
- return media, nil
-
- var clean []byte
- var original *ImageMeta
- var small *ImageMeta
-
-
-
- if err != nil {
- return nil, err
- }
-
- small, err = deriveThumbnail(clean, contentType)
- if err != nil {
- return nil, fmt.Errorf("error deriving thumbnail: %s", err)
- }
-
- // now put it in storage, take a new id for the name of the file so we don't store any unnecessary info about it
-
- return attachment, nil
-}
-
func decodeGif(b []byte) (*ImageMeta, error) {
gif, err := gif.DecodeAll(bytes.NewReader(b))
if err != nil {