Merge pull request #628 from harshavardhana/pr_out_skip_files_and_weird_directories_from_listbuckets_allowing_this_so_that_minio_fs_mode_can_be_used_as_ftp_service

Skip files and weird directories from listBuckets(), allowing this so that minio fs mode can be used as ftp service
This commit is contained in:
Harshavardhana 2015-06-01 16:46:51 -07:00
commit bf36fcb6f7

View File

@ -40,11 +40,19 @@ func (fs *fsDriver) ListBuckets() ([]drivers.BucketMetadata, error) {
var metadataList []drivers.BucketMetadata var metadataList []drivers.BucketMetadata
for _, file := range files { for _, file := range files {
if !file.IsDir() { if !file.IsDir() {
return []drivers.BucketMetadata{}, iodine.New(drivers.BackendCorrupted{Path: fs.root}, nil) // if files found ignore them
continue
} }
if file.IsDir() {
// if directories found with odd names, skip them too
if !drivers.IsValidBucket(file.Name()) {
continue
}
}
metadata := drivers.BucketMetadata{ metadata := drivers.BucketMetadata{
Name: file.Name(), Name: file.Name(),
Created: file.ModTime(), // TODO - provide real created time Created: file.ModTime(),
} }
metadataList = append(metadataList, metadata) metadataList = append(metadataList, metadata)
} }