TrueCloudLab/frostfs-s3-gw
17
3
Fork 20
Code Issues 18 Pull requests 3 Projects Releases 36 Packages 1 Activity Actions

[#93] Removed unnecessary

Browse source 
Signed-off-by: Denis Kirillov <denis@nspcc.ru>
This commit is contained in:
Denis Kirillov 2021-06-30 15:29:01 +03:00
parent a6ec27b40d
commit 2af1b16b59
3 changed files with 35 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

14
api/layer/util.go
View file

@ -1,7 +1,6 @@
package layer
import (
"net/http"
"os"
"strconv"
"strings"
@ -103,10 +102,10 @@ func objectInfoFromMeta(bkt *BucketInfo, meta *object.Object, prefix, delimiter
filename = prefix + tail[:index+1]
userHeaders = nil
} else {
size, mimeType = getSizeAndMimeType(meta, mimeType)
size = int64(meta.PayloadSize())
}
} else {
size, mimeType = getSizeAndMimeType(meta, mimeType)
size = int64(meta.PayloadSize())
}
return &ObjectInfo{
@ -124,15 +123,6 @@ func objectInfoFromMeta(bkt *BucketInfo, meta *object.Object, prefix, delimiter
}
}
func getSizeAndMimeType(meta *object.Object, contentType string) (size int64, mimeType string) {
size = int64(meta.PayloadSize())
mimeType = contentType
if len(mimeType) == 0 {
mimeType = http.DetectContentType(meta.Payload())
}
return
}
func filenameFromObject(o *object.Object) string {
var name = o.ID().String()
for _, attr := range o.Attributes() {