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

CR Changes

Browse Source
This commit is contained in:
stefanbenten
2020-02-21 23:39:12 +01:00
parent b3f2319cba
commit 9f9e1b66b2
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/storage.go
View File

@ -590,6 +590,8 @@ func NewStorjStorage(access, bucket string, logger *log.Logger) (*StorjStorage,
instance.bucket, err = instance.project.EnsureBucket(ctx, bucket) instance.bucket, err = instance.project.EnsureBucket(ctx, bucket)
if err != nil { if err != nil {
//Ignoring the error to return the one that occurred first, but try to clean up.
_ = instance.project.Close()
return nil, err return nil, err
} }
@ -628,9 +630,10 @@ func (s *StorjStorage) Get(token string, filename string) (reader io.ReadCloser,
if err != nil { if err != nil {
return nil, "", 0, err return nil, "", 0, err
} }
contentType = download.Info().Standard.ContentType contentType = download.Info().Standard.ContentType
contentLength = uint64(download.Info().Standard.ContentLength) contentLength = uint64(download.Info().Standard.ContentLength)
//return the download as a reader
reader = download reader = download
return return
} }
@ -661,18 +664,22 @@ func (s *StorjStorage) Put(token string, filename string, reader io.Reader, cont
n, err := io.Copy(writer, reader) n, err := io.Copy(writer, reader)
if err != nil { if err != nil {
//Ignoring the error to return the one that occurred first, but try to clean up.
_ = writer.Abort()
return err return err
} }
err = writer.SetMetadata(ctx, &uplink.StandardMetadata{ContentType: contentType, ContentLength: n}, nil) err = writer.SetMetadata(ctx, &uplink.StandardMetadata{ContentType: contentType, ContentLength: n}, nil)
if err != nil { if err != nil {
//Ignoring the error to return the one that occurred first, but try to clean up.
_ = writer.Abort()
return err return err
} }
//Commit the object!
err = writer.Commit() err = writer.Commit()
return err return err
} }
func (s *StorjStorage) IsNotExist(err error) bool { func (s *StorjStorage) IsNotExist(err error) bool {
return storj.ErrObjectNotFound.Has(err) return uplink.ErrObjectNotFound.Has(err)
} }