diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-12-16 17:26:19 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-16 17:26:19 +1300 |
| commit | 6695ce462405b8691a0cc4d8110f67f2bd871bc5 (patch) | |
| tree | 59db0ec41e7ae47d906d841393b8dbf02430b9fc | |
| parent | e769b1fa9a80c41bab0fa2a200f8c51fc10a3d32 (diff) | |
| parent | e387c68b387a0c664743d416d9b32a669f3c1c16 (diff) | |
| download | mitmproxy-6695ce462405b8691a0cc4d8110f67f2bd871bc5.tar.gz mitmproxy-6695ce462405b8691a0cc4d8110f67f2bd871bc5.tar.bz2 mitmproxy-6695ce462405b8691a0cc4d8110f67f2bd871bc5.zip | |
Merge pull request #1861 from cortesi/marking
console: mark view indiciator, fix empty flow list behaviour
| -rw-r--r-- | mitmproxy/tools/console/flowlist.py | 4 | ||||
| -rw-r--r-- | mitmproxy/tools/console/statusbar.py | 6 | ||||
| -rw-r--r-- | test/mitmproxy/addons/test_view.py | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/mitmproxy/tools/console/flowlist.py b/mitmproxy/tools/console/flowlist.py index fd6b3bab..7d502cd1 100644 --- a/mitmproxy/tools/console/flowlist.py +++ b/mitmproxy/tools/console/flowlist.py @@ -178,8 +178,6 @@ class FlowItem(urwid.WidgetWrap): elif key == "m": self.flow.marked = not self.flow.marked signals.flowlist_change.send(self) - elif key == "M": - self.master.view.toggle_marked() elif key == "r": try: self.master.replay_request(self.flow) @@ -375,6 +373,8 @@ class FlowListBox(urwid.ListBox): prompt = "Load flows", callback = self.master.load_flows_callback ) + elif key == "M": + self.master.view.toggle_marked() elif key == "n": signals.status_prompt_onekey.send( prompt = "Method", diff --git a/mitmproxy/tools/console/statusbar.py b/mitmproxy/tools/console/statusbar.py index dce8605f..785dc766 100644 --- a/mitmproxy/tools/console/statusbar.py +++ b/mitmproxy/tools/console/statusbar.py @@ -263,8 +263,12 @@ class StatusBar(urwid.WidgetWrap): else: arrow = common.SYMBOL_DOWN + marked = "" + if self.master.view.show_marked: + marked = "M" + t = [ - ('heading', ("%s [%s/%s]" % (arrow, offset, fc)).ljust(11)), + ('heading', ("%s %s [%s/%s]" % (arrow, marked, offset, fc)).ljust(11)), ] if self.master.server.bound: diff --git a/test/mitmproxy/addons/test_view.py b/test/mitmproxy/addons/test_view.py index 27e10058..96f213e2 100644 --- a/test/mitmproxy/addons/test_view.py +++ b/test/mitmproxy/addons/test_view.py @@ -123,6 +123,11 @@ def test_filter(): v.set_filter(None) assert len(v) == 4 + v.toggle_marked() + assert len(v) == 0 + v.toggle_marked() + assert len(v) == 4 + v[1].marked = True v.toggle_marked() assert len(v) == 1 |