Merge branch 'master' into 4887-invalidate-duplicate-ip-on-old-compute-nodes

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

diff --git a/sdk/python/bin/arv-ls b/sdk/python/bin/arv-ls
index cccce59c812c9654aa9a730fce8fe0d68ca04469..23b99f24ce4bef779d6ced8ab235b377c6c9a758 100755 (executable)
--- a/sdk/python/bin/arv-ls
+++ b/sdk/python/bin/arv-ls
@@ -1,34 +1,7 @@
 #!/usr/bin/env python
 
-import argparse
-import hashlib
-import os
-import re
-import string
 import sys
-import logging
 
-logger = logging.getLogger(os.path.basename(sys.argv[0]))
+from arvados.commands.ls import main
 
-parser = argparse.ArgumentParser(
-    description='List contents of a manifest')
-
-parser.add_argument('locator', type=str,
-                    help="""
-Collection locator
-""")
-
-parser.add_argument('-s', action='store_true', help="""List file sizes, in KiB.""")
-
-args = parser.parse_args()
-
-import arvados
-
-cr = arvados.CollectionReader(arvados.Keep.get(args.locator))
-
-for f in cr.all_files():
-    if args.s:
-        print "{:>10} {}".format((f.size() + 1023) / 1024,
-                                 f.stream_name() + "/" + f.name())
-    else:
-        print f.stream_name() + "/" + f.name()
+sys.exit(main(sys.argv[1:], sys.stdout, sys.stderr))