MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-26 07:05:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #249 from harshavardhana/pr_out_pathprefix_is_filtered_out_properly_and_delimited_as_well

Browse Source
This commit is contained in:
Harshavardhana 2015-03-03 23:08:30 -08:00
commit df135d7307
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/storage/fs/fs.go
View File

@ -404,12 +404,13 @@ func (storage *storage) ListObjects(bucket string, resources mstorage.BucketReso
resources.CommonPrefixes = appendUniq(resources.CommonPrefixes, delimited) resources.CommonPrefixes = appendUniq(resources.CommonPrefixes, delimited)
} }
case resources.Delimiter != "" && strings.HasPrefix(name, resources.Prefix): case resources.Delimiter != "" && strings.HasPrefix(name, resources.Prefix):
delimited := delimiter(name, resources.Delimiter) _internal := strings.TrimPrefix(name, resources.Prefix)
delimited := delimiter(_internal, resources.Delimiter)
switch true { switch true {
case delimited == "": case delimited == "":
metadata := mstorage.ObjectMetadata{ metadata := mstorage.ObjectMetadata{
Bucket: bucket, Bucket: bucket,
Key: name, Key: _internal,
Created: file.ModTime(), Created: file.ModTime(),
Size: file.Size(), Size: file.Size(),
ETag: bucket + "#" + name, ETag: bucket + "#" + name,