generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reverted download code and output that was done in https://webrtc-codereview.appspot.com/431003 (r1826) since it was reported to spam the output on some configurations.

Browse Source 
BUG=Issue 333
TEST=ran update.py

Review URL: https://webrtc-codereview.appspot.com/449001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1867 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2012-03-09 11:15:07 +00:00
parent 0dab9e1523
commit 7256bdc3f5
1 changed files with 22 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
tools/resources/update.py
View File

@ -125,14 +125,29 @@ def _perform_download(base_url, desired_version, downloads_dir):
base_url += '/'
remote_archive_url = urljoin(base_url, archive_name)
# Download into the temporary directory with display of progress, inspired
# by the Stack Overflow post at
# http://stackoverflow.com/questions/2028517/python-urllib2-progress-hook
# by the Stack Overflow post at http://goo.gl/JIrbo
temp_filename = os.path.join(temp_dir, archive_name)
print 'Downloading: %s' % remote_archive_url
response = urllib2.urlopen(remote_archive_url)
temp_file = open(temp_filename, 'wb')
_read_chunks(temp_file, response)
meta = response.info()
file_size_kb = int(meta.getheaders('Content-Length')[0]) / 1024
print 'Progress: %s : %s kB' % (archive_name, file_size_kb)
file_size_dl_kb = 0
block_size = 65536
while True:
file_buffer = response.read(block_size)
if not file_buffer:
break
file_size_dl_kb += len(file_buffer) / 1024
temp_file.write(file_buffer)
status = r'%10d kB [%3.2f%%]' % (file_size_dl_kb,
file_size_dl_kb * 100. / file_size_kb)
status += chr(8) * (len(status) + 1)
print status,
print
temp_file.close()
# Clean up the existing resources dir.
@ -148,52 +163,14 @@ def _perform_download(base_url, desired_version, downloads_dir):
# Write the downloaded version to a text file in the resources dir to avoid
# re-download of the same version in the future.
new_version_file = os.path.join(downloads_dir, VERSION_FILENAME)
f = open(new_version_file, 'w')
f.write('%d' % desired_version)
f.close()
new_version_filename = os.path.join(downloads_dir, VERSION_FILENAME)
version_file = open(new_version_filename, 'w')
version_file.write('%d' % desired_version)
version_file.close()
finally:
# Clean up the temp dir.
shutil.rmtree(temp_dir)
def _print_progress(bytes_so_far, total_size):
"""Prints a chunk report of the download progress so far.
Args:
bytes_so_far: The number of bytes read so far.
total_size: Total file size of download.
"""
percent = (float(bytes_so_far) / total_size) * 100
percent = round(percent, 2)
sys.stdout.write('Downloaded %d of %d kB (%0.2f%%)\r' %
(bytes_so_far/1024, total_size/1024, percent))
if bytes_so_far >= total_size:
sys.stdout.write('\n')
def _read_chunks(output_file, response, chunk_size=10*1024):
"""Reads data chunks from the response until we're done downloading.
Args:
output_file: The file to write the data into.
response: The HTTP response to read data from.
chunk_size: How much to read between each UI update.
Returns:
The total number of bytes read."""
total_size = response.info().getheader('Content-Length').strip()
total_size = int(total_size)
bytes_so_far = 0
while True:
chunk = response.read(chunk_size)
output_file.write(chunk)
bytes_so_far += len(chunk)
if not chunk:
break
_print_progress(bytes_so_far, total_size)
return bytes_so_far
if __name__ == '__main__':
main()