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

[bugfix] Wrap media in read closer (#941)

Browse source 
* use readcloser for content.Content

* call media postdata function no matter what

* return a readcloser from data func

* tidy of logic of readertostore

* fix whoopsie
This commit is contained in:
tobi 2022-11-03 15:03:12 +01:00 • committed by GitHub
commit 1dfa7fe0d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 88 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/processing/media/getfile_test.go
View file

@ -91,10 +91,7 @@ func (suite *GetFileTestSuite) TestGetRemoteFileUncached() {
suite.NotNil(content)
b, err := io.ReadAll(content.Content)
suite.NoError(err)
if closer, ok := content.Content.(io.Closer); ok {
suite.NoError(closer.Close())
}
suite.NoError(content.Content.Close())
suite.Equal(suite.testRemoteAttachments[testAttachment.RemoteURL].Data, b)
suite.Equal(suite.testRemoteAttachments[testAttachment.RemoteURL].ContentType, content.ContentType)
@ -151,9 +148,7 @@ func (suite *GetFileTestSuite) TestGetRemoteFileUncachedInterrupted() {
suite.NoError(err)
// close the reader
if closer, ok := content.Content.(io.Closer); ok {
suite.NoError(closer.Close())
}
suite.NoError(content.Content.Close())
// the attachment should still be updated in the database even though the caller hung up
if !testrig.WaitFor(func() bool {
@ -201,10 +196,7 @@ func (suite *GetFileTestSuite) TestGetRemoteFileThumbnailUncached() {
suite.NotNil(content)
b, err := io.ReadAll(content.Content)
suite.NoError(err)
if closer, ok := content.Content.(io.Closer); ok {
suite.NoError(closer.Close())
}
suite.NoError(content.Content.Close())
suite.Equal(thumbnailBytes, b)
suite.Equal("image/jpeg", content.ContentType)