Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-30 11:19:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix #2762 (#2763)

Browse Source 
s/console_order/view_order
s/console_order_reversed/view_order_reversed
This commit is contained in:
Samoilenko Roman 2018-01-06 09:54:38 +02:00 committed by Thomas Kriechbaumer
parent 1c769b0991
commit 012b938254
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mitmproxy/addons/view.py
View File

@ -238,7 +238,7 @@ class View(collections.Sequence):
@command.command("view.order.options") @command.command("view.order.options")
def order_options(self) -> typing.Sequence[str]: def order_options(self) -> typing.Sequence[str]:
""" """
Choices supported by the console_order option. Choices supported by the view_order option.
""" """
return list(sorted(self.orders.keys())) return list(sorted(self.orders.keys()))

4
mitmproxy/options.py
View File

@ -44,8 +44,6 @@ class Options(optmanager.OptManager):
console_layout = None # type: str console_layout = None # type: str
console_layout_headers = None # type: bool console_layout_headers = None # type: bool
console_mouse = None # type: bool console_mouse = None # type: bool
console_order = None # type: str
console_order_reversed = None # type: bool
console_palette = None # type: str console_palette = None # type: str
console_palette_transparent = None # type: bool console_palette_transparent = None # type: bool
default_contentview = None # type: str default_contentview = None # type: str
@ -98,6 +96,8 @@ class Options(optmanager.OptManager):
upstream_cert = None # type: bool upstream_cert = None # type: bool
verbosity = None # type: str verbosity = None # type: str
view_filter = None # type: Optional[str] view_filter = None # type: Optional[str]
view_order = None # type: str
view_order_reversed = None # type: bool
web_debug = None # type: bool web_debug = None # type: bool
web_iface = None # type: str web_iface = None # type: str
web_open_browser = None # type: bool web_open_browser = None # type: bool

4
mitmproxy/tools/console/defaultkeys.py
View File

@ -67,14 +67,14 @@ def map(km):
"o", "o",
""" """
console.choose.cmd Order view.order.options console.choose.cmd Order view.order.options
set console_order={choice} set view_order={choice}
""", """,
["flowlist"], ["flowlist"],
"Set flow list order" "Set flow list order"
) )
km.add("r", "replay.client @focus", ["flowlist", "flowview"], "Replay this flow") km.add("r", "replay.client @focus", ["flowlist", "flowview"], "Replay this flow")
km.add("S", "console.command replay.server ", ["flowlist"], "Start server replay") km.add("S", "console.command replay.server ", ["flowlist"], "Start server replay")
km.add("v", "set console_order_reversed=toggle", ["flowlist"], "Reverse flow list order") km.add("v", "set view_order_reversed=toggle", ["flowlist"], "Reverse flow list order")
km.add("U", "flow.mark @all false", ["flowlist"], "Un-set all marks") km.add("U", "flow.mark @all false", ["flowlist"], "Un-set all marks")
km.add("w", "console.command save.file @shown ", ["flowlist"], "Save listed flows to file") km.add("w", "console.command save.file @shown ", ["flowlist"], "Save listed flows to file")
km.add("V", "flow.revert @focus", ["flowlist", "flowview"], "Revert changes to this flow") km.add("V", "flow.revert @focus", ["flowlist", "flowview"], "Revert changes to this flow")

4
mitmproxy/utils/arg_check.py
View File

@ -66,9 +66,9 @@ REPLACEMENTS = {
"--palette": "console_palette", "--palette": "console_palette",
"--palette-transparent": "console_palette_transparent:", "--palette-transparent": "console_palette_transparent:",
"--follow": "console_focus_follow", "--follow": "console_focus_follow",
"--order": "console_order", "--order": "view_order",
"--no-mouse": "console_mouse", "--no-mouse": "console_mouse",
"--reverse": "console_order_reversed", "--reverse": "view_order_reversed",
"--no-http2-priority": "http2_priority", "--no-http2-priority": "http2_priority",
"--no-websocket": "websocket", "--no-websocket": "websocket",
"--no-upstream-cert": "upstream_cert", "--no-upstream-cert": "upstream_cert",