MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-07 21:02:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Creating subdirectories in fs now works

Browse Source
This commit is contained in:
Frederick F. Kautz IV
2015-01-27 17:47:11 -08:00
parent 25ad24997e
commit 5daa408e2c
4 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,6 +176,13 @@ func (storage *storage) StoreObject(bucket string, key string, data io.Reader) e
// get object path
objectPath := path.Join(storage.root, bucket, key)
objectDir := path.Dir(objectPath)
if _, err := os.Stat(objectDir); os.IsNotExist(err) {
err = os.MkdirAll(objectDir, 0700)
if err != nil {
return mstorage.EmbedError(bucket, key, err)
}
}
// check if object exists
if _, err := os.Stat(objectPath); !os.IsNotExist(err) {

14
pkg/storage/storage_api_suite.go
View File

@@ -15,6 +15,7 @@ func APITestSuite(c *C, create func() Storage) {
testObjectOverwriteFails(c, create)
testNonExistantBucketOperations(c, create)
testBucketRecreateFails(c, create)
testPutObjectInSubdir(c, create)
}
func testCreateBucket(c *C, create func() Storage) {
@@ -142,3 +143,16 @@ func testBucketRecreateFails(c *C, create func() Storage) {
err = storage.StoreBucket("string")
c.Assert(err, Not(IsNil))
}
func testPutObjectInSubdir(c *C, create func() Storage) {
storage := create()
err := storage.StoreBucket("bucket")
c.Assert(err, IsNil)
err = storage.StoreObject("bucket", "dir1/dir2/object", bytes.NewBufferString("hello world"))
c.Assert(err, IsNil)
var bytesBuffer bytes.Buffer
length, err := storage.CopyObjectToWriter(&bytesBuffer, "bucket", "dir1/dir2/object")
c.Assert(len(bytesBuffer.Bytes()), Equals, len("hello world"))
c.Assert(int64(len(bytesBuffer.Bytes())), Equals, length)
c.Assert(err, IsNil)
}