mirror of
https://github.com/borgbackup/borg.git
synced 2024-12-23 16:26:29 +00:00
Merge pull request #1629 from ThomasWaldmann/fix-narrow-terminal-crash
adapt formatting to narrow screens, do not crash, fixes #1628
This commit is contained in:
commit
79617d4e74
1 changed files with 7 additions and 3 deletions
|
@ -223,9 +223,13 @@ def show_progress(self, item=None, final=False, stream=None, dt=None):
|
|||
msg = '{0.osize_fmt} O {0.csize_fmt} C {0.usize_fmt} D {0.nfiles} N '.format(self)
|
||||
path = remove_surrogates(item[b'path']) if item else ''
|
||||
space = columns - len(msg)
|
||||
if space < len('...') + len(path):
|
||||
path = '%s...%s' % (path[:(space // 2) - len('...')], path[-space // 2:])
|
||||
msg += "{0:<{space}}".format(path, space=space)
|
||||
if space < 12:
|
||||
msg = ''
|
||||
space = columns - len(msg)
|
||||
if space >= 8:
|
||||
if space < len('...') + len(path):
|
||||
path = '%s...%s' % (path[:(space // 2) - len('...')], path[-space // 2:])
|
||||
msg += "{0:<{space}}".format(path, space=space)
|
||||
else:
|
||||
msg = ' ' * columns
|
||||
print(msg, file=stream or sys.stderr, end="\r", flush=True)
|
||||
|
|
Loading…
Reference in a new issue