realloc/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#657] Replace FileName with FilePath attribute

Browse source 
Signed-off-by: Denis Kirillov <denis@nspcc.ru>
This commit is contained in:
Denis Kirillov 2022-09-07 09:59:24 +03:00 • committed by Kirillov Denis
parent c051d21420
commit 9cd4ef1ac4
13 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
api/layer/util.go
View file

@ -69,7 +69,7 @@ func objectInfoFromMeta(bkt *data.BucketInfo, meta *object.Object) *data.ObjectI
)
headers := userHeaders(meta.Attributes())
delete(headers, object.AttributeFileName)
delete(headers, object.AttributeFilePath)
if contentType, ok := headers[object.AttributeContentType]; ok {
mimeType = contentType
delete(headers, object.AttributeContentType)
@ -89,7 +89,7 @@ func objectInfoFromMeta(bkt *data.BucketInfo, meta *object.Object) *data.ObjectI
IsDir: false,
Bucket: bkt.Name,
Name: filenameFromObject(meta),
Name: filepathFromObject(meta),
Created: creation,
ContentType: mimeType,
Headers: headers,
@ -121,9 +121,9 @@ func addEncryptionHeaders(meta map[string]string, enc encryption.Params) error {
return nil
}
func filenameFromObject(o *object.Object) string {
func filepathFromObject(o *object.Object) string {
for _, attr := range o.Attributes() {
if attr.Key() == object.AttributeFileName {
if attr.Key() == object.AttributeFilePath {
return attr.Value()
}
}