diff options
| author | Aldo Cortesi <aldo@corte.si> | 2018-05-02 09:32:27 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2018-05-02 09:43:42 +1200 |
| commit | e96340843401d677d5e8272d562b48fe4358362a (patch) | |
| tree | 6ffa74488dae93f71c57919189cb83444db017cb | |
| parent | 42b04a54131c9abeecf3c8a3a7207645e01a9fc1 (diff) | |
| download | mitmproxy-e96340843401d677d5e8272d562b48fe4358362a.tar.gz mitmproxy-e96340843401d677d5e8272d562b48fe4358362a.tar.bz2 mitmproxy-e96340843401d677d5e8272d562b48fe4358362a.zip | |
console: use replay count commands in statusbar
Also add a periodic refresh every 0.5 seconds for the statusbar. This is in
addition to refreshes upon event update notifications, and picks up replay
status changes not linked to flow events.
| -rw-r--r-- | mitmproxy/addons/serverplayback.py | 2 | ||||
| -rw-r--r-- | mitmproxy/tools/console/statusbar.py | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/mitmproxy/addons/serverplayback.py b/mitmproxy/addons/serverplayback.py index ce0705ef..efc7d359 100644 --- a/mitmproxy/addons/serverplayback.py +++ b/mitmproxy/addons/serverplayback.py @@ -100,7 +100,7 @@ class ServerPlayback: ctx.master.addons.trigger("update", []) @command.command("replay.server.count") - def count(self): + def count(self) -> int: return sum([len(i) for i in self.flowmap.values()]) def _hash(self, flow): diff --git a/mitmproxy/tools/console/statusbar.py b/mitmproxy/tools/console/statusbar.py index 1e1c0b92..ccf5e2e0 100644 --- a/mitmproxy/tools/console/statusbar.py +++ b/mitmproxy/tools/console/statusbar.py @@ -158,6 +158,7 @@ class ActionBar(urwid.WidgetWrap): class StatusBar(urwid.WidgetWrap): + REFRESHTIME = 0.5 # Timed refresh time in seconds keyctx = "" def __init__( @@ -173,7 +174,11 @@ class StatusBar(urwid.WidgetWrap): master.options.changed.connect(self.sig_update) master.view.focus.sig_change.connect(self.sig_update) master.view.sig_view_add.connect(self.sig_update) + self.refresh() + + def refresh(self): self.redraw() + signals.call_in.send(seconds=self.REFRESHTIME, callback=self.refresh) def sig_update(self, sender, flow=None, updated=None): self.redraw() @@ -184,7 +189,7 @@ class StatusBar(urwid.WidgetWrap): def get_status(self): r = [] - sreplay = self.master.addons.get("serverplayback") + sreplay = self.master.commands.call("replay.server.count") creplay = self.master.commands.call("replay.client.count") if len(self.master.options.setheaders): @@ -197,10 +202,10 @@ class StatusBar(urwid.WidgetWrap): r.append("[") r.append(("heading_key", "cplayback")) r.append(":%s]" % creplay) - if sreplay.count(): + if sreplay: r.append("[") r.append(("heading_key", "splayback")) - r.append(":%s]" % sreplay.count()) + r.append(":%s]" % sreplay) if self.master.options.ignore_hosts: r.append("[") r.append(("heading_key", "I")) |