kylefang/mitmproxy
1
0
Fork 0
mirror of https://github.com/zhigang1992/mitmproxy.git synced 2026-04-24 04:14:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved marking from flow to console

Browse Source 
No longer taints the flow primitive
This commit is contained in:
Jake Drahos
2015-06-11 20:27:33 -05:00
parent f2d7a6aa57
commit 2a6698bf5a
5 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libmproxy/console/__init__.py
View File

@@ -48,6 +48,7 @@ class ConsoleState(flow.State):
self.set_focus(0)
elif self.follow_focus:
self.set_focus(len(self.view) - 1)
self.set_flow_marked(f, False)
return f
def update_flow(self, f):
@@ -100,12 +101,29 @@ class ConsoleState(flow.State):
return ret
def clear(self):
marked_flows = []
for f in self.flows:
if self.flow_marked(f):
marked_flows.append(f)
super(ConsoleState, self).clear()
for f in marked_flows:
self.add_flow(f)
self.set_flow_marked(f, True)
if len(self.flows.views) == 0:
self.focus = None
else:
self.focus = 0
self.set_focus(self.focus)
def flow_marked(self, flow):
return self.get_flow_setting(flow, "marked", False)
def set_flow_marked(self, flow, marked):
self.add_flow_setting(flow, "marked", marked)
class Options(object):
attributes = [
@@ -598,7 +616,7 @@ class ConsoleMaster(flow.FlowMaster):
def save_marked_flows(self, path):
marked_flows = []
for f in self.state.view:
if f.marked:
if self.state.flow_marked(f):
marked_flows.append(f)
return self._write_flows(path, marked_flows)