11002: Merge branch 'master' into 11002-arvput-crash-fix

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

diff --git a/sdk/python/bin/arv-normalize b/sdk/python/bin/arv-normalize
index 755b56507289bbf1d5601ed3e9f238523a0dae1e..05a055e10855066588a707d539b2f250ea527be6 100755 (executable)
--- a/sdk/python/bin/arv-normalize
+++ b/sdk/python/bin/arv-normalize
@@ -6,21 +6,25 @@ import os
 import re
 import string
 import sys
-import logging
 
-logger = logging.getLogger(os.path.basename(sys.argv[0]))
+import arvados
+from arvados._version import __version__
 
 parser = argparse.ArgumentParser(
     description='Read manifest on standard input and put normalized manifest on standard output.')
 
-parser.add_argument('--extract', type=str, help="The file to extract from the input manifest")
+parser.add_argument('--extract', type=str,
+                    help="The file to extract from the input manifest")
+parser.add_argument('--strip', action='store_true',
+                    help="Strip authorization tokens")
+parser.add_argument('--version', action='version',
+                    version="%s %s" % (sys.argv[0], __version__),
+                    help='Print version and exit.')
 
 args = parser.parse_args()
 
-import arvados
-
 r = sys.stdin.read()
-    
+
 cr = arvados.CollectionReader(r)
 
 if args.extract:
@@ -36,4 +40,4 @@ if args.extract:
             if fn in s.files():
                 sys.stdout.write(s.files()[fn].as_manifest())
 else:
-    sys.stdout.write(cr.manifest_text())
+    sys.stdout.write(cr.manifest_text(strip=args.strip, normalize=True))