Changeset 28 for trunk/bin/bletchley-analyze

Timestamp:

12/21/12 22:44:29 (12 years ago)

Author:

tmorgan

Message:

more documentation
added supported encodings listing

File:

• trunk/bin/bletchley-analyze (modified) (2 diffs)

trunk/bin/bletchley-analyze

@@ -29 +29 @@
 
 
-parser = argparse.ArgumentParser(description='Analyzes samples of encrypted data in an attempt to decode samples to binary and identify patterns useful in cryptanalysis.')
+parser = argparse.ArgumentParser(
+    description='Analyzes samples of encrypted data in an attempt to decode'
+    ' samples to binary and identify patterns useful in cryptanalysis.'
+    ' For more information, see:  http://code.google.com/p/bletchley/wiki/Overview')
 parser.add_argument('input_file', nargs='?', default=None,
-                    help='File containing encrypted blobs to analyze, one per line. Omit to read from stdin.')
+                    help='File containing encrypted blobs to analyze, one per'
+                    ' line. Omit to read from stdin.')
 parser.add_argument('-e', dest='encoding_chain', type=str, default=None,
-                    help='Comma-separated sequence of formats used to encode the tokens, beginning with the last one applied. (default: auto-detect)')
+                    help='Comma-separated sequence of formats used to encode'
+                    ' the tokens, beginning with the last one applied. '
+                    '(default: auto-detect. Use "?" for a listing of supported encodings.)')
 parser.add_argument('-b', dest='block_size', type=int, default=8,
                     help='The block size displayed and used in highlighting (default: 8)')
@@ -44 +50 @@
 options = parser.parse_args()
 
+if options.encoding_chain == '?':
+    print('\n\t'.join(['Supported encodings:']+blobtools.supportedEncodings()))
+    sys.exit(0)
+
 input_file = sys.stdin
 if options.input_file is not None:
     input_file = file(options.input_file, 'rb')
-
 
 blobs = input_file.read().rstrip('\n').replace('\r', '').split('\n')