summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/minio/minio-go/api-put-object-file.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/minio/minio-go/api-put-object-file.go')
-rw-r--r--vendor/github.com/minio/minio-go/api-put-object-file.go51
1 files changed, 6 insertions, 45 deletions
diff --git a/vendor/github.com/minio/minio-go/api-put-object-file.go b/vendor/github.com/minio/minio-go/api-put-object-file.go
index 81cdf5c2c..7c8e05117 100644
--- a/vendor/github.com/minio/minio-go/api-put-object-file.go
+++ b/vendor/github.com/minio/minio-go/api-put-object-file.go
@@ -1,5 +1,6 @@
/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015, 2016 Minio, Inc.
+ * Minio Go Library for Amazon S3 Compatible Cloud Storage
+ * Copyright 2015-2017 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,50 +18,10 @@
package minio
import (
- "mime"
- "os"
- "path/filepath"
-
- "github.com/minio/minio-go/pkg/s3utils"
+ "context"
)
-// FPutObject - Create an object in a bucket, with contents from file at filePath.
-func (c Client) FPutObject(bucketName, objectName, filePath, contentType string) (n int64, err error) {
- // Input validation.
- if err := s3utils.CheckValidBucketName(bucketName); err != nil {
- return 0, err
- }
- if err := s3utils.CheckValidObjectName(objectName); err != nil {
- return 0, err
- }
-
- // Open the referenced file.
- fileReader, err := os.Open(filePath)
- // If any error fail quickly here.
- if err != nil {
- return 0, err
- }
- defer fileReader.Close()
-
- // Save the file stat.
- fileStat, err := fileReader.Stat()
- if err != nil {
- return 0, err
- }
-
- // Save the file size.
- fileSize := fileStat.Size()
-
- objMetadata := make(map[string][]string)
-
- // Set contentType based on filepath extension if not given or default
- // value of "binary/octet-stream" if the extension has no associated type.
- if contentType == "" {
- if contentType = mime.TypeByExtension(filepath.Ext(filePath)); contentType == "" {
- contentType = "application/octet-stream"
- }
- }
-
- objMetadata["Content-Type"] = []string{contentType}
- return c.putObjectCommon(bucketName, objectName, fileReader, fileSize, objMetadata, nil)
+// FPutObject - Create an object in a bucket, with contents from file at filePath
+func (c Client) FPutObject(bucketName, objectName, filePath string, opts PutObjectOptions) (n int64, err error) {
+ return c.FPutObjectWithContext(context.Background(), bucketName, objectName, filePath, opts)
}