From f7217b006b13f6a2b712e5ba7f4fcae2d5fc77a3 Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Sat, 23 Jul 2016 13:19:59 +0530 Subject: [PATCH] Remove save marked flows prompt --- mitmproxy/console/flowlist.py | 12 +++--------- mitmproxy/console/master.py | 4 ---- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/mitmproxy/console/flowlist.py b/mitmproxy/console/flowlist.py index d722c970b..8aea9ea2f 100644 --- a/mitmproxy/console/flowlist.py +++ b/mitmproxy/console/flowlist.py @@ -126,16 +126,11 @@ class ConnectionItem(urwid.WidgetWrap): return True def save_flows_prompt(self, k): - if k == "a": + if k == "l": signals.status_prompt_path.send( - prompt = "Save all flows to", + prompt = "Save listed flows to", callback = self.master.save_flows ) - elif k == "m": - signals.status_prompt_path.send( - prompt = "Save marked flows to", - callback = self.master.save_marked_flows - ) else: signals.status_prompt_path.send( prompt = "Save this flow to", @@ -244,9 +239,8 @@ class ConnectionItem(urwid.WidgetWrap): self, prompt = "Save", keys = ( - ("all flows", "a"), + ("listed flows", "l"), ("this flow", "t"), - ("marked flows", "m"), ), callback = self.save_flows_prompt, ) diff --git a/mitmproxy/console/master.py b/mitmproxy/console/master.py index 499d6ea9a..f7c99ecb9 100644 --- a/mitmproxy/console/master.py +++ b/mitmproxy/console/master.py @@ -632,10 +632,6 @@ class ConsoleMaster(flow.FlowMaster): def save_flows(self, path): return self._write_flows(path, self.state.view) - def save_marked_flows(self, path): - marked_flows = [f for f in self.state.view if f.marked] - return self._write_flows(path, marked_flows) - def load_flows_callback(self, path): if not path: return