Rooba
/
pupy
mirror of https://github.com/n1nj4sec/pupy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add colorize support to PupyCmd tables

This commit is contained in:
Oleksii Shevchuk 2017-03-16 16:44:55 +02:00
parent b5fe6dd1ef
commit 1671950b3a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pupy/pupylib/PupyCmd.py
View File

@ -87,10 +87,14 @@ def get_columns_size(l):
for i,k in d.iteritems(): for i,k in d.iteritems():
if type(k) is not str: if type(k) is not str:
k=str(k) k=str(k)
escalign=len(''.join(re.findall('(\033[^m]+m)', k)))
l = len(k) - escalign
if not i in size_dic: if not i in size_dic:
size_dic[i]=len(k) size_dic[i]=l
elif size_dic[i]<len(k): elif size_dic[i]<l:
size_dic[i]=len(k) size_dic[i]=l
return size_dic return size_dic
def obj2utf8(obj): def obj2utf8(obj):
@ -219,7 +223,8 @@ class PupyCmd(cmd.Cmd):
else: else:
value=c[name].strip() value=c[name].strip()
utf8align=len(value)-len(value.decode('utf8',errors='replace')) utf8align=len(value)-len(value.decode('utf8',errors='replace'))
res+=value.ljust(colsize[name]+2+utf8align) escalign=len(''.join(re.findall('(\033[^m]+m)', value)))
res+=value.ljust(colsize[name]+2+utf8align+escalign)
res+="\n" res+="\n"
return res return res