mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

do not justify if we're not outputing to a terminal

This commit is contained in:
Abogical 2016-11-14 14:49:24 +02:00
parent 3232769ffc
commit af925d2723
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/borg/helpers.py
View File

@ -1258,18 +1258,24 @@ class ProgressIndicatorPercent:
if pct is not None: if pct is not None:
# truncate the last argument, if no space is available # truncate the last argument, if no space is available
if info is not None: if info is not None:
msg = self.msg % tuple([pct] + info[:-1] + ['']) # no need to truncate if we're not outputing to a terminal
space = get_terminal_size()[0] - len(msg) terminal_space = get_terminal_size(fallback=(-1, -1))[0]
if space < 8: if terminal_space != -1:
info[-1] = '' space = terminal_space - len(self.msg % tuple([pct] + info[:-1] + ['']))
else: if space < 8:
info[-1] = ellipsis_truncate(info[-1], space) info[-1] = ' ' * space
return self.output(self.msg % tuple([pct] + info)) else:
info[-1] = ellipsis_truncate(info[-1], space)
return self.output(self.msg % tuple([pct] + info), justify=False)
return self.output(self.msg % pct) return self.output(self.msg % pct)
def output(self, message): def output(self, message, justify=True):
message = message.ljust(get_terminal_size(fallback=(4, 1))[0]) if justify:
terminal_space = get_terminal_size(fallback=(-1, -1))[0]
# no need to ljust if we're not outputing to a terminal
if terminal_space != -1:
message = message.ljust(terminal_space)
self.logger.info(message) self.logger.info(message)
def finish(self): def finish(self):