JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show file size for uplink ls command (#344)

Browse Source 
* Show file size for uplink ls command

* align size to right

* Fix stream store list method to handle meta.Size flag
This commit is contained in:
Michal Niewrzal 2018-09-12 15:03:31 +02:00 committed by Kaloyan Raev
parent 10d9420f24
commit e90c2140b8
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/uplink/cmd/ls.go
View File

@ -93,7 +93,7 @@ func listFiles(ctx context.Context, bs buckets.Store, u *url.URL, prependBucket
startAfter := paths.New("")
for {
items, more, err := o.List(ctx, paths.New(u.Path), startAfter, nil, *recursiveFlag, 0, meta.Modified)
items, more, err := o.List(ctx, paths.New(u.Path), startAfter, nil, *recursiveFlag, 0, meta.Modified|meta.Size)
if err != nil {
return err
}
@ -106,7 +106,7 @@ func listFiles(ctx context.Context, bs buckets.Store, u *url.URL, prependBucket
if object.IsPrefix {
fmt.Println("PRE", path+"/")
} else {
fmt.Println("OBJ", formatTime(object.Meta.Modified), path)
fmt.Printf("%v %v %12v %v\n", "OBJ", formatTime(object.Meta.Modified), object.Meta.Size, path)
}
}

7
pkg/storage/streams/store.go
View File

@ -15,6 +15,7 @@ import (
"storj.io/storj/pkg/paths"
ranger "storj.io/storj/pkg/ranger"
"storj.io/storj/pkg/storage/meta"
"storj.io/storj/pkg/storage/segments"
streamspb "storj.io/storj/protos/streams"
)
@ -233,6 +234,12 @@ func (s *streamStore) List(ctx context.Context, prefix, startAfter, endBefore pa
more bool, err error) {
defer mon.Task()(&ctx)(&err)
if metaFlags&meta.Size != 0 {
// Calculating the stream's size require also the user-defined metadata,
// where stream store keeps info about the number of segments and their size.
metaFlags |= meta.UserDefined
}
segments, more, err := s.segments.List(ctx, prefix.Prepend("l"), startAfter, endBefore, recursive, limit, metaFlags)
if err != nil {
return nil, false, err