python/httpie-cli
1
0
Fork 0
mirror of https://github.com/httpie/cli.git synced 2025-02-09 13:14:03 +02:00
Code

Cleanup

Browse Source
This commit is contained in:
Jakub Roztocil 2013-04-12 22:02:34 -03:00
parent d17e02792b
commit c63a92f9b7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -840,7 +840,7 @@ is being saved to a file.
HTTP/1.1 200 OK HTTP/1.1 200 OK
Connection: keep-alive Connection: keep-alive
Content-Disposition: attachment; filename=jkbr-httpie-0.4.1-20-g40bd8f6.tar.gz Content-Disposition: attachment; filename=jkbr-httpie-0.4.1-33-gfc4f70a.tar.gz
Content-Length: 505530 Content-Length: 505530
Content-Type: application/x-gzip Content-Type: application/x-gzip
Server: GitHub.com Server: GitHub.com

9
httpie/downloads.py
View File

@ -244,8 +244,10 @@ class Download(object):
) )
self._progress_reporter.output.write( self._progress_reporter.output.write(
'Downloading %s to "%s"\n' % ( 'Downloading %sto "%s"\n' % (
self._progress.total_size_humanized, (humanize_bytes(total_size) + ' '
if total_size is not None
else ''),
self._output_file.name self._output_file.name
) )
) )
@ -284,14 +286,12 @@ class Progress(object):
self.downloaded = 0 self.downloaded = 0
self.total_size = None self.total_size = None
self.resumed_from = 0 self.resumed_from = 0
self.total_size_humanized = '?'
self.time_started = None self.time_started = None
self.time_finished = None self.time_finished = None
def started(self, resumed_from=0, total_size=None): def started(self, resumed_from=0, total_size=None):
assert self.time_started is None assert self.time_started is None
if total_size is not None: if total_size is not None:
self.total_size_humanized = humanize_bytes(total_size)
self.total_size = total_size self.total_size = total_size
self.downloaded = self.resumed_from = resumed_from self.downloaded = self.resumed_from = resumed_from
self.time_started = time() self.time_started = time()
@ -367,7 +367,6 @@ class ProgressReporter(object):
self._status_line = template.format( self._status_line = template.format(
percentage=percentage, percentage=percentage,
downloaded=humanize_bytes(downloaded), downloaded=humanize_bytes(downloaded),
total=self.progress.total_size_humanized,
speed=humanize_bytes(speed), speed=humanize_bytes(speed),
eta=eta, eta=eta,
) )