Changeset 1009

Timestamp:

07/31/08 04:33:49 (1 month ago)

Author:

MaierMan

Message:

• #826: Download Fails when size is unknown
  
• #827: SessionManager? should load asynchronously
  
• Various speed improvements
  

Files:

• trunk/chrome/content/dta/manager.js (modified) (27 diffs)
• trunk/chrome/content/dta/manager.xul (modified) (1 diff)
• trunk/chrome/content/dta/manager/info.js (modified) (3 diffs)
• trunk/chrome/content/dta/manager/sessionmanager.js (modified) (3 diffs)
• trunk/chrome/content/dta/manager/tree.js (modified) (7 diffs)
• trunk/chrome/locale/en-US/manager.properties (modified) (1 diff)
• trunk/chrome/skin/manager/style.css (modified) (1 diff)

trunk/chrome/content/dta/manager.js

@@ -86 +86 @@
-Components.utils.import('resource://dta/prompts.jsm', Prompts);
-
+var TEXT_PAUSED;
+var TEXT_QUEUED;
+var TEXT_COMPLETE;
+var TEXT_CANCELED;
+
-var Dialog = {
-        _observes: [
@@ -116 +121 @@
-        totalbytes: 0,
-        init: function D_init() {
+                
+                TEXT_PAUSED = _('paused');
+                TEXT_QUEUED = _('queued');
+                TEXT_COMPLETE = _('complete');
+                TEXT_CANCELED = _('canceled');
+                
-                Tree.init($("downloads"));
-                SessionManager.init();
@@ -136 +147 @@
-                        
-                document.getElementById("dtaHelp").hidden = !("openHelp" in window);
+        },
-        
-
+start: function() {
-                if ("arguments" in window) {
-                        startDownloads(window.arguments[0], window.arguments[1]);
-                }
-
-                Tree.invalidate();
-                this._initialized = true;
-                for (let d in Tree.all) {
@@ -152 +163 @@
-                new Timer("Dialog.refreshWritten();", 100, true, true);
-                new Timer("Dialog.saveRunning();", 10000, true);
-
+
+
+
+
-        observe: function D_observe(subject, topic, data) {
-                if (topic == 'quit-application-requested') {
@@ -177 +191 @@
-                        let sum = 0;
-                        const now = Utils.getTimestamp();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                                        }
-
-
-
+
+
+
+
+
+
-                        let elapsed = (now - this._lastTime) / 1000;
-                        this._lastTime = now;
@@ -304 +316 @@
-                        }
-
-
+
+
-                                if (Prefs.autoRetryInterval) {
-                                        for (let d in Tree.all) {
@@ -403 +416 @@
-                try {
-                        // check if there is something running or scheduled
-
+Of
-                                return;
-                        }
@@ -435 +448 @@
-        },
-        _canClose: function D__canClose() {
-
+Of
-                        var rv = Prompts.confirmYN(
-                                window,
@@ -465 +478 @@
-                Tree.updateAll(
-                        function(d) {
-
+Of
-                                        // enumerate all running chunks
-                                        d.chunks.forEach(
@@ -667 +680 @@
-        fileName: null,
-        acceptRanges: 'bytes',
-l
+L
-        time: null,
-
@@ -703 +716 @@
-
-                                case 'content-length':
-
+
+
+
+
-                                break;
-
-                                case 'content-range': {
-l
-l
-length = cl
+ontentLength
+ontentLength
+Length = Math.floor(contentLength)
-                                        }
-                                }
@@ -892 +908 @@
-        },
-        set state(nv) {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        },
-        
@@ -911 +929 @@
-        },
-        set fileName(nv) {
+                if (this._fileName == nv) {
+                        return nv;
+                }
-                this._fileName = nv;
-                this.rebuildDestination();
@@ -975 +996 @@
-        },
-        set conflicts(nv) {
-ypeof(nv) != 'number'
-this._conflicts
+his._conflicts == nv
+nv
-                }
-                this._conflicts = nv;
@@ -1014 +1035 @@
-         *Takes one or more state indicators and returns if this download is in state of any of them
-         */
-
-
+
+
+
+
+
-                for (let i = 0, e = arguments.length; i < e; ++i) {
-                        if (state == arguments[i]) {
@@ -1021 +1045 @@
-                        }
-                }
-
+          
-        },
-        
@@ -1066 +1090 @@
-        get totalSize() { return this._totalSize; },
-        set totalSize(nv) {
-
+
+
+
+
+
+
-                this.invalidate();
-                return this._totalSize;
@@ -1155 +1184 @@
-        _status : '',
-        get status() {
-
+Of
-                        return _('offline');
-                }
@@ -1350 +1379 @@
-                this.activeChunks = 0;
-                this.state = COMPLETE;
-_("complete")
+TEXT_COMPLETE
-        },
-        rebuildDestination: function QI_rebuildDestination() {
@@ -1550 +1579 @@
-                this._autoRetryTime = 0;
-                this.state = QUEUED;
-_('queued')
+TEXT_QUEUED
-        },
-        resumeDownload: function QI_resumeDownload() {
@@ -1643 +1672 @@
-        dumpScoreboard: function QI_dumpScoreboard() {
-                let scoreboard = '';
-String(this.totalSize).length; 
+this.totalSize.toString().length;
-                this.chunks.forEach(
-                        function(c,i) {
@@ -1698 +1727 @@
-                }
-                // Store this so we can later resume.
-
+Of
-                        e.tmpFile = this.tmpFile.path;
-                }
@@ -1715 +1744 @@
-                e.chunks = [];
-
-
-
-
-
-
-
+
+
+
+
-                }
-                return Serializer.encode(e);
@@ -2242 +2269 @@
-                }
-
-
-
-
+
+
+
+
-                        d.totalSize = 0;
-                }
@@ -2459 +2487 @@
-                }
-
-
+Of
-                        if (d.resumable) {
-                                d.pause();
@@ -2474 +2502 @@
-                        return;                 
-                }
-
+Of
-                        d.resumeDownload();
-                }
@@ -2609 +2637 @@
-                qi.state = start ? QUEUED : PAUSED;
-                if (qi.is(QUEUED)) {
-_('queued')
+TEXT_QUEUED
-                }
-                else {
-_('paused')
+TEXT_PAUSED
-                }
-                qi.save();              

trunk/chrome/content/dta/manager.xul

@@ -120 +120 @@
-        </popupset>     
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        <statusbar id="footer" chromedir="&locale.dir;">

trunk/chrome/content/dta/manager/info.js

@@ -59 +59 @@
-                                        $('sourcePage')._value = $("sourcePage").value = d.referrer.spec;
-                                }
-
+Of
-                                        $('sourcePage').removeAttribute('readonly');
-                                }
@@ -92 +92 @@
-                                $('canvasGrid').hidden = true;
-                        }                               
-
+Of
-                                for each (let e in $('directory', 'renaming', 'mask', 'browsedir')) {
-                                        e.setAttribute('readonly', 'true');
@@ -148 +148 @@
-                
-                for each (let d in t) {
-
+Of
-                                return;
-                        }

trunk/chrome/content/dta/manager/sessionmanager.js

@@ -41 +41 @@
-const DB_VERSION = 1;
-
+Components.utils.import('resource://dta/cothread.jsm');
+
-var SessionManager = {
-        init: function() {
@@ -76 +78 @@
-        shutdown: function() {
-                try {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                catch (ex) {
-                        Debug.log("SessionManager::shutdown", ex);
-                }
-                this._con.executeSimpleSQL('VACUUM');
-                if ('close' in this._con) {
-                        try {
-                                this._con.close();
-                        }
-                        catch (ex) {
-                                //
-                        }
-                }
-        },
@@ -154 +158 @@
-
-        load: function() {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                Tree.beginUpdate();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                                
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-