Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1385 from mitmproxy/console

Browse Source 
console: nopop, rheaders into Options
This commit is contained in:
Aldo Cortesi 2016-07-21 17:06:38 +12:00 committed by GitHub
commit c090e02848
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mitmproxy/console/flowlist.py
View File

@ -152,8 +152,8 @@ class ConnectionItem(urwid.WidgetWrap):
if k == "a": if k == "a":
self.master.start_server_playback( self.master.start_server_playback(
[i.copy() for i in self.master.state.view], [i.copy() for i in self.master.state.view],
self.master.options.kill, self.master.rheaders, self.master.options.kill, self.master.options.rheaders,
False, self.master.nopop, False, self.master.options.nopop,
self.master.options.replay_ignore_params, self.master.options.replay_ignore_params,
self.master.options.replay_ignore_content, self.master.options.replay_ignore_content,
self.master.options.replay_ignore_payload_params, self.master.options.replay_ignore_payload_params,
@ -162,8 +162,8 @@ class ConnectionItem(urwid.WidgetWrap):
elif k == "t": elif k == "t":
self.master.start_server_playback( self.master.start_server_playback(
[self.flow.copy()], [self.flow.copy()],
self.master.options.kill, self.master.rheaders, self.master.options.kill, self.master.options.rheaders,
False, self.master.nopop, False, self.master.options.nopop,
self.master.options.replay_ignore_params, self.master.options.replay_ignore_params,
self.master.options.replay_ignore_content, self.master.options.replay_ignore_content,
self.master.options.replay_ignore_payload_params, self.master.options.replay_ignore_payload_params,

6
mitmproxy/console/master.py
View File

@ -221,8 +221,6 @@ class ConsoleMaster(flow.FlowMaster):
self.set_stream_large_bodies(options.stream_large_bodies) self.set_stream_large_bodies(options.stream_large_bodies)
self.rheaders = options.rheaders
self.nopop = options.nopop
self.palette = options.palette self.palette = options.palette
self.palette_transparent = options.palette_transparent self.palette_transparent = options.palette_transparent
@ -370,8 +368,8 @@ class ConsoleMaster(flow.FlowMaster):
if flows: if flows:
self.start_server_playback( self.start_server_playback(
flows, flows,
self.options.kill, self.rheaders, self.options.kill, self.options.rheaders,
False, self.nopop, False, self.options.nopop,
self.options.replay_ignore_params, self.options.replay_ignore_params,
self.options.replay_ignore_content, self.options.replay_ignore_content,
self.options.replay_ignore_payload_params, self.options.replay_ignore_payload_params,

2
mitmproxy/console/statusbar.py
View File

@ -151,7 +151,7 @@ class StatusBar(urwid.WidgetWrap):
if self.master.server_playback: if self.master.server_playback:
r.append("[") r.append("[")
r.append(("heading_key", "splayback")) r.append(("heading_key", "splayback"))
if self.master.nopop: if self.master.options.nopop:
r.append(":%s in file]" % self.master.server_playback.count()) r.append(":%s in file]" % self.master.server_playback.count())
else: else:
r.append(":%s to go]" % self.master.server_playback.count()) r.append(":%s to go]" % self.master.server_playback.count())