add color stars in show result

develop
Спиридонов Денис 12 years ago
parent 19f6236ae9
commit 7bffdc4a7c

@ -29,6 +29,10 @@ from calculate.lib.cl_lang import setLocalTranslate
setLocalTranslate('calculate_console',sys.modules[__name__])
from calculate.core.client.function import create_obj
green = '\033[32m * \033[0m'
red = '\033[31m * \033[0m'
yellow = '\033[33m * \033[0m'
def _print (*args):
print " ".join(map(lambda x:unicode(x).encode('utf-8'),args))
@ -89,8 +93,6 @@ def print_brief_group(Fields, group_name):
if group_name:
_print ('\b'+group_name)
uncompatible_count = 0
green = '\033[32m * \033[0m'
red = '\033[31m * \033[0m'
for field in Fields:
if field.uncompatible:
uncompatible_count += 1
@ -264,6 +266,8 @@ def printTable(data, header=None ):
return res
def show_table(table, item):
if item.message:
_print (green + item.message)
head = table.head.string if hasattr (table.head, 'string') else None
data = []
for line in table.body[0]:
@ -276,13 +280,11 @@ def show_table(table, item):
def show_error(item):
if item.message:
red = '\033[31m * \033[0m'
print red + _("Error")
_print (red + item.message)
def show_warning(item):
if item.message:
yellow = '\033[33m * \033[0m'
print yellow + _("Warning")
_print (yellow + item.message)
@ -296,7 +298,7 @@ def show_result(result):
def startTask(item):
if item.message:
_print (item.message)
_print (green + item.message)
def endTask(item):
if item.message:
@ -502,12 +504,12 @@ def cout(string):
def print_progressbar(returnProgr, pbar, last_msg = None, error = False):
if returnProgr.long_message:
if last_msg != returnProgr.long_message:
cout_progress('%s\n' %returnProgr.long_message)
cout_progress(green + '%s\n' %returnProgr.long_message)
pbar.update(returnProgr.percent)
return returnProgr.long_message
elif returnProgr.short_message:
if last_msg != returnProgr.short_message:
cout_progress('%s\n' %returnProgr.short_message)
cout_progress(green + '%s\n' %returnProgr.short_message)
pbar.update(returnProgr.percent)
return returnProgr.short_message
else:
@ -516,7 +518,7 @@ def print_progressbar(returnProgr, pbar, last_msg = None, error = False):
def print_progress(returnProgr, last_msg = None, error = False):
if error:
cout_progress ('\n'+_("Error task by %s") \
cout_progress (red + '\n'+_("Error task by %s") \
%str(0 - returnProgr.percent).rjust(5) + '%\n')
return ''
elif returnProgr.long_message:
@ -527,7 +529,7 @@ def print_progress(returnProgr, last_msg = None, error = False):
cout_progress('')
else:
cout_progress('OK'.rjust(6) + '\n')
cout_progress('%s %s%%' %(returnProgr.long_message, \
cout_progress(green + '%s %s%%' %(returnProgr.long_message, \
str(returnProgr.percent).rjust(5)))
return returnProgr.long_message
elif returnProgr.short_message:
@ -538,7 +540,7 @@ def print_progress(returnProgr, last_msg = None, error = False):
cout_progress('')
else:
cout_progress('OK'.rjust(6) + '\n')
cout_progress('%s %s%%' %(returnProgr.short_message, \
cout_progress(green + '%s %s%%' %(returnProgr.short_message, \
str(returnProgr.percent).rjust(5)))
return returnProgr.short_message
else:

Loading…
Cancel
Save