From c63a92f9b7fe6159ab83d49921131d725b3c5cfd Mon Sep 17 00:00:00 2001 From: Jakub Roztocil Date: Fri, 12 Apr 2013 22:02:34 -0300 Subject: [PATCH] Cleanup --- README.rst | 2 +- httpie/downloads.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index 9a76d88d..44b39be6 100644 --- a/README.rst +++ b/README.rst @@ -840,7 +840,7 @@ is being saved to a file. HTTP/1.1 200 OK 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-Type: application/x-gzip Server: GitHub.com diff --git a/httpie/downloads.py b/httpie/downloads.py index c6770adb..196ad564 100644 --- a/httpie/downloads.py +++ b/httpie/downloads.py @@ -244,8 +244,10 @@ class Download(object): ) self._progress_reporter.output.write( - 'Downloading %s to "%s"\n' % ( - self._progress.total_size_humanized, + 'Downloading %sto "%s"\n' % ( + (humanize_bytes(total_size) + ' ' + if total_size is not None + else ''), self._output_file.name ) ) @@ -284,14 +286,12 @@ class Progress(object): self.downloaded = 0 self.total_size = None self.resumed_from = 0 - self.total_size_humanized = '?' self.time_started = None self.time_finished = None def started(self, resumed_from=0, total_size=None): assert self.time_started is None if total_size is not None: - self.total_size_humanized = humanize_bytes(total_size) self.total_size = total_size self.downloaded = self.resumed_from = resumed_from self.time_started = time() @@ -367,7 +367,6 @@ class ProgressReporter(object): self._status_line = template.format( percentage=percentage, downloaded=humanize_bytes(downloaded), - total=self.progress.total_size_humanized, speed=humanize_bytes(speed), eta=eta, )