mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-01-19 14:02:55 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7492 from ThomasWaldmann/fix-progress-msg-width-master

Browse source 
ProgressIndicatorPercent: fix space computation for wide chars, fixes #3027
This commit is contained in:
TW 2023-04-02 22:59:43 +02:00 committed by GitHub
commit 4faf375339
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/borg/helpers/progress.py
View file

@ -144,10 +144,12 @@ def show(self, current=None, increase=1, info=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:
if not self.json: if not self.json:
from ..platform import swidth # avoid circular import
# no need to truncate if we're not outputting to a terminal # no need to truncate if we're not outputting to a terminal
terminal_space = get_terminal_size(fallback=(-1, -1))[0] terminal_space = get_terminal_size(fallback=(-1, -1))[0]
if terminal_space != -1: if terminal_space != -1:
space = terminal_space - len(self.msg % tuple([pct] + info[:-1] + [""])) space = terminal_space - swidth(self.msg % tuple([pct] + info[:-1] + [""]))
info[-1] = ellipsis_truncate(info[-1], space) info[-1] = ellipsis_truncate(info[-1], space)
return self.output(self.msg % tuple([pct] + info), justify=False, info=info) return self.output(self.msg % tuple([pct] + info), justify=False, info=info)

25
src/borg/testsuite/helpers.py
View file

@ -45,7 +45,7 @@
from ..helpers import safe_unlink from ..helpers import safe_unlink
from ..helpers import text_to_json, binary_to_json from ..helpers import text_to_json, binary_to_json
from ..helpers.passphrase import Passphrase, PasswordRetriesExceeded from ..helpers.passphrase import Passphrase, PasswordRetriesExceeded
from ..platform import is_cygwin, is_win32, is_darwin from ..platform import is_cygwin, is_win32, is_darwin, swidth
from . import BaseTestCase, FakeInputs, are_hardlinks_supported from . import BaseTestCase, FakeInputs, are_hardlinks_supported
@ -1017,6 +1017,29 @@ def test_progress_percentage_sameline(capfd, monkeypatch):
assert err == " " * 4 + "\r" assert err == " " * 4 + "\r"
@pytest.mark.skipif(is_win32, reason="no working swidth() implementation on this platform")
def test_progress_percentage_widechars(capfd, monkeypatch):
st = "スター・トレック" # "startrek" :-)
assert swidth(st) == 16
path = "/カーク船長です。" # "Captain Kirk"
assert swidth(path) == 17
spaces = " " * 4 # to avoid usage of "..."
width = len("100%") + 1 + swidth(st) + 1 + swidth(path) + swidth(spaces)
monkeypatch.setenv("COLUMNS", str(width))
monkeypatch.setenv("LINES", "1")
pi = ProgressIndicatorPercent(100, step=5, start=0, msg=f"%3.0f%% {st} %s")
pi.logger.setLevel("INFO")
pi.show(0, info=[path])
out, err = capfd.readouterr()
assert err == f" 0% {st} {path}{spaces}\r"
pi.show(100, info=[path])
out, err = capfd.readouterr()
assert err == f"100% {st} {path}{spaces}\r"
pi.finish()
out, err = capfd.readouterr()
assert err == " " * width + "\r"
def test_progress_percentage_step(capfd, monkeypatch): def test_progress_percentage_step(capfd, monkeypatch):
# run the test as if it was in a 4x1 terminal # run the test as if it was in a 4x1 terminal
monkeypatch.setenv("COLUMNS", "4") monkeypatch.setenv("COLUMNS", "4")