mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 10:02:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[bugfix] Fix images not being processed correctly sometimes (#437)

Browse source 
* bump exif-terminator to latest version

* add and test giant turnip from turnip.farm

* don't error if content property is nil
This commit is contained in:
tobi 2022-03-21 19:46:51 +01:00 • committed by GitHub
commit 25cab0e1f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 245 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/media/image.go
View file

@ -125,7 +125,7 @@ func deriveThumbnail(r io.Reader, contentType string, createBlurhash bool) (*ima
}
if err != nil {
return nil, err
return nil, fmt.Errorf("error decoding image as %s: %s", contentType, err)
}
if i == nil {
@ -151,7 +151,7 @@ func deriveThumbnail(r io.Reader, contentType string, createBlurhash bool) (*ima
tiny := resize.Thumbnail(32, 32, thumb, resize.NearestNeighbor)
bh, err := blurhash.Encode(4, 3, tiny)
if err != nil {
return nil, err
return nil, fmt.Errorf("error creating blurhash: %s", err)
}
im.blurhash = bh
}
@ -161,7 +161,7 @@ func deriveThumbnail(r io.Reader, contentType string, createBlurhash bool) (*ima
// Quality isn't extremely important for thumbnails, so 75 is "good enough"
Quality: 75,
}); err != nil {
return nil, err
return nil, fmt.Errorf("error encoding thumbnail: %s", err)
}
im.small = out.Bytes()

2
internal/media/processingmedia.go
View file

@ -260,6 +260,7 @@ func (p *ProcessingMedia) store(ctx context.Context) error {
if err != nil {
return fmt.Errorf("store: error executing data function: %s", err)
}
logrus.Tracef("store: reading %d bytes from data function for media %s", fileSize, p.attachment.URL)
// defer closing the reader when we're done with it
defer func() {
@ -342,6 +343,7 @@ func (p *ProcessingMedia) store(ctx context.Context) error {
return p.postData(ctx)
}
logrus.Tracef("store: finished storing initial data for attachment %s", p.attachment.URL)
return nil
}