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

Move AppendUstr(), AppendUint() into helpers

Browse Source
This commit is contained in:
Harshavardhana 2015-03-01 11:18:34 -08:00
parent 9fb67c4195
commit eb9a4a83ac
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ import (
"sync" "sync"
mstorage "github.com/minio-io/minio/pkg/storage" mstorage "github.com/minio-io/minio/pkg/storage"
"github.com/minio-io/minio/pkg/utils/helpers"
"github.com/minio-io/minio/pkg/utils/policy" "github.com/minio-io/minio/pkg/utils/policy"
) )
@ -328,15 +329,6 @@ func delimiter(path, delimiter string) string {
return delimited return delimited
} }
func appendU(slice []string, i string) []string {
for _, ele := range slice {
if ele == i {
return slice
}
}
return append(slice, i)
}
type ByObjectKey []mstorage.ObjectMetadata type ByObjectKey []mstorage.ObjectMetadata
func (b ByObjectKey) Len() int { return len(b) } func (b ByObjectKey) Len() int { return len(b) }
@ -387,7 +379,7 @@ func (storage *storage) ListObjects(bucket string, resources mstorage.BucketReso
} }
metadataList = append(metadataList, metadata) metadataList = append(metadataList, metadata)
case delimited != "": case delimited != "":
resources.CommonPrefixes = appendU(resources.CommonPrefixes, delimited) resources.CommonPrefixes = helpers.AppendUstr(resources.CommonPrefixes, delimited)
} }
case resources.Delimiter != "" && strings.HasPrefix(name, resources.Prefix): case resources.Delimiter != "" && strings.HasPrefix(name, resources.Prefix):
delimited := delimiter(name, resources.Delimiter) delimited := delimiter(name, resources.Delimiter)
@ -402,7 +394,7 @@ func (storage *storage) ListObjects(bucket string, resources mstorage.BucketReso
} }
metadataList = append(metadataList, metadata) metadataList = append(metadataList, metadata)
case delimited != "": case delimited != "":
resources.CommonPrefixes = appendU(resources.CommonPrefixes, delimited) resources.CommonPrefixes = helpers.AppendUstr(resources.CommonPrefixes, delimited)
} }
case strings.HasPrefix(name, resources.Prefix): case strings.HasPrefix(name, resources.Prefix):
metadata := mstorage.ObjectMetadata{ metadata := mstorage.ObjectMetadata{

18
pkg/utils/helpers/common.go
View File

@ -52,3 +52,21 @@ func Assert(err error) {
func FirstUpper(str string) string { func FirstUpper(str string) string {
return strings.ToUpper(str[0:1]) + str[1:] return strings.ToUpper(str[0:1]) + str[1:]
} }
func AppendUint(slice []int, i int) []int {
for _, ele := range slice {
if ele == i {
return slice
}
}
return append(slice, i)
}
func AppendUstr(slice []string, i string) []string {
for _, ele := range slice {
if ele == i {
return slice
}
}
return append(slice, i)
}