Merge pull request #1862 from mhils/remove-intercept-events

Remove intercept events, update view manually

4 files changed, 23 insertions, 18 deletions

diff --git a/mitmproxy/tools/console/flowlist.py b/mitmproxy/tools/console/flowlist.py
index 7d502cd1..1fe0be73 100644
--- a/mitmproxy/tools/console/flowlist.py
+++ b/mitmproxy/tools/console/flowlist.py
@@ -165,12 +165,12 @@ class FlowItem(urwid.WidgetWrap):
         (maxcol,) = xxx_todo_changeme
         key = common.shortcuts(key)
         if key == "a":
-            self.flow.resume(self.master)
-            signals.flowlist_change.send(self)
+            self.flow.resume()
+            self.master.view.update(self.flow)
         elif key == "d":
             if self.flow.killable:
-                self.flow.kill(self.master)
-            self.master.view.remove(self.master.view.focus.flow)
+                self.flow.kill()
+            self.master.view.remove(self.flow)
         elif key == "D":
             cp = self.flow.copy()
             self.master.view.add(cp)
@@ -230,7 +230,8 @@ class FlowItem(urwid.WidgetWrap):
             )
         elif key == "X":
             if self.flow.killable:
-                self.flow.kill(self.master)
+                self.flow.kill()
+                self.master.view.update(self.flow)
         elif key == "enter":
             if self.flow.request:
                 self.master.view_flow(self.flow)
@@ -349,8 +350,8 @@ class FlowListBox(urwid.ListBox):
         if key == "A":
             for f in self.master.view:
                 if f.intercepted:
-                    f.resume(self.master)
-            signals.flowlist_change.send(self)
+                    f.resume()
+                    self.master.view.update(f)
         elif key == "z":
             self.master.view.clear()
         elif key == "e":
diff --git a/mitmproxy/tools/console/flowview.py b/mitmproxy/tools/console/flowview.py
index efeab647..a97a9b31 100644
--- a/mitmproxy/tools/console/flowview.py
+++ b/mitmproxy/tools/console/flowview.py
@@ -510,16 +510,16 @@ class FlowView(tabs.Tabs):
             # Pass scroll events to the wrapped widget
             self._w.keypress(size, key)
         elif key == "a":
-            self.flow.resume(self.master)
-            signals.flow_change.send(self, flow = self.flow)
+            self.flow.resume()
+            self.master.view.update(self.flow)
         elif key == "A":
             for f in self.view:
                 if f.intercepted:
-                    f.resume(self.master)
-                    signals.flow_change.send(self, flow=f)
+                    f.resume()
+                    self.master.view.update(self.flow)
         elif key == "d":
             if self.flow.killable:
-                self.flow.kill(self.master)
+                self.flow.kill()
             self.view.remove(self.flow)
             if not self.view.focus.flow:
                 self.master.view_flowlist()
diff --git a/mitmproxy/tools/web/app.py b/mitmproxy/tools/web/app.py
index adbbe160..ce18c6f0 100644
--- a/mitmproxy/tools/web/app.py
+++ b/mitmproxy/tools/web/app.py
@@ -226,31 +226,35 @@ class ClearAll(RequestHandler):
 class ResumeFlows(RequestHandler):
     def post(self):
         for f in self.view:
-            f.resume(self.master)
+            f.resume()
+            self.view.update(f)
 
 
 class KillFlows(RequestHandler):
     def post(self):
         for f in self.view:
             if f.killable:
-                f.kill(self.master)
+                f.kill()
+                self.view.update(f)
 
 
 class ResumeFlow(RequestHandler):
     def post(self, flow_id):
-        self.flow.resume(self.master)
+        self.flow.resume()
+        self.view.update(self.flow)
 
 
 class KillFlow(RequestHandler):
     def post(self, flow_id):
         if self.flow.killable:
-            self.flow.kill(self.master)
+            self.flow.kill()
+            self.view.update(self.flow)
 
 
 class FlowHandler(RequestHandler):
     def delete(self, flow_id):
         if self.flow.killable:
-            self.flow.kill(self.master)
+            self.flow.kill()
         self.view.remove(self.flow)
 
     def put(self, flow_id):
diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py
index db4855ff..68a3db70 100644
--- a/mitmproxy/tools/web/master.py
+++ b/mitmproxy/tools/web/master.py
@@ -31,9 +31,9 @@ class WebMaster(master.Master):
 
         self.addons.add(*addons.default_addons())
         self.addons.add(
+            intercept.Intercept(),
             self.view,
             self.events,
-            intercept.Intercept(),
             termlog.TermLog(),
         )
         self.app = app.Application(