Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cropped @batchcommand output better. Resolves issue 217.

Browse source
This commit is contained in:
Griatch 2012-03-14 21:03:28 +01:00
parent 5beee55149
commit f46a9a1280
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/commands/default/batchprocess.py
View file

@ -26,6 +26,7 @@ from django.conf import settings
from src.utils.batchprocessors import BATCHCMD, BATCHCODE from src.utils.batchprocessors import BATCHCMD, BATCHCODE
from src.commands.cmdset import CmdSet from src.commands.cmdset import CmdSet
from src.commands.default.muxcommand import MuxCommand from src.commands.default.muxcommand import MuxCommand
from src.utils import utils
HEADER_WIDTH = 70 HEADER_WIDTH = 70
UTF8_ERROR = \ UTF8_ERROR = \
@ -57,14 +58,12 @@ def format_header(caller, entry):
""" """
width = HEADER_WIDTH - 10 width = HEADER_WIDTH - 10
entry = entry.strip() entry = entry.strip()
header = entry[:min(width, min(len(entry), entry.find('\n')))] header = utils.crop(entry, width=width)
if len(entry) > width:
header = "%s[...]" % header
ptr = caller.ndb.batch_stackptr + 1 ptr = caller.ndb.batch_stackptr + 1
stacklen = len(caller.ndb.batch_stack) stacklen = len(caller.ndb.batch_stack)
header = "{w%02i/%02i{G: %s{n" % (ptr, stacklen, header) header = "{w%02i/%02i{G: %s{n" % (ptr, stacklen, header)
# add extra space to the side for padding. # add extra space to the side for padding.
header = "%s%s" % (header, " "*(width-len(header))) header = "%s%s" % (header, " "*(width - len(header)))
header = header.replace('\n', '\\n') header = header.replace('\n', '\\n')
return header return header