diff options
| -rw-r--r-- | .appveyor.yml | 4 | ||||
| -rw-r--r-- | mitmproxy/addons/view.py | 11 | ||||
| -rw-r--r-- | mitmproxy/tools/console/flowlist.py | 3 | ||||
| -rw-r--r-- | test/mitmproxy/addons/test_view.py | 7 |
4 files changed, 23 insertions, 2 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 31364c4a..53e33614 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -44,12 +44,12 @@ test_script: if (!(Test-Path "C:\projects\mitmproxy\release\installbuilder-installer.exe")) { "Download InstallBuilder..." (New-Object System.Net.WebClient).DownloadFile( - "https://installbuilder.bitrock.com/installbuilder-enterprise-16.11.1-windows-installer.exe", + "https://installbuilder.bitrock.com/installbuilder-enterprise-17.1.0-windows-installer.exe", "C:\projects\mitmproxy\release\installbuilder-installer.exe" ) } Start-Process "C:\projects\mitmproxy\release\installbuilder-installer.exe" "--mode unattended --unattendedmodeui none" -Wait - & 'C:\Program Files (x86)\BitRock InstallBuilder Enterprise 16.11.1\bin\builder-cli.exe' ` + & 'C:\Program Files (x86)\BitRock InstallBuilder Enterprise 17.1.0\bin\builder-cli.exe' ` build ` .\release\installbuilder\mitmproxy.xml ` windows ` diff --git a/mitmproxy/addons/view.py b/mitmproxy/addons/view.py index 8358a045..d2ab75f3 100644 --- a/mitmproxy/addons/view.py +++ b/mitmproxy/addons/view.py @@ -230,6 +230,17 @@ class View(collections.Sequence): self.sig_view_refresh.send(self) self.sig_store_refresh.send(self) + def clear_not_marked(self): + """ + Clears only the unmarked flows. + """ + for flow in self._store.copy().values(): + if not flow.marked: + self._store.pop(flow.id) + + self._refilter() + self.sig_store_refresh.send(self) + def add(self, f: mitmproxy.flow.Flow) -> bool: """ Adds a flow to the state. If the flow already exists, it is diff --git a/mitmproxy/tools/console/flowlist.py b/mitmproxy/tools/console/flowlist.py index b26289af..39811ce1 100644 --- a/mitmproxy/tools/console/flowlist.py +++ b/mitmproxy/tools/console/flowlist.py @@ -35,6 +35,7 @@ def _mkhelp(): ("W", "stream flows to file"), ("X", "kill and delete flow, even if it's mid-intercept"), ("z", "clear flow list or eventlog"), + ("Z", "clear unmarked flows"), ("tab", "tab between eventlog and flow list"), ("enter", "view flow"), ("|", "run script on this flow"), @@ -354,6 +355,8 @@ class FlowListBox(urwid.ListBox): self.master.view.update(f) elif key == "z": self.master.view.clear() + elif key == "Z": + self.master.view.clear_not_marked() elif key == "e": self.master.toggle_eventlog() elif key == "g": diff --git a/test/mitmproxy/addons/test_view.py b/test/mitmproxy/addons/test_view.py index 99b12cb4..7145bfc8 100644 --- a/test/mitmproxy/addons/test_view.py +++ b/test/mitmproxy/addons/test_view.py @@ -108,6 +108,13 @@ def test_simple(): assert list(v) == [f, f3, f2] assert len(v._store) == 3 + f.marked = not f.marked + f2.marked = not f2.marked + v.clear_not_marked() + assert list(v) == [f, f2] + assert len(v) == 2 + assert len(v._store) == 2 + v.clear() assert len(v) == 0 assert len(v._store) == 0 |