just wrapping needed

This commit is contained in:
Mattias Andrée 2012-08-20 00:48:59 +02:00
parent b36f6d5527
commit 515b4d149e

View file

@ -366,7 +366,7 @@ class Ponysay():
''' '''
def print_pony(self, args): def print_pony(self, args):
if args.message == None: if args.message == None:
msg = ''.join(sys.stdin.readlines()).strip() msg = ''.join(sys.stdin.readlines()).rstrip()
else: else:
msg = args.message msg = args.message
@ -801,11 +801,35 @@ class Backend():
Process all data Process all data
''' '''
def parse(self): def parse(self):
self.__expandMessage()
self.__loadFile() self.__loadFile()
self.__processPony() self.__processPony()
self.__truncate() self.__truncate()
def __expandMessage(self):
lines = self.message.split('\n')
buf = ''
for line in lines:
(i, n, x) = (0, len(line), 0)
while i < n:
c = line[i]
i += 1
if c == '\033':
colour = self.__getcolour(line, i - 1)
i += len(colour) - 1
buf += colour
elif c == '\t':
nx = 8 - (x & 7)
buf += ' ' * nx
x += nx
else:
buf += c
x += 1
buf += '\n'
self.message = buf[:-1]
def __loadFile(self): def __loadFile(self):
ponystream = None ponystream = None
try: try: