Use objectName with basename for the filepath

This commit is contained in:
Harshavardhana 2014-12-11 15:35:25 -08:00
parent 94e11db3a8
commit dddc555491
2 changed files with 15 additions and 7 deletions

View File

@ -31,10 +31,16 @@ func get(c *cli.Context) {
} }
case "erasure": case "erasure":
{ {
if len(objectName) == 0 {
if objectReader, err = erasureGetList(config); err != nil {
log.Fatal(err)
}
} else {
if objectReader, err = erasureGet(config, objectName); err != nil { if objectReader, err = erasureGet(config, objectName); err != nil {
log.Fatal(err) log.Fatal(err)
} }
} }
}
default: default:
{ {
log.Fatal("Unknown driver") log.Fatal("Unknown driver")

View File

@ -3,6 +3,7 @@ package main
import ( import (
"log" "log"
"os" "os"
"path"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
) )
@ -12,12 +13,13 @@ func put(c *cli.Context) {
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
objectPath := c.Args().Get(0) var filePath, objectName string
var filePath string
switch len(c.Args()) { switch len(c.Args()) {
case 1: case 1:
filePath = objectPath objectName = path.Base(c.Args().Get(0))
filePath = c.Args().Get(0)
case 2: case 2:
objectName = c.Args().Get(0)
filePath = c.Args().Get(1) filePath = c.Args().Get(1)
default: default:
log.Fatal("Please specify a valid object name \n # erasure-demo put [OBJECTNAME] [FILENAME]") log.Fatal("Please specify a valid object name \n # erasure-demo put [OBJECTNAME] [FILENAME]")
@ -29,13 +31,13 @@ func put(c *cli.Context) {
switch config.storageDriver { switch config.storageDriver {
case "fs": case "fs":
{ {
if err := fsPut(config, c.Args().Get(0), inputFile); err != nil { if err := fsPut(config, objectName, inputFile); err != nil {
log.Fatal(err) log.Fatal(err)
} }
} }
case "erasure": case "erasure":
{ {
if err := erasurePut(config, c.Args().Get(0), inputFile); err != nil { if err := erasurePut(config, objectName, inputFile); err != nil {
log.Fatal(err) log.Fatal(err)
} }
} }