Handle no Content-Length header downloads

Before it would show Downloading: Infinity%, now it just shows Downloading... I could reproduce this on the first time I download .zip source code from github releases page Auditors: @aekeus
brave · Mar 31, 2016 · eb96ff7 · eb96ff7 · aekeus · Mar 31, 2016
1 parent f3c8fa7
commit eb96ff7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/app/locales/en-US/downloads.l20n b/app/locales/en-US/downloads.l20n
@@ -6,6 +6,7 @@
 <downloadCompleted "Completed">
 <downloadInProgress "Downloading: {{$downloadPercent}}">
 <downloadPaused "Paused: {{$downloadPercent}}">
+<downloadInProgressUnknownTotal "Downloading...">
 
 <downloadPause title: "Pause Download">
 <downloadResume title: "Resume Download">

diff --git a/js/components/downloadsBar.js b/js/components/downloadsBar.js
@@ -87,7 +87,7 @@ class DownloadItem extends ImmutableComponent {
         }
       </div>
       {
-        this.isInProgress || this.isPaused
+        (this.isInProgress || this.isPaused) && this.props.download.get('totalBytes')
         ? <div className='downloadProgress' style={progressStyle}/>
         : null
       }

diff --git a/js/state/downloadUtil.js b/js/state/downloadUtil.js
@@ -38,7 +38,11 @@ module.exports.getL10nId = (download) => {
     case downloadStates.CANCELLED:
       return 'downloadCancelled'
     case downloadStates.IN_PROGRESS:
-      return 'downloadInProgress'
+      if (!download.get('totalBytes')) {
+        return 'downloadInProgressUnknownTotal'
+      } else {
+        return 'downloadInProgress'
+      }
     case downloadStates.COMPLETED:
       return 'downloadCompleted'
     case downloadStates.PAUSED:
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,7 +87,7 @@ class DownloadItem extends ImmutableComponent { @@
             }
           </div>
           {
-            this.isInProgress || this.isPaused
+            (this.isInProgress || this.isPaused) && this.props.download.get('totalBytes')
             ? <div className='downloadProgress' style={progressStyle}/>
             : null
           }
@@ Expand Down @@