diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-07-13 19:05:32 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-07-13 19:15:38 +1200 |
| commit | c9a0fe6a0e6d70fa2aea1b8dc337609a9439ade1 (patch) | |
| tree | 74a26cfd1a546ae2b6416e2a952e4ba2ce1a05e7 | |
| parent | a20f8e9620c0cfcb40500113cbeb813a05a195bb (diff) | |
| download | mitmproxy-c9a0fe6a0e6d70fa2aea1b8dc337609a9439ade1.tar.gz mitmproxy-c9a0fe6a0e6d70fa2aea1b8dc337609a9439ade1.tar.bz2 mitmproxy-c9a0fe6a0e6d70fa2aea1b8dc337609a9439ade1.zip | |
Show how options integrates with console
This is not functional at the moment, because all mutable options are still on
master.
| -rw-r--r-- | mitmproxy/console/master.py | 8 | ||||
| -rw-r--r-- | mitmproxy/console/options.py | 1 | ||||
| -rw-r--r-- | mitmproxy/console/statusbar.py | 1 | ||||
| -rw-r--r-- | mitmproxy/web/master.py | 1 |
4 files changed, 11 insertions, 0 deletions
diff --git a/mitmproxy/console/master.py b/mitmproxy/console/master.py index 99af0722..1daf1127 100644 --- a/mitmproxy/console/master.py +++ b/mitmproxy/console/master.py @@ -217,8 +217,10 @@ class ConsoleMaster(flow.FlowMaster): def __init__(self, server, options): flow.FlowMaster.__init__(self, server, ConsoleState()) + self.stream_path = None self.options = options + self.options.errored.connect(self.options_error) if options.replacements: for i in options.replacements: @@ -298,6 +300,12 @@ class ConsoleMaster(flow.FlowMaster): self.__dict__[name] = value signals.update_settings.send(self) + def options_error(self, opts, exc): + signals.status_message.send( + message=str(exc), + expire=1 + ) + def load_script(self, command, use_reloader=True): # We default to using the reloader in the console ui. return super(ConsoleMaster, self).load_script(command, use_reloader) diff --git a/mitmproxy/console/options.py b/mitmproxy/console/options.py index 5a01c9d5..6a4b8dd6 100644 --- a/mitmproxy/console/options.py +++ b/mitmproxy/console/options.py @@ -140,6 +140,7 @@ class Options(urwid.WidgetWrap): ) self.master.loop.widget.footer.update("") signals.update_settings.connect(self.sig_update_settings) + master.options.changed.connect(self.sig_update_settings) def sig_update_settings(self, sender): self.lb.walker._modified() diff --git a/mitmproxy/console/statusbar.py b/mitmproxy/console/statusbar.py index e576b565..d1ab5906 100644 --- a/mitmproxy/console/statusbar.py +++ b/mitmproxy/console/statusbar.py @@ -122,6 +122,7 @@ class StatusBar(urwid.WidgetWrap): self._w = urwid.Pile([self.ib, self.ab]) signals.update_settings.connect(self.sig_update_settings) signals.flowlist_change.connect(self.sig_update_settings) + master.options.changed.connect(self.sig_update_settings) self.redraw() def sig_update_settings(self, sender): diff --git a/mitmproxy/web/master.py b/mitmproxy/web/master.py index 2b55e74e..008b74f8 100644 --- a/mitmproxy/web/master.py +++ b/mitmproxy/web/master.py @@ -125,6 +125,7 @@ class Options(options.Options): "wsingleuser", "whtpasswd", ] + def process_web_options(self, parser): if self.wsingleuser or self.whtpasswd: if self.wsingleuser: |