extern/httpie-cli
1
0
Fork 1
mirror of https://github.com/httpie/cli.git synced 2024-11-25 09:13:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Jakub Roztocil 2013-04-10 11:48:18 -03:00
parent 6e5c696ac9
commit 36bc64e02f
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
httpie/downloads.py
View File

@ -11,7 +11,7 @@ from time import time
from .output import RawStream from .output import RawStream
from .models import HTTPResponse from .models import HTTPResponse
from .humanize import humanize_bytes from .utils import humanize_bytes
from .compat import urlsplit from .compat import urlsplit
@ -56,7 +56,7 @@ class Download(object):
else: else:
self._resumed_from = bytes_have self._resumed_from = bytes_have
# Set ``Range`` header to resume the download # Set ``Range`` header to resume the download
# TODO: detect Range support first? # TODO: What if Range isn't supported by the server?
headers['Range'] = '%d-' % bytes_have headers['Range'] = '%d-' % bytes_have
def start(self, response): def start(self, response):
@ -81,7 +81,7 @@ class Download(object):
self._output_file.seek(0) self._output_file.seek(0)
self._output_file.truncate() self._output_file.truncate()
else: else:
# TODO: should we take the filename from response.history[0].url? # TODO: Should the filename be taken from response.history[0].url?
# Output file not specified. Pick a name that doesn't exist yet. # Output file not specified. Pick a name that doesn't exist yet.
content_type = response.headers.get('Content-Type', '') content_type = response.headers.get('Content-Type', '')
self._output_file = open( self._output_file = open(
@ -92,7 +92,7 @@ class Download(object):
mode='a+b' mode='a+b'
) )
self._progress.start( self._progress.started(
resumed_from=self._resumed_from, resumed_from=self._resumed_from,
content_length=content_length content_length=content_length
) )
@ -102,11 +102,12 @@ class Download(object):
with_headers=False, with_headers=False,
with_body=True, with_body=True,
on_body_chunk_downloaded=self._on_progress, on_body_chunk_downloaded=self._on_progress,
# FIXME: large chunks & chunked response => freezes # FIXME: Large chunks & chunked response => freezes (requests bug?)
chunk_size=1 chunk_size=1
) )
self._progress.output.write('Saving to %s\n' % self._output_file.name) self._progress.output.write(
'Saving to "%s"\n' % self._output_file.name)
self._progress.report() self._progress.report()
return stream, self._output_file return stream, self._output_file
@ -179,10 +180,11 @@ class Progress(object):
self._downloaded_prev = 0 self._downloaded_prev = 0
self._content_length_humanized = '?' self._content_length_humanized = '?'
self._time_started = None self._time_started = None
self._time_finished = None
self._time_prev = None self._time_prev = None
self._speed = 0 self._speed = 0
def start(self, resumed_from=0, content_length=None): def started(self, resumed_from=0, content_length=None):
assert self._time_started is None assert self._time_started is None
if content_length is not None: if content_length is not None:
self._content_length_humanized = humanize_bytes(content_length) self._content_length_humanized = humanize_bytes(content_length)
@ -197,7 +199,7 @@ class Progress(object):
def report(self, interval=.6): def report(self, interval=.6):
now = time() now = time()
# Update the reported speed on the first chunk and once in a while. # Update the reported speed on the first chunk and then once in a while
if self._downloaded_prev and now - self._time_prev < interval: if self._downloaded_prev and now - self._time_prev < interval:
return return
@ -225,8 +227,11 @@ class Progress(object):
self.output.flush() self.output.flush()
def finished(self): def finished(self):
assert self._time_started is not None
assert self._time_finished is None
downloaded = self.downloaded - self._resumed_from downloaded = self.downloaded - self._resumed_from
time_taken = time() - self._time_started self._time_finished = time()
time_taken = self._time_finished - self._time_started
self.output.write(self.CLEAR_LINE + self.SUMMARY.format( self.output.write(self.CLEAR_LINE + self.SUMMARY.format(
downloaded=humanize_bytes(downloaded), downloaded=humanize_bytes(downloaded),
total=humanize_bytes(self.downloaded), total=humanize_bytes(self.downloaded),

14
httpie/humanize.py → httpie/utils.py
View File

@ -1,14 +1,10 @@
"""
Author: Doug Latornell
Licence: MIT
URL: http://code.activestate.com/recipes/577081/
"""
from __future__ import division from __future__ import division
import doctest
def humanize_bytes(n, precision=2): def humanize_bytes(n, precision=2):
# Author: Doug Latornell
# Licence: MIT
# URL: http://code.activestate.com/recipes/577081/
"""Return a humanized string representation of a number of bytes. """Return a humanized string representation of a number of bytes.
Assumes `from __future__ import division`. Assumes `from __future__ import division`.
@ -48,7 +44,3 @@ def humanize_bytes(n, precision=2):
break break
return '%.*f %s' % (precision, n / factor, suffix) return '%.*f %s' % (precision, n / factor, suffix)
if __name__ == '__main__':
doctest.testmod()