Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-22 15:37:45 +00:00
Code Issues Projects Releases Wiki Activity

fix #3722

Browse Source
This commit is contained in:
Maximilian Hils 2019-12-12 15:34:32 +01:00
parent a58b8c9cdb
commit 005cb7cf5a
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mitmproxy/tools/console/statusbar.py
View File

@ -3,10 +3,10 @@ from typing import Optional
import urwid import urwid
import mitmproxy.tools.console.master # noqa import mitmproxy.tools.console.master # noqa
from mitmproxy.tools.console import commandexecutor
from mitmproxy.tools.console import common from mitmproxy.tools.console import common
from mitmproxy.tools.console import signals from mitmproxy.tools.console import signals
from mitmproxy.tools.console import commandexecutor
from mitmproxy.tools.console.commander import commander from mitmproxy.tools.console.commander import commander
@ -57,6 +57,7 @@ class ActionBar(urwid.WidgetWrap):
def cb(*args): def cb(*args):
if w == self._w: if w == self._w:
self.clear() self.clear()
signals.call_in.send(seconds=expire, callback=cb) signals.call_in.send(seconds=expire, callback=cb)
def prep_prompt(self, p): def prep_prompt(self, p):
@ -105,7 +106,13 @@ class ActionBar(urwid.WidgetWrap):
) )
if cursor is not None: if cursor is not None:
self._w.cbuf.cursor = cursor self._w.cbuf.cursor = cursor
self.prompting = commandexecutor.CommandExecutor(self.master) self.prompting = self.execute_command
def execute_command(self, txt):
if txt.strip():
self.master.commands.call("commands.history.add", txt)
execute = commandexecutor.CommandExecutor(self.master)
execute(txt)
def sig_prompt_onekey(self, sender, prompt, keys, callback, args=()): def sig_prompt_onekey(self, sender, prompt, keys, callback, args=()):
""" """
@ -140,7 +147,6 @@ class ActionBar(urwid.WidgetWrap):
elif k == "enter": elif k == "enter":
text = self._w.get_edit_text() text = self._w.get_edit_text()
self.prompt_execute(text) self.prompt_execute(text)
self.master.commands.call("commands.history.add", text)
else: else:
if common.is_keypress(k): if common.is_keypress(k):
self._w.keypress(size, k) self._w.keypress(size, k)
@ -170,7 +176,7 @@ class StatusBar(urwid.WidgetWrap):
keyctx = "" keyctx = ""
def __init__( def __init__(
self, master: "mitmproxy.tools.console.master.ConsoleMaster" self, master: "mitmproxy.tools.console.master.ConsoleMaster"
) -> None: ) -> None:
self.master = master self.master = master
self.ib = urwid.WidgetWrap(urwid.Text("")) self.ib = urwid.WidgetWrap(urwid.Text(""))