PonyMirrors/ponysay
1
0
Fork 0
mirror of https://github.com/erkin/ponysay.git synced 2024-11-22 12:27:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

split out logic for the getting the truncation column

Browse source 
Signed-off-by: Mattias Andrée <maandree@operamail.com>
This commit is contained in:
Mattias Andrée 2013-08-17 07:10:30 +02:00
parent 857eb42aa6
commit 7586505f2b
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/ponysay.py
View file

@ -915,9 +915,7 @@ class Ponysay():
print('\033[H\033[2J', end='') print('\033[H\033[2J', end='')
## Get width truncation and wrapping ## Get width truncation and wrapping
env_width = os.environ['PONYSAY_FULL_WIDTH'] if 'PONYSAY_FULL_WIDTH' in os.environ else None widthtruncation = self.__getWidthTruncation()
if env_width is None: env_width = ''
widthtruncation = gettermsize()[1] if env_width not in ('yes', 'y', '1') else None
messagewrap = 60 messagewrap = 60
if (args.opts['-W'] is not None) and (len(args.opts['-W'][0]) > 0): if (args.opts['-W'] is not None) and (len(args.opts['-W'][0]) > 0):
messagewrap = args.opts['-W'][0] messagewrap = args.opts['-W'][0]
@ -1060,4 +1058,15 @@ class Ponysay():
Popen(pngcmd, stdout=os.fdopen(pngpipe[1], 'w'), shell=True).wait() Popen(pngcmd, stdout=os.fdopen(pngpipe[1], 'w'), shell=True).wait()
pony = '/proc/' + str(os.getpid()) + '/fd/' + str(pngpipe[0]) pony = '/proc/' + str(os.getpid()) + '/fd/' + str(pngpipe[0])
return pony return pony
def __getWidthTruncation(self):
'''
Gets the width trunction setting
@return :int? The column the truncate the output at, or `None` to not truncate it
'''
env_width = os.environ['PONYSAY_FULL_WIDTH'] if 'PONYSAY_FULL_WIDTH' in os.environ else None
if env_width is None: env_width = 'auto'
return gettermsize()[1] if env_width not in ('yes', 'y', '1') else None