From 24f16be8b3d9a13331e99a4998d00d27ad4f1d31 Mon Sep 17 00:00:00 2001 From: deajan Date: Tue, 14 May 2024 00:21:05 +0200 Subject: [PATCH] GUI: Cosmetic fixes for stdout/stderr queues --- npbackup/core/runner.py | 4 ++-- npbackup/gui/helpers.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/npbackup/core/runner.py b/npbackup/core/runner.py index c3ad025..18b932d 100644 --- a/npbackup/core/runner.py +++ b/npbackup/core/runner.py @@ -330,9 +330,9 @@ class NPBackupRunner: if msg is None: raise ValueError("None log message received") if self.stdout and (level == "info" or (level == "debug" and _DEBUG)): - self.stdout.put(msg) + self.stdout.put(f"\n{msg}") if self.stderr and level in ("critical", "error", "warning"): - self.stderr.put(msg) + self.stderr.put(f"\n{msg}") if raise_error == "ValueError": raise ValueError(msg) diff --git a/npbackup/gui/helpers.py b/npbackup/gui/helpers.py index 83db04c..642572a 100644 --- a/npbackup/gui/helpers.py +++ b/npbackup/gui/helpers.py @@ -258,6 +258,7 @@ def gui_thread_runner( if stdout_data is None: logger.debug("gui_thread_runner got stdout queue close signal") read_stdout_queue = False + progress_window["-OPERATIONS-PROGRESS-STDOUT-"].Update("\n", append=True) else: progress_window["-OPERATIONS-PROGRESS-STDOUT-"].Update( f"\n{stdout_data}", append=True @@ -273,6 +274,7 @@ def gui_thread_runner( if stderr_data is None: logger.debug("gui_thread_runner got stderr queue close signal") read_stderr_queue = False + progress_window["-OPERATIONS-PROGRESS-STDERR-"].Update("\n", append=True) else: stderr_has_messages = True # if __compact: