From f8232905e6585092f7555919ad11765400d1eebd Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Fri, 21 Jun 2024 15:44:49 -0700 Subject: [PATCH] Add some logging after download is finished. NFC Also move some code outside of the `using` block. --- emsdk.py | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/emsdk.py b/emsdk.py index 9eccfb5693..d75a16cef5 100644 --- a/emsdk.py +++ b/emsdk.py @@ -682,20 +682,21 @@ def download_with_curl(url, file_name): def download_with_urllib(url, file_name): u = urlopen(url) + file_size = get_content_length(u) + if file_size > 0: + print("Downloading: %s from %s, %s Bytes" % (file_name, url, file_size)) + else: + print("Downloading: %s from %s" % (file_name, url)) + + file_size_dl = 0 + # Draw a progress bar 80 chars wide (in non-TTY mode) + progress_max = 80 - 4 + progress_shown = 0 + block_sz = 256 * 1024 + if not TTY_OUTPUT: + print(' [', end='') + with open(file_name, 'wb') as f: - file_size = get_content_length(u) - if file_size > 0: - print("Downloading: %s from %s, %s Bytes" % (file_name, url, file_size)) - else: - print("Downloading: %s from %s" % (file_name, url)) - - file_size_dl = 0 - # Draw a progress bar 80 chars wide (in non-TTY mode) - progress_max = 80 - 4 - progress_shown = 0 - block_sz = 256 * 1024 - if not TTY_OUTPUT: - print(' [', end='') while True: buffer = u.read(block_sz) if not buffer: @@ -713,9 +714,12 @@ def download_with_urllib(url, file_name): print('-', end='') sys.stdout.flush() progress_shown += 1 - if not TTY_OUTPUT: - print(']') - sys.stdout.flush() + + if not TTY_OUTPUT: + print(']') + sys.stdout.flush() + + debug_print('finished downloading (%d bytes)' % file_size_dl) # On success, returns the filename on the disk pointing to the destination file that was produced