From 4d405c8ceff7d1fcd0550d8ab36b362e554ef167 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Wed, 2 Mar 2016 00:50:22 -0800 Subject: [PATCH] cmd_send_twisted: fix display message ordering By creating the ProgressingFileSender too early, it printed a progress message before the "Sending" line. --- src/wormhole/scripts/cmd_send_twisted.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wormhole/scripts/cmd_send_twisted.py b/src/wormhole/scripts/cmd_send_twisted.py index 317aa6d..ee61b72 100644 --- a/src/wormhole/scripts/cmd_send_twisted.py +++ b/src/wormhole/scripts/cmd_send_twisted.py @@ -134,11 +134,11 @@ def _send_file_twisted(tdata, transit_sender, fd_to_send, progress_stdout = stdout if hide_progress: progress_stdout = io.StringIO() - pfs = ProgressingFileSender(filesize, progress_stdout) record_pipe = yield transit_sender.connect() # record_pipe should implement IConsumer, chunks are just records print(u"Sending (%s).." % record_pipe.describe(), file=stdout) + pfs = ProgressingFileSender(filesize, progress_stdout) _start = timing.add_event("tx file") yield pfs.beginFileTransfer(fd_to_send, record_pipe) timing.finish_event(_start)