kylefang/mitmproxy
1
0
Fork 0
mirror of https://github.com/zhigang1992/mitmproxy.git synced 2026-04-28 20:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

More sensible display mode override indicator.

Browse Source
This commit is contained in:
Aldo Cortesi
2012-04-02 11:10:55 +12:00
parent c6ee813479
commit 7ed1c1c231
1 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
libmproxy/console/flowview.py
View File

@@ -135,30 +135,41 @@ class FlowView(common.WWrap):
conn.content,
)
def _conn_text(self, conn, viewmode):
def conn_text(self, conn):
txt = common.format_keyvals(
[(h+":", v) for (h, v) in conn.headers.lst],
key = "header",
val = "text"
)
if conn.content:
override = self.state.get_flow_setting(
self.flow,
(self.state.view_flow_mode, "prettyview"),
)
viewmode = self.state.default_body_view if override is None else override
msg, body = self.content_view(viewmode, conn)
title = urwid.AttrWrap(urwid.Columns([
cols = [
urwid.Text(
[
("heading", msg),
]
),
urwid.Text(
[
" ",
('heading', "["),
('heading_key', "m"),
('heading', (":%s]"%contentview.VIEW_NAMES[viewmode])),
],
align="right"
),
]), "heading")
)
]
if override is not None:
cols.append(
urwid.Text(
[
" ",
('heading', "["),
('heading_key', "m"),
('heading', (":%s]"%contentview.VIEW_NAMES[viewmode])),
],
align="right"
)
)
title = urwid.AttrWrap(urwid.Columns(cols), "heading")
txt.append(title)
txt.extend(body)
return urwid.ListBox(txt)
@@ -199,28 +210,14 @@ class FlowView(common.WWrap):
def view_request(self):
self.state.view_flow_mode = common.VIEW_FLOW_REQUEST
body = self._conn_text(
self.flow.request,
self.state.get_flow_setting(
self.flow,
(common.VIEW_FLOW_REQUEST, "prettyview"),
self.state.default_body_view
)
)
body = self.conn_text(self.flow.request)
self.w = self.wrap_body(common.VIEW_FLOW_REQUEST, body)
self.master.statusbar.redraw()
def view_response(self):
self.state.view_flow_mode = common.VIEW_FLOW_RESPONSE
if self.flow.response:
body = self._conn_text(
self.flow.response,
self.state.get_flow_setting(
self.flow,
(common.VIEW_FLOW_RESPONSE, "prettyview"),
self.state.default_body_view
)
)
body = self.conn_text(self.flow.response)
else:
body = urwid.ListBox(
[