08d860570b
this was just supposed to add parallel uploads/downloads and it does do that, but i then found a bunch of bugs with respect to path handling that i thought i had under control. oops. so this adds a ton of tests and tries to make the logic in ulloc to be more consistent. almost all of the actual file handling bits and knowledge happens in cmd_cp now where it should belong. additionally, the s3 command has the behavior that if your bucket has the file s3://bucket/file, then executing s3 ls s3://bucket/fi returns nothing. this change makes uplinkng match that behavior even if i don't personally like it. a big portion of the weirdness is the concept introduced that i've named "directoryish", which intends to capture the behavior that if a user copies a file to that location then the base name of the source should be appended on rather than a direct copy. this concept is entirely a based on the string value and not the actual filesystem state. hence, the cp command is responsible for checking if local paths are actually a directory, and adding a trailing slash if necessary to make them "directoryish". additionally, the empty key for a bucket and the empty string for local paths are considered "directoryish". Change-Id: I9120d18616fd813b29ff81beed4f5993caa99fb6
124 lines
2.9 KiB
Go
124 lines
2.9 KiB
Go
// Copyright (C) 2021 Storj Labs, Inc.
|
|
// See LICENSE for copying information.
|
|
|
|
package main
|
|
|
|
import (
|
|
"strconv"
|
|
"time"
|
|
|
|
"github.com/zeebo/clingy"
|
|
|
|
"storj.io/storj/cmd/uplinkng/ulext"
|
|
"storj.io/storj/cmd/uplinkng/ulfs"
|
|
"storj.io/storj/cmd/uplinkng/ulloc"
|
|
)
|
|
|
|
type cmdLs struct {
|
|
ex ulext.External
|
|
|
|
access string
|
|
recursive bool
|
|
encrypted bool
|
|
pending bool
|
|
utc bool
|
|
|
|
prefix *ulloc.Location
|
|
}
|
|
|
|
func newCmdLs(ex ulext.External) *cmdLs {
|
|
return &cmdLs{ex: ex}
|
|
}
|
|
|
|
func (c *cmdLs) Setup(params clingy.Parameters) {
|
|
c.access = params.Flag("access", "Which access to use", "").(string)
|
|
c.recursive = params.Flag("recursive", "List recursively", false,
|
|
clingy.Short('r'),
|
|
clingy.Transform(strconv.ParseBool),
|
|
).(bool)
|
|
c.encrypted = params.Flag("encrypted", "Shows keys base64 encoded without decrypting", false,
|
|
clingy.Transform(strconv.ParseBool),
|
|
).(bool)
|
|
c.pending = params.Flag("pending", "List pending object uploads instead", false,
|
|
clingy.Transform(strconv.ParseBool),
|
|
).(bool)
|
|
c.utc = params.Flag("utc", "Show all timestamps in UTC instead of local time", false,
|
|
clingy.Transform(strconv.ParseBool),
|
|
).(bool)
|
|
|
|
c.prefix = params.Arg("prefix", "Prefix to list (sj://BUCKET[/KEY])", clingy.Optional,
|
|
clingy.Transform(ulloc.Parse),
|
|
).(*ulloc.Location)
|
|
}
|
|
|
|
func (c *cmdLs) Execute(ctx clingy.Context) error {
|
|
if c.prefix == nil {
|
|
return c.listBuckets(ctx)
|
|
}
|
|
return c.listLocation(ctx, *c.prefix)
|
|
}
|
|
|
|
func (c *cmdLs) listBuckets(ctx clingy.Context) error {
|
|
project, err := c.ex.OpenProject(ctx, c.access)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer func() { _ = project.Close() }()
|
|
|
|
tw := newTabbedWriter(ctx.Stdout(), "CREATED", "NAME")
|
|
defer tw.Done()
|
|
|
|
iter := project.ListBuckets(ctx, nil)
|
|
for iter.Next() {
|
|
item := iter.Item()
|
|
tw.WriteLine(formatTime(c.utc, item.Created), item.Name)
|
|
}
|
|
return iter.Err()
|
|
}
|
|
|
|
func (c *cmdLs) listLocation(ctx clingy.Context, prefix ulloc.Location) error {
|
|
fs, err := c.ex.OpenFilesystem(ctx, c.access, ulext.BypassEncryption(c.encrypted))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer func() { _ = fs.Close() }()
|
|
|
|
if fs.IsLocalDir(ctx, prefix) {
|
|
prefix = prefix.AsDirectoryish()
|
|
}
|
|
|
|
tw := newTabbedWriter(ctx.Stdout(), "KIND", "CREATED", "SIZE", "KEY")
|
|
defer tw.Done()
|
|
|
|
// create the object iterator of either existing objects or pending multipart uploads
|
|
var iter ulfs.ObjectIterator
|
|
if c.pending {
|
|
iter, err = fs.ListUploads(ctx, prefix, c.recursive)
|
|
} else {
|
|
iter, err = fs.ListObjects(ctx, prefix, c.recursive)
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// iterate and print the results
|
|
for iter.Next() {
|
|
obj := iter.Item()
|
|
if obj.IsPrefix {
|
|
tw.WriteLine("PRE", "", "", obj.Loc.Loc())
|
|
} else {
|
|
tw.WriteLine("OBJ", formatTime(c.utc, obj.Created), obj.ContentLength, obj.Loc.Loc())
|
|
}
|
|
}
|
|
return iter.Err()
|
|
}
|
|
|
|
func formatTime(utc bool, x time.Time) string {
|
|
if utc {
|
|
x = x.UTC()
|
|
} else {
|
|
x = x.Local()
|
|
}
|
|
return x.Format("2006-01-02 15:04:05")
|
|
}
|