From b3bde6139685824390f57ad1493985125ed03501 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 1 Feb 2016 12:47:46 -0800 Subject: [PATCH] web: ListObjects is delimited, do not send a stat on prefix. --- web-handlers.go | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/web-handlers.go b/web-handlers.go index 55afc7f04..0bb4eb02d 100644 --- a/web-handlers.go +++ b/web-handlers.go @@ -20,6 +20,7 @@ import ( "fmt" "net" "net/http" + "strings" "time" jwtgo "github.com/dgrijalva/jwt-go" @@ -95,19 +96,22 @@ func (web *WebAPI) ListObjects(r *http.Request, args *ListObjectsArgs, reply *[] if object.Err != nil { return object.Err } + objectInfo := ObjectInfo{ + Key: object.Key, + LastModified: object.LastModified, + Size: object.Size, + } // TODO - This can get slower for large directories, we can // perhaps extend the ListObjects XML to reply back // ContentType as well. - objectInfo, e := web.Client.StatObject(args.BucketName, object.Key) - if e != nil { - return e + if !strings.HasSuffix(object.Key, "/") && object.Size > 0 { + objectStatInfo, e := web.Client.StatObject(args.BucketName, object.Key) + if e != nil { + return e + } + objectInfo.ContentType = objectStatInfo.ContentType } - *reply = append(*reply, ObjectInfo{ - Key: objectInfo.Key, - LastModified: objectInfo.LastModified, - Size: objectInfo.Size, - ContentType: objectInfo.ContentType, - }) + *reply = append(*reply, objectInfo) } return nil }