diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-10-18 11:29:07 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-10-18 11:29:51 +1300 |
| commit | 825b02d495ef762f22b44d48ed9d923f8c54220a (patch) | |
| tree | aa7acbba4e317a899c0d035023ebd3c250d73672 /mitmproxy | |
| parent | b25d94a6ac77ec789076b148be31bc99ad74616c (diff) | |
| download | mitmproxy-825b02d495ef762f22b44d48ed9d923f8c54220a.tar.gz mitmproxy-825b02d495ef762f22b44d48ed9d923f8c54220a.tar.bz2 mitmproxy-825b02d495ef762f22b44d48ed9d923f8c54220a.zip | |
master.duplicate_flow -> state.duplicate_flow
This is a pure operation on state, and doesn't belong on master.
Part of prep to move state to an addon.
Diffstat (limited to 'mitmproxy')
| -rw-r--r-- | mitmproxy/console/flowlist.py | 2 | ||||
| -rw-r--r-- | mitmproxy/console/flowview.py | 2 | ||||
| -rw-r--r-- | mitmproxy/flow/master.py | 9 | ||||
| -rw-r--r-- | mitmproxy/flow/state.py | 9 | ||||
| -rw-r--r-- | mitmproxy/web/app.py | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/mitmproxy/console/flowlist.py b/mitmproxy/console/flowlist.py index ebba1ea4..653dfa02 100644 --- a/mitmproxy/console/flowlist.py +++ b/mitmproxy/console/flowlist.py @@ -166,7 +166,7 @@ class ConnectionItem(urwid.WidgetWrap): self.state.delete_flow(self.flow) signals.flowlist_change.send(self) elif key == "D": - f = self.master.duplicate_flow(self.flow) + f = self.master.state.duplicate_flow(self.flow) self.master.state.set_focus_flow(f) signals.flowlist_change.send(self) elif key == "m": diff --git a/mitmproxy/console/flowview.py b/mitmproxy/console/flowview.py index 4aa09bd9..0422e72b 100644 --- a/mitmproxy/console/flowview.py +++ b/mitmproxy/console/flowview.py @@ -536,7 +536,7 @@ class FlowView(tabs.Tabs): f.kill(self.master) self.state.delete_flow(f) elif key == "D": - f = self.master.duplicate_flow(self.flow) + f = self.master.state.duplicate_flow(self.flow) signals.pop_view_state.send(self) self.master.view_flow(f) signals.status_message.send(message="Duplicated.") diff --git a/mitmproxy/flow/master.py b/mitmproxy/flow/master.py index 02e5246f..3d57c7bd 100644 --- a/mitmproxy/flow/master.py +++ b/mitmproxy/flow/master.py @@ -57,15 +57,6 @@ class FlowMaster(controller.Master): def start_app(self, host, port): self.apps.add(app.mapp, host, port) - def duplicate_flow(self, f): - """ - Duplicate flow, and insert it into state without triggering any of - the normal flow events. - """ - f2 = f.copy() - self.state.add_flow(f2) - return f2 - def create_request(self, method, scheme, host, port, path): """ this method creates a new artificial and minimalist request also adds it to flowlist diff --git a/mitmproxy/flow/state.py b/mitmproxy/flow/state.py index cb01f6fe..8c8e75c7 100644 --- a/mitmproxy/flow/state.py +++ b/mitmproxy/flow/state.py @@ -261,6 +261,15 @@ class State: def killall(self, master): self.flows.kill_all(master) + def duplicate_flow(self, f): + """ + Duplicate flow, and insert it into state without triggering any of + the normal flow events. + """ + f2 = f.copy() + self.add_flow(f2) + return f2 + class DummyState: flows = () diff --git a/mitmproxy/web/app.py b/mitmproxy/web/app.py index 1aab8e8c..46bdd9e3 100644 --- a/mitmproxy/web/app.py +++ b/mitmproxy/web/app.py @@ -275,7 +275,7 @@ class FlowHandler(RequestHandler): class DuplicateFlow(RequestHandler): def post(self, flow_id): - self.master.duplicate_flow(self.flow) + self.master.state.duplicate_flow(self.flow) class RevertFlow(RequestHandler): |