Michael Pasternak has uploaded a new change for review. Change subject: cli: use colour escape sequence in prompt only ......................................................................
cli: use colour escape sequence in prompt only Change-Id: Ibfc6bcc8feb06588e496112f6b35a05defa14df3 Signed-off-by: Michael pasternak <[email protected]> --- M src/ovirtcli/shell/promptmanager.py M src/ovirtcli/utils/colorhelper.py 2 files changed, 28 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-cli refs/changes/21/21221/1 diff --git a/src/ovirtcli/shell/promptmanager.py b/src/ovirtcli/shell/promptmanager.py index 1fb9278..7c1dd40 100644 --- a/src/ovirtcli/shell/promptmanager.py +++ b/src/ovirtcli/shell/promptmanager.py @@ -58,7 +58,8 @@ "unauthorized", ColorHelper.colorize( "unauthorized", - color=ColorHelper.RED + color=ColorHelper.RED, + is_prompt=True ) ) return dprompt @@ -71,7 +72,8 @@ "disconnected", ColorHelper.colorize( "disconnected", - color=ColorHelper.RED + color=ColorHelper.RED, + is_prompt=True ) ) return dprompt @@ -92,7 +94,8 @@ "connected@" + url_obj.hostname, ColorHelper.colorize( 'connected@' + url_obj.hostname, - color=ColorHelper.GREEN + color=ColorHelper.GREEN, + is_prompt=True ) ) return cprompt @@ -104,7 +107,8 @@ "connected", ColorHelper.colorize( "connected", - color=ColorHelper.GREEN + color=ColorHelper.GREEN, + is_prompt=True ) ) return cprompt diff --git a/src/ovirtcli/utils/colorhelper.py b/src/ovirtcli/utils/colorhelper.py index 9637ec5..c9a3fed 100644 --- a/src/ovirtcli/utils/colorhelper.py +++ b/src/ovirtcli/utils/colorhelper.py @@ -18,19 +18,36 @@ class ColorHelper(): BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8) - __PREFIX = "\001\033[1;%dm\002" - __SUFFIX = "\001\033[1;m\002" + __PROMPT_PREFIX = "\001" + __PREFIX = "\033[1;%dm" + __SUFFIX = "\033[1;m" + ___PROMPT_SUFFIX = "\002" __OFFSET = 30 @staticmethod - def colorize(text, color): + def colorize(text, color, is_prompt=False): """ Colors text @param text: text to color @param color: color to use (ColorHelper.RED|ColorHelper.BLUE...) + @param param: is_prompt indicates that should be performed prompt + unique treatment """ if color: + if is_prompt: + return ( + ColorHelper.__PROMPT_PREFIX + \ + ColorHelper.__PREFIX + \ + ColorHelper.___PROMPT_SUFFIX + ) % \ + (ColorHelper.__OFFSET + color) + \ + text + \ + ( + ColorHelper.__PROMPT_PREFIX + \ + ColorHelper.__SUFFIX + \ + ColorHelper.___PROMPT_SUFFIX + ) return ColorHelper.__PREFIX % \ (ColorHelper.__OFFSET + color) + \ text + \ -- To view, visit http://gerrit.ovirt.org/21221 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfc6bcc8feb06588e496112f6b35a05defa14df3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine-cli Gerrit-Branch: master Gerrit-Owner: Michael Pasternak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
