mirror of
https://github.com/minio/minio.git
synced 2025-11-07 04:42:56 -05:00
Make get/put more robust
- init folder if not present already in 'get()' call
- put.go was referencing wrong args - fix it
- if no OBJECTNAME is specified during 'get' - grab a
list of files under "~/.minio"
- Provide new API GetList() for ObjectStorage struct
This commit is contained in:
@@ -10,6 +10,18 @@ import (
|
||||
"github.com/minio-io/minio/pkgs/storage/fsstorage"
|
||||
)
|
||||
|
||||
func fsGetList(config inputConfig) (io.Reader, error) {
|
||||
var objectStorage storage.ObjectStorage
|
||||
rootDir := path.Join(config.rootDir, config.storageDriver)
|
||||
objectStorage = fsstorage.FileSystemStorage{RootDir: rootDir}
|
||||
objectlist, err := objectStorage.GetList()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
objectListBuffer := bytes.NewBuffer(objectlist)
|
||||
return objectListBuffer, nil
|
||||
}
|
||||
|
||||
func fsGet(config inputConfig, objectPath string) (io.Reader, error) {
|
||||
var objectStorage storage.ObjectStorage
|
||||
rootDir := path.Join(config.rootDir, config.storageDriver)
|
||||
|
||||
@@ -14,11 +14,19 @@ func get(c *cli.Context) {
|
||||
log.Fatal(err)
|
||||
}
|
||||
var objectReader io.Reader
|
||||
objectName := c.Args().Get(0)
|
||||
|
||||
switch config.storageDriver {
|
||||
case "fs":
|
||||
{
|
||||
if objectReader, err = fsGet(config, c.Args().Get(0)); err != nil {
|
||||
log.Fatal(err)
|
||||
if len(objectName) == 0 {
|
||||
if objectReader, err = fsGetList(config); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
} else {
|
||||
if objectReader, err = fsGet(config, objectName); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
default:
|
||||
@@ -28,25 +36,3 @@ func get(c *cli.Context) {
|
||||
}
|
||||
io.Copy(os.Stdout, objectReader)
|
||||
}
|
||||
|
||||
func put(c *cli.Context) {
|
||||
config, err := parseInput(c)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
filePath := c.Args().Get(1)
|
||||
inputFile, err := os.Open(filePath)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
switch config.storageDriver {
|
||||
case "fs":
|
||||
{
|
||||
fsPut(config, c.Args().Get(0), inputFile)
|
||||
}
|
||||
default:
|
||||
{
|
||||
log.Fatal("Unknown driver")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -176,5 +176,23 @@ func getMinioDir() string {
|
||||
log.Fatal(err)
|
||||
}
|
||||
homePath := user.HomeDir
|
||||
return path.Join(homePath, ".minio")
|
||||
minioPath := path.Join(homePath, ".minio")
|
||||
err = _initMinioDir(minioPath)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
return minioPath
|
||||
}
|
||||
|
||||
func _initMinioDir(dirPath string) error {
|
||||
_, err := os.Lstat(dirPath)
|
||||
if err != nil {
|
||||
log.Printf("%s not found, creating a new-one for the first time",
|
||||
dirPath)
|
||||
err = os.Mkdir(dirPath, 0700)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -1 +1,33 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"log"
|
||||
"os"
|
||||
|
||||
"github.com/codegangsta/cli"
|
||||
)
|
||||
|
||||
func put(c *cli.Context) {
|
||||
config, err := parseInput(c)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
filePath := c.Args().Get(0)
|
||||
if len(filePath) == 0 {
|
||||
log.Fatal("Please specify a valid object name \n # erasure-demo put <OBJECTNAME>")
|
||||
}
|
||||
inputFile, err := os.Open(filePath)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
switch config.storageDriver {
|
||||
case "fs":
|
||||
{
|
||||
fsPut(config, c.Args().Get(0), inputFile)
|
||||
}
|
||||
default:
|
||||
{
|
||||
log.Fatal("Unknown driver")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user