nojhan/colout
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

replace 'standard' style name by 'normal'

Browse source
This commit is contained in:
nojhan 2012-04-02 22:32:24 +02:00
commit efc1195413
2 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

38
README
View file

@ -3,7 +3,7 @@ colout(1) -- Color Up Arbitrary Command Ouput
## SYNOPSIS
`colout` [-h] [-e] PATTERN [COLOR] [STYLE]
`colout` [-h] [-e] PATTERN [COLOR(S)] [STYLE(S)]
## DESCRIPTION
@ -14,10 +14,18 @@ matching a given regular expression <PATTERN> in given <COLOR> and <STYLE>.
If groups are specified in the regular expression pattern, only them are taken
into account, else the whole matching pattern is colored.
Available colors are: blue black yellow cyan green magenta white red.
Available styles are: reverse bold standard.
You can specify severall colors or styles when using groups by separating them
with commas. If you indicate more colors than groups, the last ones will be ignored.
If you ask for less colors, the last one will be duplicated across remaining
groups.
When not specified, <COLOR> defaults to _red_ and <STYLE> defaults to _bold_.
Available colors are: blue, black, yellow, cyan, green, magenta, white, red or
any number between 0 and 255.
Available styles are: normal, bold, faint, italic, underline, blink,
rapid_blink, reverse, conceal.
When not specified, a <COLOR> defaults to _red_ and a <STYLE> defaults to _bold_.
`colout` is released under the GNU Public License v3.
@ -48,15 +56,25 @@ special characters that would be recognize by your shell.
* Color in bold magenta home directories in _/etc/passwd_:
colout /home/[a-z]+ magenta < /etc/passwd
* Color in yellow file permissions with read rights for everyone:
ls -l | colout .\(r.-\){3} yellow standard
* Color in yellow user/groups id, in bold green name and in bold red home directories in _/etc/passwd_:
colout :x:\([0-9]+:[0-9]+\):\([a-z]+\).*\(/home/[a-z]+\) yellow,green,red normal,bold < /etc/passwd
* Color in green comments in colout sources
colout .*\(#.*\)$ green standard < colout.py
* Color in yellow file permissions with read rights for everyone:
ls -l | colout .\(r.-\){3} yellow normal
* Color in green read permission, in bold red write and execution ones:
ls -l | colout \(r\)\(w*\)\(x*\) green,red normal,bold
* Color in green comments in colout sources:
colout .*\(#.*\)$ green normal < colout.py
* Color in green comments in non-empty colout sources, with the sharp in bold:
grep -v ^\\s*$ colout.py | colout .*\(#\)\(.*\)$ green bold,normal
* Color in bold green every numbers and in bold red the words _error_ in make output:
make 2>&1 | colout [0-9]+ green standard | colout error
make 2>&1 | colout [0-9]+ green normal | colout error
* Color a make output, line numbers in yellow, errors in bold red, warning in magenta, pragma in green and C++ file base names in cyan:
make 2>&1 | colout :\([0-9]+\):[0-9]* yellow standard | colout error | colout warning magenta | colout pragma green standard | colout /\(\\w+\)*\.\(h\|cpp\) cyan standard
make 2>&1 | colout :\([0-9]+\):[0-9]* yellow normal | colout error | colout warning magenta | colout pragma green normal | colout /\(\\w+\)*\.\(h\|cpp\) cyan normal

4
colout.py
View file

@ -7,7 +7,7 @@
import re
styles = {"standard":0, "bold":1, "faint":2, "italic":3, "underline":4, "blink":5, "rapid_blink":6,
styles = {"normal":0, "bold":1, "faint":2, "italic":3, "underline":4, "blink":5, "rapid_blink":6,
"reverse":7, "conceal":8 }
colors_mode8 = {"black":0, "red":1, "green":2, "yellow":3, "blue":4, "magenta":5, "cyan":6, "white":7}
modes = {8:";", 256:";38;5;"}
@ -45,7 +45,7 @@ def colorout( text, match, prev_end, color, style, group=0 ):
return colored_text,end
def colorup( text, pattern, color, style = "standard" ):
def colorup( text, pattern, color, style = "normal" ):
"""Color up every characters that match the given patterns.
If groups are specified, only color up them and not the whole pattern."""
regex = re.compile(pattern, re.IGNORECASE)