shukivaknin/gniza4linux
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix progress bar stuck: split on \r to get latest rsync progress

Browse Source 
rsync --info=progress2 uses \r without \n, so the entire progress
stream is one long line. Split on both \r and \n to parse each
progress update independently.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
shuki
2026-03-06 21:57:17 +02:00
parent 0ea7d10a9c
commit 040f861096
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tui/screens/running_tasks.py
View File

@@ -131,23 +131,17 @@ class RunningTasksScreen(Screen):
def _process_log_content(self, content: str, log_viewer: RichLog) -> None:
"""Process log content, extracting rsync progress and writing log lines."""
for line in content.split("\n"):
if not line:
# Split on both \n and \r to handle rsync --info=progress2 output
parts = re.split(r"[\r\n]+", content)
for part in parts:
part = part.strip()
if not part:
continue
# rsync --info=progress2 uses \r to update in place
if "\r" in line:
parts = line.split("\r")
# Extract progress from the last \r segment
last = parts[-1].strip()
if last:
self._update_progress(last)
# Write non-progress parts as log lines
for part in parts:
part = part.strip()
if part and not _PROGRESS_RE.search(part):
log_viewer.write(part)
m = _PROGRESS_RE.search(part)
if m and ("xfr#" in part or "to-chk=" in part or "MB/s" in part or "kB/s" in part or "GB/s" in part):
self._update_progress(part)
else:
log_viewer.write(line)
log_viewer.write(part)
def _update_progress(self, text: str) -> None:
"""Parse rsync progress2 line and update progress bar."""