Add -r option to mitmdump and mitmproxy.

This option reads a set of flows from a file. I've also regularized the
mitmdump and mitmproxy command-line signatures by removing mitmproxy's old way
of specifying flow loads through naked arguments.

1 files changed, 1 insertions, 8 deletions

diff --git a/mitmproxy b/mitmproxy
index bcb079a3..942646b2 100755
--- a/mitmproxy
+++ b/mitmproxy
@@ -23,7 +23,7 @@ from optparse import OptionParser, OptionGroup
 
 if __name__ == '__main__':
     parser = OptionParser(
-                usage = "%prog [options] [flowdump path]",
+                usage = "%prog [options]",
                 version="%%prog %s"%VERSION,
             )
     cmdline.common_options(parser)
@@ -65,13 +65,6 @@ if __name__ == '__main__':
     opts.debug = options.debug
     m = console.ConsoleMaster(server, opts)
 
-    for i in args:
-        try:
-            m.load_flows(i)
-        except flow.FlowReadError, v:
-            print >> sys.stderr, "mitmproxy:", v.args[0]
-            sys.exit(1)
-
     m.run()