MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27 from fkautz/pr_out_adding_error_when_object_exists

This commit is contained in:
Frederick F. Kautz IV 2015-01-20 19:16:51 -08:00
parent 9a4c8bfaac 9260e6404a
commit 761249934b
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/storage/storage.go
View File

@ -34,6 +34,15 @@ func (self ObjectNotFound) Error() string {
return "Not Found: " + self.bucket + "#" + self.path
}
type ObjectExists struct {
bucket string
key string
}
func (self ObjectExists) Error() string {
return "Object exists: " + self.bucket + "#" + self.key
}
func (storage *Storage) CopyObjectToWriter(w io.Writer, bucket string, object string) (int64, error) {
// TODO synchronize access
// get object
@ -47,8 +56,11 @@ func (storage *Storage) CopyObjectToWriter(w io.Writer, bucket string, object st
}
}
func (storage *Storage) StoreObject(bucket string, key string, data io.Reader) {
func (storage *Storage) StoreObject(bucket string, key string, data io.Reader) error {
objectKey := bucket + ":" + key
if _, ok := storage.data[objectKey]; ok == true {
return ObjectExists{bucket: bucket, key: key}
}
var bytesBuffer bytes.Buffer
newObject := storedObject{}
if _, ok := io.Copy(&bytesBuffer, data); ok == nil {
@ -60,6 +72,7 @@ func (storage *Storage) StoreObject(bucket string, key string, data io.Reader) {
newObject.data = bytesBuffer.Bytes()
}
storage.data[objectKey] = newObject
return nil
}
func (storage *Storage) ListObjects(bucket, prefix string, count int) []ObjectMetadata {

7
pkg/webapi/minioapi/minioapi.go
View File

@ -106,7 +106,12 @@ func (server *minioApi) putObjectHandler(w http.ResponseWriter, req *http.Reques
vars := mux.Vars(req)
bucket := vars["bucket"]
object := vars["object"]
server.storage.StoreObject(bucket, object, req.Body)
err := server.storage.StoreObject(bucket, object, req.Body)
if err != nil {
w.WriteHeader(http.StatusBadRequest)
w.Write([]byte(err.Error()))
return
}
}
func generateListResult(objects []mstorage.ObjectMetadata) ListResponse {