Changeset 750

Timestamp:

2008-01-18 20:14:29 (1 year ago)

Author:

MaierMan

Message:

initial implementation of the auto-retry backend

Files:

• trunk/chrome/content/dta/manager.js (modified) (18 diffs)
• trunk/chrome/content/dta/manager/prefs.js (modified) (1 diff)
• trunk/chrome/content/dta/manager/tree.js (modified) (1 diff)
• trunk/chrome/content/dta/manager/verificator.js (modified) (1 diff)
• trunk/defaults/preferences/dta.js (modified) (1 diff)

trunk/chrome/content/dta/manager.js

@@ -36 +36 @@
- *
- * ***** END LICENSE BLOCK ***** */
+ 
+const NS_ERROR_MODULE_NETWORK = 0x804B0000;
+const NS_ERROR_BINDING_ABORTED = NS_ERROR_MODULE_NETWORK + 2;
+const NS_ERROR_UNKNOWN_HOST = NS_ERROR_MODULE_NETWORK + 30;
+const NS_ERROR_CONNECTION_REFUSED = NS_ERROR_MODULE_NETWORK + 13;
+const NS_ERROR_NET_TIMEOUT = NS_ERROR_MODULE_NETWORK + 14;
+const NS_ERROR_NET_RESET = NS_ERROR_MODULE_NETWORK + 20;
-
-const Cc = Components.classes;
@@ -229 +236 @@
-                try {
-                        this.refresh();
-
+
+
+
+
+
+
+
-                        this._running.forEach(
-                                function(i) {
@@ -237 +250 @@
-                                                if (d.resumable) {
-                                                        d.pause();
+                                                        d.markAutoRetry();
-                                                        d.status = _("timeout");
-                                                }
@@ -925 +939 @@
-        set conflicts(nv) {
-                if (typeof(nv) != 'number') {
-
+ this._conflicts
-                }
-                this._conflicts = nv;
@@ -1067 +1081 @@
-        _status : '',
-        get status() {
-
+ + (this._autoRetryTime ? ' *' : '')
-        },
-        set status(nv) {
@@ -1103 +1117 @@
-        },
-
-retry: function QI_r
+safeRetry: function QI_safeR
-                // reset flags
-                this.totalSize = this.partialSize = 0;
@@ -1429 +1443 @@
-        },
-        sessionConnections: 0,
+        _autoRetries: 0,
+        _autoRetryTime: 0,
+        markAutoRetry: function QI_markRetry() {
+                if (!Prefs.autoRetryInterval || Prefs.maxAutoRetries <= this._autoRetries) {
+                         return;
+                }
+                this._autoRetryTime = Utils.getTimestamp();
+                Debug.logString("marked auto-retry: " + d);
+        },
+        autoRetry: function QI_autoRetry() {
+                if (!this._autoRetryTime || Utils.getTimestamp() - (Prefs.autoRetryInterval * 1000) < this._autoRetryTime) {
+                        return;
+                }
+
+                this._autoRetryTime = 0;
+                ++this._autoRetries;
+                this.queue();
+                Debug.logString("Requeued due to auto-retry: " + d);            
+        },
+        queue: function QI_queue() {
+                this.state = QUEUED;
+                this.status = _("inqueue");
+        },
-        resumeDownload: function QI_resumeDownload() {
-                Debug.logString("resumeDownload: " + this);
@@ -1437 +1474 @@
-                                if (c1.complete && c2.complete) {
-                                        c1.merge(c2);
-chunks.
+
-                                }
-                        }
@@ -1813 +1850 @@
-                        Debug.logString("cancel");
-                        if (!aReason) {
-0x804b0002; // NS
+NS_ERROR
-                        }
-                        this._chan.cancel(aReason);
@@ -1990 +2027 @@
-                                        Debug.log("we got temp failure!", code);
-                                        d.pause();
+                                        d.markAutoRetry();
-                                        d.status = code >= 500 ? _('temperror') : _('autherror');
-                                }
@@ -2011 +2049 @@
-                if (code != 206 && !this.isInfoGetter) {
-                        Debug.log(d + ": Server returned a " + aChannel.responseStatus + " response instead of 206", this.isInfoGetter);
-                        Debug.log(c, this.url.url);
-                        
-                        d.resumable = false;
@@ -2024 +2061 @@
-                                d.cancel();
-                                d.resumable = false;
-r
+safeR
-                                return false;
-                        }
@@ -2038 +2075 @@
-                        d.cancel();
-                        d.resumable = false;
-r
+safeR
-                        return false;
-                }
@@ -2101 +2138 @@
-                                Debug.log(d + ": Server error or disconnection", "(type 1)");
-                                d.status = _("servererror");
+                                d.markAutoRetry();
-                                d.pause();
-                        }
@@ -2247 +2285 @@
-                }
-
+                if (aStatusCode == NS_ERROR_BINDING_ABORTED) {
+                        return;
+                }
+                
+                if (-1 != [
+                        NS_ERROR_CONNECTION_REFUSED,
+                        NS_ERROR_UNKNOWN_HOST,
+                        NS_ERROR_NET_TIMEOUT,
+                        NS_ERROR_NET_RESET
+                ].indexOf(aStatusCode)) {
+                        Debug.log(d + ": Server error or disconnection", "(type 3)");
+                        d.pause();
+                        d.status = _("servererror");
+                        d.markAutoRetry();                              
+                        return;
+                }               
+
-                // routine for normal chunk
-                Debug.logString(d + ": Chunk " + c.start + "-" + c.end + " finished.");
-
+
-                // rude way to determine disconnection: if connection is closed before download is started we assume a server error/disconnection
-                if (c.starter && !shouldFinish && d.is(RUNNING)) {
-                        if (!d.urlManager.markBad(this.url)) {
-                                Debug.log(d + ": Server error or disconnection", "(type 2)");
+                                d.pause();
-                                d.status = _("servererror");
-pause();
+markAutoRetry();                             
-                                return;
-                        }
@@ -2261 +2317 @@
-                                Debug.log("caught bad server", d.toString());
-                                d.cancel();
-r
+safeR
-                                return;
-                        }
@@ -2274 +2330 @@
-                        if (d.resumable) {
-                                d.pause();
+                                d.markAutoRetry();
-                                d.status = _('errmismatchtitle');
-                        }
@@ -2288 +2345 @@
-                        d.resumeDownload();
-                }
-
+//
-        },
-

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

@@ -53 +53 @@
-                ['alertingSystem', 'alertbox', (SYSTEMSLASH == '\\') ? 1 : 0],
-                ['finishEvent', ''],
-
+
+
+
-        ],
-

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

@@ -378 +378 @@
-                        function(d) {
-                                if (d.is(PAUSED, CANCELED)) {
-
-
+
-                                }
-                                return true;

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

@@ -103 +103 @@
-                        var act = DTA_confirm(_('verifyerrortitle'), _('verifyerrortext'), _('retry'), _('delete'), _('keep'));
-                        switch (act) {
-r
+safeR
-                                case 1: this._delete(); this.download.cancel(); return;
-                        }

trunk/defaults/preferences/dta.js

@@ -64 +64 @@
-pref("extensions.dta.lastalltabs", false);
-pref("extensions.dta.rememberoneclick", false);
+pref("extensions.dta.autoretryinterval", 0);
+pref("extensions.dta.maxautoretries", 10);
-
-// Seamonkey specific