From 3d7f31b23da599023f2315f68026fa99889ed9a0 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 16 Apr 2013 23:54:34 +0200 Subject: [PATCH] Correct display mode highlight keys Add html display mode to the help documentation. Correct html and hex display mode highlight keys (help used 'h' for hex). Correct json display mode highlight keys. --- libmproxy/console/contentview.py | 2 +- libmproxy/console/flowview.py | 6 +++++- libmproxy/console/help.py | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libmproxy/console/contentview.py b/libmproxy/console/contentview.py index 2b46064a8..06710d2c2 100644 --- a/libmproxy/console/contentview.py +++ b/libmproxy/console/contentview.py @@ -137,7 +137,7 @@ class ViewXML: class ViewJSON: name = "JSON" - prompt = ("json", "j") + prompt = ("json", "s") content_types = ["application/json"] def __call__(self, hdrs, content, limit): lines = utils.pretty_json(content) diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py index 5f1d261f5..8932b9128 100644 --- a/libmproxy/console/flowview.py +++ b/libmproxy/console/flowview.py @@ -34,9 +34,13 @@ def _mkhelp(): [("text", ": automatic detection")] ), (None, - common.highlight_key("hex", "h") + + common.highlight_key("hex", "e") + [("text", ": Hex")] ), + (None, + common.highlight_key("html", "h") + + [("text", ": HTML")] + ), (None, common.highlight_key("image", "i") + [("text", ": Image")] diff --git a/libmproxy/console/help.py b/libmproxy/console/help.py index 40f819556..de3730837 100644 --- a/libmproxy/console/help.py +++ b/libmproxy/console/help.py @@ -57,9 +57,13 @@ class HelpView(urwid.ListBox): [("text", ": automatic detection")] ), (None, - common.highlight_key("hex", "h") + + common.highlight_key("hex", "e") + [("text", ": Hex")] ), + (None, + common.highlight_key("html", "h") + + [("text", ": HTML")] + ), (None, common.highlight_key("image", "i") + [("text", ": Image")]