diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-03-10 13:36:50 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-03-10 13:36:50 +1300 |
| commit | d3aad7a185cd0bbd611f3ad8de39f4d43913bd23 (patch) | |
| tree | a23d96d37f2101ef8fcc76c48a0f2de0b132fcad /libmproxy/console/__init__.py | |
| parent | e1356dd2b6a0293842d5ba4151ddc49f841f3cf6 (diff) | |
| parent | 041eafba73e911953caaab797eb34bf6f0820e7e (diff) | |
| download | mitmproxy-d3aad7a185cd0bbd611f3ad8de39f4d43913bd23.tar.gz mitmproxy-d3aad7a185cd0bbd611f3ad8de39f4d43913bd23.tar.bz2 mitmproxy-d3aad7a185cd0bbd611f3ad8de39f4d43913bd23.zip | |
Merge remote-tracking branch 'taiste/server-replay-pop'
Diffstat (limited to 'libmproxy/console/__init__.py')
| -rw-r--r-- | libmproxy/console/__init__.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index 7d936892..5d9c5da2 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -126,7 +126,10 @@ class StatusBar(common.WWrap): if self.master.server_playback: r.append("[") r.append(("heading_key", "splayback")) - r.append(":%s to go]"%self.master.server_playback.count()) + if self.master.nopop: + r.append(":%s in file]"%self.master.server_playback.count()) + else: + r.append(":%s to go]"%self.master.server_playback.count()) if self.master.state.intercept_txt: r.append("[") r.append(("heading_key", "i")) @@ -297,6 +300,7 @@ class Options(object): "stickyauth", "verbosity", "wfile", + "nopop", ] def __init__(self, **kwargs): for k, v in kwargs.items(): @@ -350,6 +354,7 @@ class ConsoleMaster(flow.FlowMaster): self.anticomp = options.anticomp self.killextra = options.kill self.rheaders = options.rheaders + self.nopop = options.nopop self.eventlog = options.eventlog self.eventlist = urwid.SimpleListWalker([]) @@ -422,7 +427,7 @@ class ConsoleMaster(flow.FlowMaster): self.start_server_playback( ret, self.killextra, self.rheaders, - False + False, self.nopop ) def spawn_editor(self, data): |