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

handle multiple styles when grouping

Browse source
This commit is contained in:
nojhan 2012-04-02 21:58:06 +02:00
commit 1a880bde94
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
colout.py
View file

@ -70,12 +70,16 @@ def colorup( text, pattern, color, style = "standard" ):
colors_l = color.split(",") colors_l = color.split(",")
group_colors = colors_l + [colors_l[-1]] * (nb_groups - len(colors_l)) group_colors = colors_l + [colors_l[-1]] * (nb_groups - len(colors_l))
# Same for styles
styles_l = style.split(",")
group_styles = styles_l + [styles_l[-1]] * (nb_groups - len(styles_l))
# For each group index. # For each group index.
# Note that match.groups returns a tuple (thus being indexed in [0,n[), # Note that match.groups returns a tuple (thus being indexed in [0,n[),
# but that match.start(0) refers to the whole match, the groups being indexed in [1,n]. # but that match.start(0) refers to the whole match, the groups being indexed in [1,n].
# Thus, we need to range in [1,n+1[. # Thus, we need to range in [1,n+1[.
for group in range(1,nb_groups+1): for group in range(1,nb_groups+1):
partial,end = colorout( text, match, end, group_colors[group-1], style, group ) partial,end = colorout( text, match, end, group_colors[group-1], group_styles[group-1], group )
colored_text += partial colored_text += partial
# Append the remaining part of the text, if any. # Append the remaining part of the text, if any.
@ -94,14 +98,13 @@ if __name__ == "__main__":
parser.add_argument("pattern", metavar="REGEX", type=str, nargs=1, parser.add_argument("pattern", metavar="REGEX", type=str, nargs=1,
help="A regular expression") help="A regular expression")
colors_range = colors_mode8.keys() + [str(i) for i in range(255)]
parser.add_argument("color", metavar="COLOR", type=str, nargs='?', parser.add_argument("color", metavar="COLOR", type=str, nargs='?',
default="red", default="red",
help="A number in [0…255] or one of the following colors: "+" ".join(colors_mode8) )#, choices = colors_range ) help="A number in [0…255] or one of the following colors: "+" ".join(colors_mode8) )
parser.add_argument("style", metavar="STYLE", type=str, nargs='?', parser.add_argument("style", metavar="STYLE", type=str, nargs='?',
default="bold", default="bold",
help="One of the following styles: "+" ".join(styles), choices=styles) help="One of the following styles: "+" ".join(styles) )
parser.add_argument("-e", "--stderr", action="store_true", parser.add_argument("-e", "--stderr", action="store_true",
help="Output on the stderr instead of stdout") help="Output on the stderr instead of stdout")