YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

[mod] make cli color endling more usable and DRY

Browse source
This commit is contained in:
Laurent Peuch 2016-03-28 20:10:52 +02:00
parent add073d855
commit c04f723ac2
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
moulinette/interfaces/cli.py
View file

@ -21,14 +21,17 @@ logger = log.getLogger('moulinette.cli')
# CLI helpers ---------------------------------------------------------- # CLI helpers ----------------------------------------------------------
CLI_COLOR_TEMPLATE = '\033[{:d}m\033[1m'
END_CLI_COLOR = '\033[m'
colors_codes = { colors_codes = {
'red' : 31, 'red' : CLI_COLOR_TEMPLATE.format(31),
'green' : 32, 'green' : CLI_COLOR_TEMPLATE.format(32),
'yellow': 33, 'yellow': CLI_COLOR_TEMPLATE.format(33),
'blue' : 34, 'blue' : CLI_COLOR_TEMPLATE.format(34),
'purple': 35, 'purple': CLI_COLOR_TEMPLATE.format(35),
'cyan' : 36, 'cyan' : CLI_COLOR_TEMPLATE.format(36),
'white' : 37 'white' : CLI_COLOR_TEMPLATE.format(37),
} }
def colorize(astr, color): def colorize(astr, color):
@ -42,7 +45,7 @@ def colorize(astr, color):
""" """
if os.isatty(1): if os.isatty(1):
return '\033[{:d}m\033[1m{:s}\033[m'.format(colors_codes[color], astr) return '{:s}{:s}{:s}'.format(colors_codes[color], astr, END_CLI_COLOR)
else: else:
return astr return astr
@ -172,8 +175,8 @@ class TTYHandler(log.StreamHandler):
# add translated level name before message # add translated level name before message
level = '%s ' % m18n.g(record.levelname.lower()) level = '%s ' % m18n.g(record.levelname.lower())
color = self.LEVELS_COLOR.get(record.levelno, 'white') color = self.LEVELS_COLOR.get(record.levelno, 'white')
msg = '\033[{0}m\033[1m{1}\033[m{2}'.format( msg = '{0}{1}{2}{3}'.format(
colors_codes[color], level, msg) colors_codes[color], level, END_CLI_COLOR, msg)
if self.formatter: if self.formatter:
# use user-defined formatter # use user-defined formatter
record.__dict__[self.message_key] = msg record.__dict__[self.message_key] = msg