Added download count/badge and progress (closes brave#3023)

timborden · Jul 5, 2017 · 5f267ea · 5f267ea
1 parent db1e1bc
commit 5f267ea
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/app/browser/electronDownloadItem.js b/app/browser/electronDownloadItem.js
@@ -10,16 +10,44 @@ const app = electron.app
  * Maps downloadId to an electron download-item
  */
 const downloadMap = {}
+/**
+ * Monitor progress of active downloads
+ */
+let completedBytes = 0
+const activeDownloadItems = () => Object.keys(downloadMap).length
+const progressDownloadItems = () => {
+  const receivedBytes = Object.keys(downloadMap).reduce((receivedBytes, downloadId) => {
+    receivedBytes += downloadMap[downloadId].getReceivedBytes()
+    return receivedBytes
+  }, completedBytes)
+  const totalBytes = Object.keys(downloadMap).reduce((totalBytes, downloadId) => {
+    totalBytes += downloadMap[downloadId].getTotalBytes()
+    return totalBytes
+  }, completedBytes)
+  return receivedBytes / totalBytes
+}
 
-module.exports.updateElectronDownloadItem = (downloadId, item, state) => {
+module.exports.updateElectronDownloadItem = (win, downloadId, item, state) => {
   if (state === downloadStates.INTERRUPTED || state === downloadStates.CANCELLED || state === downloadStates.COMPLETED) {
     if (app.dock && state === downloadStates.COMPLETED) {
       app.dock.downloadFinished(item.getSavePath())
     }
+    completedBytes += downloadMap[downloadId].getTotalBytes()
     delete downloadMap[downloadId]
   } else {
     downloadMap[downloadId] = item
   }
+  if (['darwin', 'linux'].includes(process.platform)) {
+    app.setBadgeCount(activeDownloadItems())
+  }
+  if (win && !win.isDestroyed()) {
+    if (activeDownloadItems()) {
+      win.setProgressBar(progressDownloadItems())
+    } else {
+      win.setProgressBar(-1)
+      completedBytes = 0
+    }
+  }
 }
 
 module.exports.cancelDownload = (downloadId) =>

diff --git a/app/filtering.js b/app/filtering.js
@@ -474,8 +474,8 @@ function registerPermissionHandler (session, partition) {
   })
 }
 
-function updateDownloadState (downloadId, item, state) {
-  updateElectronDownloadItem(downloadId, item, state)
+function updateDownloadState (win, downloadId, item, state) {
+  updateElectronDownloadItem(win, downloadId, item, state)
 
   if (!item) {
     appActions.mergeDownloadDetail(downloadId, { state: downloadStates.INTERRUPTED })
@@ -532,16 +532,16 @@ function registerForDownloadListener (session) {
     appActions.changeSetting(settings.DEFAULT_DOWNLOAD_SAVE_PATH, path.dirname(savePath))
 
     const downloadId = uuid.v4()
-    updateDownloadState(downloadId, item, downloadStates.PENDING)
+    updateDownloadState(win, downloadId, item, downloadStates.PENDING)
     if (win) {
       win.webContents.send(messages.SHOW_DOWNLOADS_TOOLBAR)
     }
     item.on('updated', function () {
       const state = item.isPaused() ? downloadStates.PAUSED : downloadStates.IN_PROGRESS
-      updateDownloadState(downloadId, item, state)
+      updateDownloadState(win, downloadId, item, state)
     })
     item.on('done', function (e, state) {
-      updateDownloadState(downloadId, item, state)
+      updateDownloadState(win, downloadId, item, state)
     })
   })
 }