python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-07-13 01:20:24 +02:00
Code Issues Releases Activity

add -C option to force color even with pipes

Browse Source
This commit is contained in:
Kelly Brazil
2021-12-08 08:14:28 -08:00
parent 9621475e86
commit df190aa299
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
jc/cli.py
View File

@ -235,9 +235,11 @@ def set_env_colors(env_colors=None):
} }
def piped_output(): def piped_output(force_color):
"""Return False if stdout is a TTY. True if output is being piped to another program""" """Return False if stdout is a TTY. True if output is being piped to another program
return not sys.stdout.isatty() and foce_color is True. This allows forcing of ANSI color codes even when using pipes.
"""
return not sys.stdout.isatty() and not force_color
def ctrlc(signum, frame): def ctrlc(signum, frame):
@ -335,6 +337,7 @@ def helptext():
{parsers_string} {parsers_string}
Options: Options:
-a about jc -a about jc
-C force color output even when using pipes (overrides -m)
-d debug (-dd for verbose debug) -d debug (-dd for verbose debug)
-h help (-h --parser_name for parser documentation) -h help (-h --parser_name for parser documentation)
-m monochrome output -m monochrome output
@ -526,7 +529,8 @@ def main():
about = 'a' in options about = 'a' in options
debug = 'd' in options debug = 'd' in options
verbose_debug = options.count('d') > 1 verbose_debug = options.count('d') > 1
mono = 'm' in options or bool(os.getenv('NO_COLOR')) force_color = 'C' in options
mono = ('m' in options or bool(os.getenv('NO_COLOR'))) and not force_color
help_me = 'h' in options help_me = 'h' in options
pretty = 'p' in options pretty = 'p' in options
quiet = 'q' in options quiet = 'q' in options
@ -542,7 +546,11 @@ def main():
mono = True mono = True
if about: if about:
print(json_out(about_jc(), pretty=pretty, env_colors=jc_colors, mono=mono, piped_out=piped_output())) print(json_out(about_jc(),
pretty=pretty,
env_colors=jc_colors,
mono=mono,
piped_out=piped_output(force_color)))
sys.exit(0) sys.exit(0)
if help_me: if help_me:
@ -632,7 +640,7 @@ def main():
pretty=pretty, pretty=pretty,
env_colors=jc_colors, env_colors=jc_colors,
mono=mono, mono=mono,
piped_out=piped_output()), piped_out=piped_output(force_color)),
flush=unbuffer) flush=unbuffer)
sys.exit(combined_exit_code(magic_exit_code, 0)) sys.exit(combined_exit_code(magic_exit_code, 0))
@ -645,7 +653,7 @@ def main():
pretty=pretty, pretty=pretty,
env_colors=jc_colors, env_colors=jc_colors,
mono=mono, mono=mono,
piped_out=piped_output()), piped_out=piped_output(force_color)),
flush=unbuffer) flush=unbuffer)
sys.exit(combined_exit_code(magic_exit_code, 0)) sys.exit(combined_exit_code(magic_exit_code, 0))