From 56777f59c313fbe94671ab5b0b738507cbfc193b Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 24 Jan 2011 10:14:01 -0500
Subject: [PATCH] Add totals columns to the download manager.

--HG--
branch : key-processing
---
 common/modules/downloads.jsm | 33 ++++++++++++++++++++++++++++-----
 common/modules/util.jsm      |  3 ++-
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/common/modules/downloads.jsm b/common/modules/downloads.jsm
index b1a2ea38..a7ee8ed8 100644
--- a/common/modules/downloads.jsm
+++ b/common/modules/downloads.jsm
@@ -190,15 +190,18 @@ var DownloadList = Class("DownloadList",
                             <span>Source</span>
                         </li>
                         <li highlight="Download"><span><div style="min-height: 1ex; /* FIXME */"/></span></li>
-                        <li highlight="Download" key="totals">
-                            <span highlight="Title">Totals:</span>
+                        <li highlight="Download" key="totals" active="true">
+                            <span><span highlight="Title">Totals:</span>&#xa0;<span key="total"/></span>
                             <span/>
                             <span highlight="DownloadButtons">
                                 <a highlight="Button" key="clear">Clear</a>
                             </span>
-                            <span/>
-                            <span/>
-                            <span/>
+                            <span highlight="DownloadProgress" key="progress">
+                                <span highlight="DownloadProgressHave" key="progressHave"
+                                />/<span highlight="DownloadProgressTotal" key="progressTotal"/>
+                            </span>
+                            <span highlight="DownloadPercent" key="percent"/>
+                            <span highlight="DownloadTime" key="time"/>
                             <span/>
                         </li>
                       </ul>, this.document, this.nodes);
@@ -253,6 +256,25 @@ var DownloadList = Class("DownloadList",
         for (let node in values(this.nodes))
             if (node.update && node.update != update)
                 node.update();
+        this.updateProgress();
+    },
+
+    timeRemaining: Infinity,
+
+    updateProgress: function updateProgress() {
+        let downloads = values(this.downloads).toArray();
+
+        let self = Object.create(this);
+        for (let prop in values(["amountTransferred", "size", "speed", "timeRemaining"]))
+            this[prop] = downloads.reduce(function (acc, dl) dl[prop] + acc, 0);
+
+        Download.prototype.updateProgress.call(self);
+
+        let active = downloads.filter(function (dl) dl.alive).length;
+        if (active)
+            this.nodes.total.textContent = active + " active";
+        else for (let key in values(["total", "percent", "time"]))
+            this.nodes[key].textContent = "";
     },
 
     observers: {
@@ -290,6 +312,7 @@ var DownloadList = Class("DownloadList",
         try {
             if (download.id in this.downloads)
                 this.downloads[download.id].updateProgress();
+            this.updateProgress();
         }
         catch (e) {
             util.reportError(e);
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index a58a116e..7ee979c8 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -672,6 +672,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
      * @returns {string}
      */
     formatSeconds: function formatSeconds(seconds) {
+        function pad(n, val) ("0000000" + val).substr(-Math.max(n, String(val).length));
         function div(num, denom) [Math.round(num / denom), Math.round(num % denom)];
         let days, hours, minutes;
 
@@ -683,7 +684,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
         if (hours)
             return hours + "h " + minutes + "m";
         if (minutes)
-            return minutes + ":" + seconds;
+            return minutes + ":" + pad(2, seconds);
         return seconds + "s";
     },