gaspersic/transfer.sh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to RC

Browse Source
This commit is contained in:
stefanbenten
2020-03-06 15:37:52 +01:00
parent 9f9e1b66b2
commit 38996c9c7f
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/storage.go
View File

@ -613,8 +613,10 @@ func (s *StorjStorage) Head(token string, filename string) (contentType string,
if err != nil {
return "", 0, err
}
contentType = obj.Standard.ContentType
contentLength = uint64(obj.Standard.ContentLength)
customMeta := obj.Custom.Clone()
contentType = customMeta["contentType"]
contentLength = uint64(obj.System.ContentLength)
return
}
@ -631,8 +633,9 @@ func (s *StorjStorage) Get(token string, filename string) (reader io.ReadCloser,
return nil, "", 0, err
}
contentType = download.Info().Standard.ContentType
contentLength = uint64(download.Info().Standard.ContentLength)
customMeta := download.Info().Custom.Clone()
contentType = customMeta["contentType"]
contentLength = uint64(download.Info().System.ContentLength)
reader = download
return
@ -662,14 +665,13 @@ func (s *StorjStorage) Put(token string, filename string, reader io.Reader, cont
return err
}
n, err := io.Copy(writer, reader)
_, err = io.Copy(writer, reader)
if err != nil {
//Ignoring the error to return the one that occurred first, but try to clean up.
_ = writer.Abort()
return err
}
err = writer.SetMetadata(ctx, &uplink.StandardMetadata{ContentType: contentType, ContentLength: n}, nil)
err = writer.SetCustomMetadata(ctx, uplink.CustomMetadata{"ContentType": contentType})
if err != nil {
//Ignoring the error to return the one that occurred first, but try to clean up.
_ = writer.Abort()