Merge branch 'master' into 2221-complete-docker

[arvados.git] / sdk / python / bin / arv-ls

diff --git a/sdk/python/bin/arv-ls b/sdk/python/bin/arv-ls
index c96f4cfa552f4ac039787f9152d596908a3f58ac..9cfd5e4e21726121e7f2f919aff9fa2144816fad 100755 (executable)
--- a/sdk/python/bin/arv-ls
+++ b/sdk/python/bin/arv-ls
@@ -15,9 +15,11 @@ parser = argparse.ArgumentParser(
 
 parser.add_argument('locator', type=str,
                     help="""
-Collection locator, optionally with a file path or prefix.
+Collection locator
 """)
 
+parser.add_argument('-s', action='store_true', help="""List file sizes, in KiB.""")
+
 args = parser.parse_args()
 
 import arvados
@@ -25,4 +27,7 @@ import arvados
 cr = arvados.CollectionReader(arvados.Keep.get(args.locator))
 
 for f in cr.all_files():
-    print(f.stream_name() + "/" + f.name())
+    if args.s:
+        print "{:>10} {}".format(f.size() / 1024, f.stream_name() + "/" + f.name())
+    else:
+        print f.stream_name() + "/" + f.name()