From 52370386fae5a50a42c008d3a0f44471273b8aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=BF=D0=B8=D1=80=D0=B8=D0=B4=D0=BE=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=94=D0=B5=D0=BD=D0=B8=D1=81?= <ds@calculate.ru>
Date: Fri, 22 Jun 2012 16:40:37 +0400
Subject: [PATCH] fix color results

---
 console/application/function.py | 45 ++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/console/application/function.py b/console/application/function.py
index 53e6069..7130a20 100644
--- a/console/application/function.py
+++ b/console/application/function.py
@@ -26,12 +26,13 @@ from calculate.core.server.cert_cmd import getHwAddr, getIpLocal
 
 from calculate.core.client.progressbar import Bar,Percentage,ETA,ProgressBar
 from calculate.lib.cl_lang import setLocalTranslate
+from calculate.lib.cl_print import color_print
 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'
+colorPrint = color_print()
 
 def _print (*args):
     print " ".join(map(lambda x:unicode(x).encode('utf-8'),args))
@@ -99,7 +100,7 @@ def print_brief_group(Fields, group_name):
             continue
         if field.element in ['input', 'openfile']:
             value = field.value if field.value else ''
-            _print (green+'%s: %s' %(field.label, value))
+            colorPrint.printSUCCESS('%s: %s' %(field.label, value))
 
         elif field.element in ['combo', 'comboEdit', 'radio', 'file']:
             if hasattr (field.comments, 'string') and field.value in \
@@ -112,7 +113,7 @@ def print_brief_group(Fields, group_name):
                 value = ', '.join(value)
             else:
                 value = field.value if field.value else ''
-            _print (green+'%s: %s' %(field.label, value))
+            colorPrint.printSUCCESS('%s: %s' %(field.label, value))
 
         elif field.element in ['multichoice', 'multichoice_add',\
                                  'selecttable', 'selecttable_add']:
@@ -128,13 +129,13 @@ def print_brief_group(Fields, group_name):
                 value = ', '.join(field.listvalue.string)
             else:
                 value = field.value if field.value else ''
-            _print (green+'%s: %s' %(field.label, value))
-#
+            colorPrint.printSUCCESS('%s: %s' %(field.label, value))
+
 #        elif field.element == 'label':
 #            print field.label
 
         elif field.element == 'error':
-            _print (red + 'Error: %s' %field.label)
+            colorPrint.printERROR(field.label)
 
         elif field.element in ['check', 'check_tristate']:
             if field.value == 'on':
@@ -145,7 +146,7 @@ def print_brief_group(Fields, group_name):
                 value = _('auto')
             else:
                 value = field.value
-            _print (green+'%s: %s' %(field.label, value))
+            colorPrint.printSUCCESS('%s: %s' %(field.label, value))
 
         elif field.element == 'table' and field.type != 'steps':
             if hasattr (field.tablevalue.head, 'string'):
@@ -186,7 +187,7 @@ def print_brief_group(Fields, group_name):
             for body_row in body:
                 data.append(map(lambda x: x if x else '', body_row))
 
-            _print (green+'%s: ' %(field.label))
+            colorPrint.printSUCCESS('%s: ' %(field.label))
             res = printTable(data, head)
             sys.stdout.flush()
             sys.stdout.write(res)
@@ -195,7 +196,7 @@ def print_brief_group(Fields, group_name):
             uncompatible_count += 1
 
     if uncompatible_count == len (Fields) and group_name:
-        _print (green + _('Not used'))
+        colorPrint.printSUCCESS(_('Not used'))
 
 def print_brief(view, brief_label):
     for Group in view.groups.GroupField:
@@ -267,7 +268,7 @@ def printTable(data, header=None ):
 
 def show_table(table, item):
     if item.message:
-        _print (green + item.message)
+        colorPrint.printSUCCESS(item.message)
     head = table.head.string if hasattr (table.head, 'string') else None
     data = []
     for line in table.body[0]:
@@ -280,29 +281,31 @@ def show_table(table, item):
 
 def show_error(item):
     if item.message:
-        print red + _("Error")
-        _print (red + item.message)
+        for line in item.message.splitlines():
+            colorPrint.printERROR(line)
     
 def show_warning(item):
     if item.message:
-        print yellow + _("Warning")
-        _print (yellow + item.message)
+        for line in item.message.splitlines():
+            colorPrint.printWARNING(line)
     
 def show_group(item):
     if item.message:
-        _print (item.message)
+        for line in item.message.splitlines():
+            colorPrint.printSUCCESS(line)
 
 def show_result(result):
-    if result.message:
-        _print ("Result = ", result.message)
+    pass
 
 def startTask(item):
     if item.message:
-        _print (green + item.message)
+        for line in item.message.splitlines():
+            colorPrint.printSUCCESS(line)
 
 def endTask(item):
     if item.message:
-        _print (item.message)
+        for line in item.message.splitlines():
+            colorPrint.printSUCCESS(line)
     
 def beginFrame(item):
     pass
@@ -504,12 +507,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(green + '%s\n' %returnProgr.long_message)
+            colorPrint.printSUCCESS('%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(green + '%s\n' %returnProgr.short_message)
+            colorPrint.printSUCCESS('%s\n' %returnProgr.short_message)
         pbar.update(returnProgr.percent)
         return returnProgr.short_message
     else: