Skip to content
This repository was archived by the owner on Sep 2, 2025. It is now read-only.

Commit 5b0098f

Browse files
committed
Cli: Fix render of summary
1 parent 766c368 commit 5b0098f

File tree

1 file changed

+49
-47
lines changed

1 file changed

+49
-47
lines changed

bumgr/backup.py

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -396,53 +396,55 @@ def backup(self, name: str, console: Console) -> bool:
396396
continue
397397
line: str = p.stdout.readline().decode("utf-8")
398398
if not line.startswith("{"):
399-
logger.warning(line)
400-
else:
401-
try:
402-
msg: dict[str, Any] = json.loads(line)
403-
except json.JSONDecodeError:
404-
logger.warning(f"{line}")
405-
continue
406-
match msg.get("message_type"):
407-
case "status":
408-
progress.update(
409-
task,
410-
completed=msg.get("bytes_done", None),
411-
total=msg.get("total_bytes"),
412-
errors=msg.get("error_count", 0),
413-
)
414-
case "error":
415-
err_msg = msg.get("error", {}).get("message")
416-
err_during = msg.get("during") # noqa
417-
err_item = msg.get("item")
418-
output = f"Error ({name}): {err_msg} ({err_item})"
419-
logger.error(output)
420-
console.print(output)
421-
case "summary":
422-
files_new = msg.get("files_new")
423-
dirs_new = msg.get("dirs_new") # noqa: F841
424-
files_changed = msg.get("files_changed") # noqa: F841
425-
dirs_changed = msg.get("dirs_changed") # noqa: F841
426-
data_added = msg.get("data_added", 0) # noqa: F841
427-
data_added_packed = msg.get("data_added_packed", 0)
428-
total_duration = msg.get("total_duration") # noqa: F841
429-
table = Table(
430-
"Files added",
431-
"Files changed",
432-
"Dirs added",
433-
"Dirs changed",
434-
"Data added",
435-
"Data added (compressed)",
436-
title="Summary",
437-
)
438-
table.add_row(
439-
files_new,
440-
files_changed,
441-
dirs_new,
442-
dirs_changed,
443-
decimal(data_added),
444-
decimal(data_added_packed),
445-
)
399+
if line.strip():
400+
logger.warning(line)
401+
continue
402+
try:
403+
msg: dict[str, Any] = json.loads(line)
404+
except json.JSONDecodeError:
405+
logger.warning(f"{line}")
406+
continue
407+
match msg.get("message_type"):
408+
case "status":
409+
progress.update(
410+
task,
411+
completed=msg.get("bytes_done", None),
412+
total=msg.get("total_bytes"),
413+
errors=msg.get("error_count", 0),
414+
)
415+
case "error":
416+
err_msg = msg.get("error", {}).get("message")
417+
err_during = msg.get("during") # noqa
418+
err_item = msg.get("item")
419+
output = f"Error ({name}): {err_msg} ({err_item})"
420+
logger.error(output)
421+
console.print(output)
422+
case "summary":
423+
files_new = msg.get("files_new")
424+
dirs_new = msg.get("dirs_new") # noqa: F841
425+
files_changed = msg.get("files_changed") # noqa: F841
426+
dirs_changed = msg.get("dirs_changed") # noqa: F841
427+
data_added = msg.get("data_added", 0) # noqa: F841
428+
data_added_packed = msg.get("data_added_packed", 0)
429+
total_duration = msg.get("total_duration") # noqa: F841
430+
table = Table(
431+
"Files added",
432+
"Files changed",
433+
"Dirs added",
434+
"Dirs changed",
435+
"Data added",
436+
"Data added (compressed)",
437+
title="Summary",
438+
)
439+
table.add_row(
440+
str(files_new),
441+
str(files_changed),
442+
str(dirs_new),
443+
str(dirs_changed),
444+
str(decimal(data_added)),
445+
str(decimal(data_added_packed)),
446+
)
447+
console.print(table)
446448
match p.returncode:
447449
case 0:
448450
logger.info("Backup finished successfully")

0 commit comments

Comments
 (0)