Fixed downloads with no Content-Length.

README.rst

@@ -49,6 +49,7 @@ Main Features
 * Arbitrary request data
 * Custom headers
 * Persistent sessions
+* Wget-like downloads
 * Python 2.6, 2.7 and 3.x support
 * Linux, Mac OS X and Windows support
 * Documentation

httpie/downloads.py

@@ -22,8 +22,8 @@ PARTIAL_CONTENT = 206
 
 CLEAR_LINE = '\r\033[K'
 PROGRESS = (
-    '{downloaded: >9}'
+    '{downloaded: >10}'
-    ' {percentage: 5.2f}%'
+    ' {percentage: 6.2f}%'
     ' {speed: >10}/s'
     ' {eta: >8} ETA'
 )
@@ -103,7 +103,7 @@ def filename_from_content_disposition(content_disposition):
     # attachment; filename=jkbr-httpie-0.4.1-20-g40bd8f6.tar.gz
     match = re.search('filename=(\S+)', content_disposition)
     if match and match.group(1):
-        fn = match.group(1).lstrip('.')
+        fn = match.group(1).strip('."')
         if re.match('^[a-zA-Z0-9._-]+$', fn):
             return fn
 
@@ -197,7 +197,7 @@ class Download(object):
 
         try:
             total_size = int(response.headers['Content-Length'])
-        except (KeyError, ValueError):
+        except (KeyError, ValueError, TypeError):
             total_size = None
 
         if self._output_file:
@@ -343,23 +343,24 @@ class ProgressReporter(object):
 
             downloaded = self.progress.downloaded
 
-            if self.progress.total_size:
-                template = PROGRESS
-                percentage = (
-                    downloaded / self.progress.total_size * 100)
-            else:
-                template = PROGRESS_NO_CONTENT_LENGTH
-                percentage = None
-
             try:
                 # TODO: Use a longer interval for the speed/eta calculation?
                 speed = ((downloaded - self._prev_bytes)
                          / (now - self._prev_time))
-                s = int((self.progress.total_size - downloaded) / speed)
             except ZeroDivisionError:
                 speed = 0
+
+            if not self.progress.total_size:
+                template = PROGRESS_NO_CONTENT_LENGTH
+                percentage = None
+                eta = None
+            else:
+                template = PROGRESS
+                percentage = downloaded / self.progress.total_size * 100
+                if not speed:
                     eta = '-:--:--'
                 else:
+                    s = int((self.progress.total_size - downloaded) / speed)
                     h, s = divmod(s, 60 * 60)
                     m, s = divmod(s, 60)
                     eta = '{}:{:0>2}:{:0>2}'.format(h, m, s)
@@ -397,7 +398,8 @@ class ProgressReporter(object):
         self.output.write(CLEAR_LINE)
         self.output.write(SUMMARY.format(
             downloaded=humanize_bytes(actually_downloaded),
-            total=humanize_bytes(self.progress.total_size),
+            total=(self.progress.total_size
+                   and humanize_bytes(self.progress.total_size)),
             speed=humanize_bytes(actually_downloaded / time_taken),
             time=time_taken,
         ))

tests/tests.py

@@ -38,6 +38,7 @@ try:
 except ImportError:
     skip = lambda msg: lambda self: None
 
+    # noinspection PyUnusedLocal
     def skipIf(cond, reason):
         def decorator(test_method):
             if cond:
@@ -251,10 +252,12 @@ class BaseTestCase(unittest.TestCase):
     def assertIsNone(self, obj, msg=None):
         self.assertEqual(obj, None, msg=msg)
 
+
 #################################################################
 # High-level tests using httpbin.
 #################################################################
 
+
 class HTTPieTest(BaseTestCase):
 
     def test_GET(self):
@@ -1465,7 +1468,7 @@ class DownloadUtilsTest(BaseTestCase):
             'hello-WORLD_123.txt'
         )
         self.assertEqual(
-            parse('attachment; filename=.hello-WORLD_123.txt'),
+            parse('attachment; filename=".hello-WORLD_123.txt"'),
             'hello-WORLD_123.txt'
         )
         self.assertIsNone(parse('attachment; filename='))
@@ -1493,7 +1496,7 @@ class DownloadUtilsTest(BaseTestCase):
     def test_unique_filename(self):
 
         def make_exists(unique_on_attempt=0):
-            # noinspection PyUnresolvedReferences
+            # noinspection PyUnresolvedReferences,PyUnusedLocal
             def exists(filename):
                 if exists.attempt == unique_on_attempt:
                     return False