ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-27 07:01:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

display fixes

Browse source 
banner now adjusts to screen as does output
output now keeps at least one space to end of screen to allow for better reading.
This commit is contained in:
Brian Coca 2016-10-31 10:30:40 -04:00 • committed by Brian Coca
commit d4ac0bdea9
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/utils/display.py
View file

@ -103,8 +103,6 @@ class Display:
Note: msg *must* be a unicode string to prevent UnicodeError tracebacks. Note: msg *must* be a unicode string to prevent UnicodeError tracebacks.
""" """
# FIXME: this needs to be implemented
#msg = utils.sanitize_output(msg)
nocolor = msg nocolor = msg
if color: if color:
msg = stringc(msg, color) msg = stringc(msg, color)
@ -175,8 +173,6 @@ class Display:
self.display("%6d %0.5f: %s" % (os.getpid(), time.time(), msg), color=C.COLOR_DEBUG) self.display("%6d %0.5f: %s" % (os.getpid(), time.time(), msg), color=C.COLOR_DEBUG)
def verbose(self, msg, host=None, caplevel=2): def verbose(self, msg, host=None, caplevel=2):
# FIXME: this needs to be implemented
#msg = utils.sanitize_output(msg)
if self.verbosity > caplevel: if self.verbosity > caplevel:
if host is None: if host is None:
self.display(msg, color=C.COLOR_VERBOSE) self.display(msg, color=C.COLOR_VERBOSE)
@ -222,12 +218,11 @@ class Display:
if C.SYSTEM_WARNINGS: if C.SYSTEM_WARNINGS:
self.warning(msg) self.warning(msg)
def banner(self, msg, color=None): def banner(self, msg, color=None, cows=True):
''' '''
Prints a header-looking line with stars taking up to 80 columns Prints a header-looking line with cowsay or stars wit hlength depending on terminal width (3 minimum)
of width (3 columns, minimum)
''' '''
if self.b_cowsay: if self.b_cowsay and cows:
try: try:
self.banner_cowsay(msg) self.banner_cowsay(msg)
return return
@ -235,8 +230,8 @@ class Display:
self.warning("somebody cleverly deleted cowsay or something during the PB run. heh.") self.warning("somebody cleverly deleted cowsay or something during the PB run. heh.")
msg = msg.strip() msg = msg.strip()
star_len = (79 - len(msg)) star_len = self.columns - len(msg)
if star_len < 0: if star_len <= 3:
star_len = 3 star_len = 3
stars = u"*" * star_len stars = u"*" * star_len
self.display(u"\n%s %s" % (msg, stars), color=color) self.display(u"\n%s %s" % (msg, stars), color=color)
@ -337,4 +332,4 @@ class Display:
tty_size = unpack('HHHH', fcntl.ioctl(0, TIOCGWINSZ, pack('HHHH', 0, 0, 0, 0)))[1] tty_size = unpack('HHHH', fcntl.ioctl(0, TIOCGWINSZ, pack('HHHH', 0, 0, 0, 0)))[1]
else: else:
tty_size = 0 tty_size = 0
self.columns = max(79, tty_size) self.columns = max(79, tty_size - 1)