1
0
mirror of https://github.com/minio/mc.git synced 2025-11-13 12:22:45 +03:00

Make ./mc ls multi-target

This commit is contained in:
Harshavardhana
2015-04-12 23:40:09 -07:00
parent c999798d5e
commit 4f3db3d263
2 changed files with 32 additions and 28 deletions

View File

@@ -67,44 +67,41 @@ func doListCmd(ctx *cli.Context) {
if len(ctx.Args()) < 1 {
cli.ShowCommandHelpAndExit(ctx, "ls", 1) // last argument is exit code
}
config, err := getMcConfig()
if err != nil {
log.Debug.Println(iodine.New(err, nil))
console.Fatalln("Unable to get config")
}
urlStr, err := parseURL(ctx.Args().First(), config.Aliases)
if err != nil {
log.Debug.Println(iodine.New(err, nil))
console.Fatalln(err)
}
client, err := getNewClient(urlStr, globalDebugFlag)
if err != nil {
log.Debug.Println(iodine.New(err, nil))
console.Fatalln(err)
}
bucketName, objectName, err := url2Object(urlStr)
if err != nil {
log.Debug.Println(iodine.New(err, nil))
console.Fatalln(err)
}
if bucketName == "" { // List all buckets
buckets, err := client.ListBuckets()
for _, arg := range ctx.Args() {
urlStr, err := parseURL(arg, config.Aliases)
if err != nil {
log.Debug.Println(iodine.New(err, nil))
console.Fatalln(err)
}
printBuckets(buckets)
} else {
items, err = client.ListObjects(bucketName, objectName)
client, err := getNewClient(urlStr, globalDebugFlag)
if err != nil {
log.Debug.Println(iodine.New(err, nil))
console.Fatalln(err)
}
printObjects(items)
bucketName, objectName, err := url2Object(urlStr)
if err != nil {
log.Debug.Println(iodine.New(err, nil))
console.Fatalln(err)
}
if bucketName == "" { // List all buckets
buckets, err := client.ListBuckets()
if err != nil {
log.Debug.Println(iodine.New(err, nil))
console.Fatalln(err)
}
printBuckets(buckets)
} else {
items, err = client.ListObjects(bucketName, objectName)
if err != nil {
log.Debug.Println(iodine.New(err, nil))
console.Fatalln(err)
}
printObjects(items)
}
}
}

View File

@@ -67,7 +67,7 @@ EXAMPLES:
mc {{.Name}} - {{.Usage}}
USAGE:
mc {{.Name}} TARGET {{if .Description}}
mc {{.Name}} TARGET [TARGET...] {{if .Description}}
DESCRIPTION:
{{.Description}}{{end}}{{if .Flags}}
@@ -87,6 +87,13 @@ EXAMPLES:
2015-01-20 15:42:00 PST rom
2015-01-15 00:05:40 PST zek
3. List buckets and objects from Minio object storage and Amazon S3 object storage
$ mc {{.Name}} https://s3.amazonaws.com/ http://localhost:9000/backup/
2015-01-20 15:42:00 PST rom
2015-01-15 00:05:40 PST zek
2015-03-28 12:47:50 PDT 51.00 MB 2006-Jan-1/backup.tar.gz
2015-03-31 14:46:33 PDT 55.00 MB 2006-Mar-1/backup.tar.gz
`,
}
@@ -99,7 +106,7 @@ EXAMPLES:
mc {{.Name}} - {{.Usage}}
USAGE:
mc {{.Name}} TARGET {{if .Description}}
mc {{.Name}} TARGET [TARGET...] {{if .Description}}
DESCRIPTION:
{{.Description}}{{end}}{{if .Flags}}