diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-10-30 18:25:33 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-10-30 18:25:33 +1300 |
| commit | 5975cc8301f307ddf1c9b2bf4639d9e214080c74 (patch) | |
| tree | 3daed89967cbea14bd15d799cf5ae9f36f6055b0 | |
| parent | f08b57fb9bd03f2abf1a4f11d0d01ffc50e3582c (diff) | |
| download | mitmproxy-5975cc8301f307ddf1c9b2bf4639d9e214080c74.tar.gz mitmproxy-5975cc8301f307ddf1c9b2bf4639d9e214080c74.tar.bz2 mitmproxy-5975cc8301f307ddf1c9b2bf4639d9e214080c74.zip | |
console: status bar improvements
- Arrow to show flow order
- Hook statusbar up to focus change to fix some update issues
| -rw-r--r-- | mitmproxy/tools/console/common.py | 4 | ||||
| -rw-r--r-- | mitmproxy/tools/console/statusbar.py | 17 |
2 files changed, 16 insertions, 5 deletions
diff --git a/mitmproxy/tools/console/common.py b/mitmproxy/tools/console/common.py index 08bf0b67..cfc69bfc 100644 --- a/mitmproxy/tools/console/common.py +++ b/mitmproxy/tools/console/common.py @@ -123,10 +123,14 @@ if urwid.util.detected_encoding: SYMBOL_REPLAY = u"\u21ba" SYMBOL_RETURN = u"\u2190" SYMBOL_MARK = u"\u25cf" + SYMBOL_UP = u"\u21E7" + SYMBOL_DOWN = u"\u21E9" else: SYMBOL_REPLAY = u"[r]" SYMBOL_RETURN = u"<-" SYMBOL_MARK = "[m]" + SYMBOL_UP = "^" + SYMBOL_DOWN = " " # Save file to disk diff --git a/mitmproxy/tools/console/statusbar.py b/mitmproxy/tools/console/statusbar.py index 7d019f53..a1ac4298 100644 --- a/mitmproxy/tools/console/statusbar.py +++ b/mitmproxy/tools/console/statusbar.py @@ -119,12 +119,13 @@ class StatusBar(urwid.WidgetWrap): self.helptext = helptext self.ib = urwid.WidgetWrap(urwid.Text("")) super().__init__(urwid.Pile([self.ib, self.master.ab])) - signals.update_settings.connect(self.sig_update_settings) - signals.flowlist_change.connect(self.sig_update_settings) - master.options.changed.connect(self.sig_update_settings) + signals.update_settings.connect(self.sig_update) + signals.flowlist_change.connect(self.sig_update) + master.options.changed.connect(self.sig_update) + master.view.focus.sig_change.connect(self.sig_update) self.redraw() - def sig_update_settings(self, sender, updated=None): + def sig_update(self, sender, updated=None): self.redraw() def keypress(self, *args, **kwargs): @@ -229,8 +230,14 @@ class StatusBar(urwid.WidgetWrap): offset = 0 else: offset = self.master.view.focus.index + 1 + + if self.master.options.order_reversed: + arrow = common.SYMBOL_UP + else: + arrow = common.SYMBOL_DOWN + t = [ - ('heading', ("[%s/%s]" % (offset, fc)).ljust(9)) + ('heading', ("%s [%s/%s]" % (arrow, offset, fc)).ljust(11)), ] if self.master.server.bound: |