diff --git a/reporting/src2ans b/reporting/src2ans index af82d2c..9a5557c 100755 --- a/reporting/src2ans +++ b/reporting/src2ans @@ -24,52 +24,8 @@ __version__ = "0.1" import sys,os,argparse,re from argparse import ArgumentParser -class bc: - K="\033[1;30m" - R="\033[1;31m" - G="\033[1;32m" - B="\033[1;34m" - Y="\033[1;33m" - M="\033[1;35m" - C="\033[1;36m" - W="\033[1;37m" - k="\033[0;30m" - r="\033[0;31m" - g="\033[0;32m" - b="\033[0;34m" - y="\033[0;33m" - m="\033[0;35m" - c="\033[0;36m" - w="\033[0;37m" - S = '\033[1m' - U = '\033[4m' - Z = '\033[0m' - CLR = '\033[2J' - CLREND = '\033[K' - - color_keys="KRGBYMCWkrgbymcwSUZ" - color_list=[K,R,G,B,Y,M,C,W,k,r,g,b,y,m,c,w,S,U,Z] - - def pos(self,y,x): - return "\033["+str(y)+";"+str(x)+"H" - - def posprint(self, y,x,s): - sys.stdout.write( self.pos(y,x) + str(s) ) - - def clear(self): - sys.stdout.write( self.CLR+self.pos(0,0) ) - def clear_to_end(self): - sys.stdout.write( self.CLREND ) - - def color_string(self,s): - for i,c in enumerate(self.color_keys): - s=s.replace("${"+c+"}",self.color_list[i]) - return s - def nocolor_string(self,s): - for i,c in enumerate(self.color_keys): - s=s.replace("${"+c+"}","") - return s - +sys.path.append(os.path.dirname(os.path.realpath(__file__))) +import ansi def setup_options(): ''' Create command line options ''' @@ -90,11 +46,11 @@ Special syntaxes: parser.add_argument("-z",action="store_true",dest="zero",default=False, help="Reset coloring at the end of each line.") parser.add_argument("filename",type=str, - help="File to show") + help="File to show, - for stdin") opts=parser.parse_args() return opts -bc=bc() +bc=ansi.code() opts=setup_options() if opts.filename=="-": f=sys.stdin