diff options
| -rw-r--r-- | libmproxy/console/common.py | 8 | ||||
| -rw-r--r-- | libmproxy/console/flowview.py | 41 |
2 files changed, 18 insertions, 31 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index 84dc8aef..29e59373 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -166,7 +166,7 @@ def raw_format_flow(f, focus, extended, padding): return urwid.Pile(pile) ## common save body parts -def _save_body(path, master, state, content): +def save_body(path, master, state, content): if not path: return state.last_saveload = path @@ -178,12 +178,12 @@ def _save_body(path, master, state, content): except IOError, v: master.statusbar.message(v.strerror) -def save_body(k, master, state, content): +def ask_save_body(k, master, state, content): if k == "y": master.path_prompt( "Save response body: ", state.last_saveload, - _save_body, + save_body, master, state, content, @@ -202,7 +202,7 @@ def server_copy_response( k, master, state, response): ("yes", "y"), ("no", "n"), ), - save_body, + ask_save_body, master, state, response.get_decoded_content(), diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py index bc0b5f83..b964b92a 100644 --- a/libmproxy/console/flowview.py +++ b/libmproxy/console/flowview.py @@ -508,22 +508,6 @@ class FlowView(common.WWrap): self.flow.request.method = i[0].upper() self.master.refresh_flow(self.flow) - def save_body(self, path): - if not path: - return - self.state.last_saveload = path - if self.state.view_flow_mode == common.VIEW_FLOW_REQUEST: - c = self.flow.request - else: - c = self.flow.response - path = os.path.expanduser(path) - try: - f = file(path, "wb") - f.write(str(c.content)) - f.close() - except IOError, v: - self.master.statusbar.message(v.strerror) - def set_url(self, url): request = self.flow.request try: @@ -691,17 +675,20 @@ class FlowView(common.WWrap): elif key == "b": if conn: if self.state.view_flow_mode == common.VIEW_FLOW_REQUEST: - self.master.path_prompt( - "Save request body: ", - self.state.last_saveload, - self.save_body - ) - else: - self.master.path_prompt( - "Save response body: ", - self.state.last_saveload, - self.save_body - ) + msg = "Save request body: " + content = self.flow.request.content + else: + msg = "Save response body: " + content = self.flow.response.content + + self.master.path_prompt( + msg, + self.state.last_saveload, + common.save_body, + self.master, + self.state, + content, + ) elif key == "d": if self.state.flow_count() == 1: self.master.view_flowlist() |