diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-04-02 11:10:55 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-04-02 11:10:55 +1200 |
| commit | 7ed1c1c231674d149443d9845e36164dfe0cb6a0 (patch) | |
| tree | eba59efd00b65421e73a32af0d07db4e43cc8c75 | |
| parent | c6ee81347954a1f2b958f1aac901480bafe06cc6 (diff) | |
| download | mitmproxy-7ed1c1c231674d149443d9845e36164dfe0cb6a0.tar.gz mitmproxy-7ed1c1c231674d149443d9845e36164dfe0cb6a0.tar.bz2 mitmproxy-7ed1c1c231674d149443d9845e36164dfe0cb6a0.zip | |
More sensible display mode override indicator.
| -rw-r--r-- | libmproxy/console/flowview.py | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py index e21807c8..63b4db36 100644 --- a/libmproxy/console/flowview.py +++ b/libmproxy/console/flowview.py @@ -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( [ |