erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core (constants), tools (common/ansi): moved ANSI escape codes to a dedicated class, with helper methods

Browse source
This commit is contained in:
Goffi 2017-02-16 00:44:54 +01:00
commit bc5f57702f
2 changed files with 54 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/core/constants.py
View file

@ -313,17 +313,6 @@ class Const(object):
DEFAULT_MAX_AGE = 1209600 # default max age of cached files, in seconds
HASH_SHA1_EMPTY = 'da39a3ee5e6b4b0d3255bfef95601890afd80709'
## ANSI escape sequences ##
# XXX: used for logging
# XXX: they will be probably moved in a dedicated module in the future
ANSI_RESET = '\033[0m'
ANSI_NORMAL_WEIGHT = '\033[22m'
ANSI_FG_BLACK, ANSI_FG_RED, ANSI_FG_GREEN, ANSI_FG_YELLOW, ANSI_FG_BLUE, ANSI_FG_MAGENTA, ANSI_FG_CYAN, ANSI_FG_WHITE = ('\033[3%dm' % nb for nb in xrange(8))
ANSI_BOLD = '\033[1m'
ANSI_BLINK = '\033[5m'
ANSI_BLINK_OFF = '\033[25m'
@classmethod
def LOG_OPTIONS(cls):
"""Return options checked for logs"""

9
src/core/log.py
View file

@ -22,6 +22,7 @@
# TODO: change formatting from "%s" style to "{}" when moved to Python 3
from sat.core.constants import Const as C
from sat.tools.common.ansi import ANSI as A
from sat.core import exceptions
backend = None
@ -235,10 +236,10 @@ class ConfigureBase(object):
for elt in taint_list:
elt = elt.upper()
try:
ansi = getattr(C, 'ANSI_FG_{}'.format(elt))
ansi = getattr(A, 'FG_{}'.format(elt))
except AttributeError:
try:
ansi = getattr(C, 'ANSI_{}'.format(elt))
ansi = getattr(A, elt)
except AttributeError:
# we use raw string if element is unknown
ansi = elt
@ -318,9 +319,9 @@ class ConfigureBase(object):
if cls._color_location:
return message % {'color_start': start,
'color_end': C.ANSI_RESET}
'color_end': A.RESET}
else:
return '%s%s%s' % (start, message, C.ANSI_RESET)
return '%s%s%s' % (start, message, A.RESET)
@staticmethod
def getProfile():