moonq/q-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
ville rantanen
2018-10-02 12:06:49 +03:00
parent 4aad70c89a 3fc741b090
commit 8d610768af
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/ansi-codes
View File

@@ -4,4 +4,4 @@ import sys,os
sys.path.append(os.path.realpath(os.path.join(os.path.dirname(__file__), sys.path.append(os.path.realpath(os.path.join(os.path.dirname(__file__),
"..","reporting"))) "..","reporting")))
import ansi import ansi
ansi.demo() print(ansi.demo())

2
reporting/ansi.py
View File

@@ -142,4 +142,4 @@ ${S}=====================${Z}
C .left() Left y;xH .pos() Absolute Position C .left() Left y;xH .pos() Absolute Position
D .right() Right """ D .right() Right """
print(c.color_string(unformatted)) return(c.color_string(unformatted))

9
reporting/md_color.py
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
import sys,os,re import sys,os,re
from argparse import ArgumentParser from argparse import ArgumentParser, RawDescriptionHelpFormatter
sys.path.append(os.path.dirname(os.path.realpath(__file__))) sys.path.append(os.path.dirname(os.path.realpath(__file__)))
import ansi import ansi
@@ -16,12 +16,13 @@ def setup_options():
usage = ''' usage = '''
Markdown syntax color in ansi codes. Markdown syntax color in ansi codes.
Special syntaxes: Special syntaxes:
Colors: insert string ${C}, where C is one of %s. - Colors: insert string e.g. ${C}.
Any ANSI control code: ${3A}, ${1;34;42m}, etc.. - Any ANSI control code: ${3A}, ${1;34;42m}, see the table..
'''%(" ".join(bc.get_keys())) ''' + ansi.demo()
parser = ArgumentParser( parser = ArgumentParser(
formatter_class = RawDescriptionHelpFormatter,
description = usage, description = usage,
epilog = __author__ epilog = __author__
) )

12
reporting/src2ans
View File

@@ -32,9 +32,9 @@ def setup_options():
usage=''' usage='''
Color notation renderer in ANSI codes Color notation renderer in ANSI codes
Special syntaxes: Special syntaxes:
* Colors: insert string ${X}, where X is one of %s. * Colors: insert string ${X}, where X values in the table below.
'''%(" ".join(bc.get_keys())) ''' + ansi.demo()
parser=ArgumentParser(description=usage, parser=ArgumentParser(description=usage,
formatter_class=argparse.RawDescriptionHelpFormatter, formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -61,15 +61,17 @@ else:
for row in f: for row in f:
if not row: if not row:
continue continue
row=row.decode('utf-8').rstrip("\n\r ") if type(row) == bytes:
row = row.decode('utf-8')
row=row.rstrip("\n\r ")
if opts.color: if opts.color:
colored=bc.color_string(row) colored=bc.color_string(row)
else: else:
colored=bc.nocolor_string(row) colored=bc.nocolor_string(row)
sys.stdout.write(colored.encode('utf-8')) sys.stdout.write(colored)
if opts.zero and opts.color: if opts.zero and opts.color:
sys.stdout.write(bc.Z) sys.stdout.write(bc.Z)
sys.stdout.write("\n") sys.stdout.write("\n")
if opts.zero_final and opts.color: if opts.zero_final and opts.color:
sys.stdout.write(bc.Z.encode('utf-8')) sys.stdout.write(bc.Z)