open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmd_send_twisted: fix display message ordering

Browse Source 
By creating the ProgressingFileSender too early, it printed a progress
message before the "Sending" line.
This commit is contained in:
Brian Warner 2016-03-02 00:50:22 -08:00
parent df2384bea2
commit 4d405c8cef
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wormhole/scripts/cmd_send_twisted.py
View File

@ -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)