Changeset 1037

Timestamp:

2008-08-08 04:58:20 (4 months ago)

Author:

MaierMan

Message:

#259: Implement FTP resuming

Files:

• trunk/chrome/content/dta/manager.js (modified) (33 diffs)
• trunk/chrome/locale/en-US/manager.properties (modified) (1 diff)

trunk/chrome/content/dta/manager.js

@@ -47 +47 @@
-const NS_ERROR_NET_TIMEOUT = NS_ERROR_MODULE_NETWORK + 14;
-const NS_ERROR_NET_RESET = NS_ERROR_MODULE_NETWORK + 20;
-
+
-const Cc = Components.classes;
-const Ci = Components.interfaces;
@@ -75 +75 @@
-
-// in use by chunk.writer...
-
+
+
-const MAX_BUFFER_SIZE = 5 * 1024 * 1024;
-const MIN_BUFFER_SIZE = 1 * 1024 * 1024;
@@ -222 +223 @@
-                                speed /= d.speeds.length;
-                                
-                                    
+
-                                if (advanced != 0 && d.totalSize > 0) {
-                                        let remaining = Math.ceil((d.totalSize - d.partialSize) / speed);
@@ -316 +317 @@
-
-                        if (!this.offline) {
-                                 
+
-                                if (Prefs.autoRetryInterval) {
-                                        for (let d in Tree.all) {
@@ -514 +515 @@
-                if (!Prefs.tempLocation || Preferences.getExt("tempLocation", '') != '') {
-                        // cannot perform this action if we don't use a temp file
-
+
+
-                        // or part files from other users.
-                        return;
@@ -645 +647 @@
-        }
-};
+
-function Visitor() {
-        // sanity check
@@ -651 +654 @@
-        }
-
-var
+let
-        for (x in nodes) {
-                if (!name || !(name in this.cmpKeys))   {
@@ -661 +664 @@
-
-Visitor.prototype = {
+        compare: function vi_compare(v) {
+                if (!(v instanceof Visitor)) {
+                        return;
+                }
+
+                for (x in this.cmpKeys) {
+                        // we don't have this header
+                        if (!(x in this)) {
+                                continue;
+                        }
+                        // v does not have this header
+                        else if (!(x in v)) {
+                                // allowed to be missing?
+                                if (this.cmpKeys[x]) {
+                                        continue;
+                                }
+                                Debug.logString(x + " missing");
+                                throw new Exception(x + " is missing");
+                        }
+                        // header is there, but differs
+                        else if (this[x] != v[x]) {
+                                Debug.logString(x + " nm: [" + this[x] + "] [" + v[x] + "]");
+                                throw new Exception("Header " + x + " doesn't match");
+                        }
+                }
+        },
+        save: function vi_save(node) {
+                var rv = {};
+                // salva su file le informazioni sugli headers
+                for (x in this.cmpKeys) {
+                        if (!(x in this)) {
+                                continue;
+                        }
+                        rv[x] = this[x];
+                }
+                return rv;
+        }
+};
+
+function HttpVisitor() {
+        Visitor.apply(this, arguments);
+}
+
+HttpVisitor.prototype = {
-        cmpKeys: {
-
-
+
+
+
-                'content-type': true,
-                'last-modified': true, // may get omitted later, but should not change
-
-
-
-
-
-
-
-
-
-
+
+
+
-        QueryInterface: function(aIID) {
-                if (
@@ -732 +773 @@
-                        }
-                        if (header == 'etag') {
-
+
+
-                                this[header] = aValue
-                                        .replace(/^(?:[Ww]\/)?"(.+)"$/, '$1')
@@ -766 +808 @@
-                catch (ex) {
-                }
-        },
-        compare: function vi_compare(v) {
-                if (!(v instanceof Visitor)) {
-                        return;
-                }
-
-                for (x in this.cmpKeys) {
-                        // we don't have this header
-                        if (!(x in this)) {
-                                continue;
-                        }
-                        // v does not have this header
-                        else if (!(x in v)) {
-                                // allowed to be missing?
-                                if (this.cmpKeys[x]) {
-                                        continue;
-                                }
-                                Debug.logString(x + " missing");
-                                throw new Exception(x + " is missing");
-                        }
-                        // header is there, but differs
-                        else if (this[x] != v[x]) {
-                                Debug.logString(x + " nm: [" + this[x] + "] [" + v[x] + "]");
-                                throw new Exception("Header " + x + " doesn't match");
-                        }
-                }
-        },
-        save: function vi_save(node) {
-                var rv = {};
-                // salva su file le informazioni sugli headers
-                for (x in this.cmpKeys) {
-                        if (!(x in this)) {
-                                continue;
-                        }
-                        rv[x] = this[x];
-                }
-                return rv;
-        }
-};
-
+Utils.merge(HttpVisitor.prototype, Visitor.prototype);
+
+function FtpVisitor() {
+        Visitor.apply(this, arguments);
+}
+
+FtpVisitor.prototype = {
+        cmpKeys: {
+                'etag': true,
+        },
+        time: null,
+        visitChan: function fv_visitChan(chan) {
+                try {
+                        this.etag = chan.QueryInterface(Ci.nsIResumableChannel).entityID;
+                        let m = this.etag.match(/\/(\d{4})(\d{2})(\d{2})(?:(\d{2})(\d{2})(?:(\d{2})))?$/);
+                        if (m) {
+                                let time = m[1] + '/' + m[2] + '/' + m[3];
+                                if (m.length >= 4) {
+                                        time += ' ' + m[4] + ':' + m[5];
+                                        if (m.length >= 7) {
+                                                time += ':' + m[6];
+                                        }
+                                        this.time = Utils.getTimestamp(time);
+                                        Debug.logString(this.time);
+                                }
+                        }
+                }
+                catch (ex) {
+                        Debug.log("visitChan:", ex);
+                }
+        }
+};
+
+Utils.merge(FtpVisitor.prototype, Visitor.prototype);
+
-/**
- * Visitor Manager c'tor
+ * 
- * @author Nils
- */
@@ -818 +859 @@
-VisitorManager.prototype = {
-        /**
-
-Will silently bypass failed items!
+ Will silently bypass failed items!
+
-         * @author Nils
-         */
@@ -825 +866 @@
-                for each (let n in nodes) {
-                        try {
-
+
+
+
+
+
+
+
+
+
-                        }
-                        catch (ex) {
@@ -834 +883 @@
-        /**
-         * Saves/serializes the Manager and associated Visitors to an JS Array
+         * 
-         * @return A ::load compatible Array
-         * @author Nils
@@ -854 +904 @@
-        /**
-         * Visit and compare a channel
+         * 
-         * @returns visitor for channel
-
+
+
+
-         * @author Nils
-         */
-        visit: function vm_visit(chan) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                return (this._visitors[url] = visitor);
@@ -871 +933 @@
-        /**
-         * return the first timestamp registered with a visitor
-
+
+
+
-         * @author Nils
-         */
@@ -1039 +1103 @@
-
-        /**
-
+
+
-         */
-        is: function QI_is(state) {
@@ -1595 +1660 @@
-                Debug.logString("resumeDownload: " + this);
-                function cleanChunks(d) {
-
+
+
-                        for (let i = d.chunks.length - 2; i > -1; --i) {
-                                let c1 = d.chunks[i], c2 = d.chunks[i + 1];
@@ -1630 +1696 @@
-                        var rv = false;
-
-
+
+
-                        if (this.chunks.length == 0) {
-                                downloadNewChunk(this, 0, 0, true);
@@ -1952 +2019 @@
-        this.url = d.urlManager.getURL();
-        var referrer = d.referrer;
-
+.spec
-
-        this._chan = IOService.newChannelFromURI(this.url.url);
@@ -1965 +2032 @@
-                // no-op
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-        this.c.running = true;
@@ -2012 +2094 @@
-                        return this;
-                }
+                Debug.log("Interface not implemented " + iid, Components.results.NS_ERROR_NO_INTERFACE);
-                throw Components.results.NS_ERROR_NO_INTERFACE;
-        },
@@ -2057 +2140 @@
-                        return AuthPrompts.prompter;
-                }
-                // for 1.9
-                /* this one makes minefield ask for the password again and again :p
-                if ('nsIAuthPromptProvider' in Ci && iid.equals(Ci.nsIAuthPromptProvider)) {
-                        return AuthPrompts.prompter.QueryInterface(Ci.nsIAuthPromptProvider);
-                }*/
-                // for 1.9
-                if ('nsIAuthPrompt2' in Ci && iid.equals(Ci.nsIAuthPrompt2)) {
-                        return AuthPrompts.authPrompter.QueryInterface(Ci.nsIAuthPrompt2);
@@ -2096 +2173 @@
-                }
-                try {
-
+
+
-                        if (!this.c.write(aInputStream, aCount)) {
-                                // we already got what we wanted
@@ -2109 +2187 @@
-        
-        // nsIFTPEventSink
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        handleError: function DL_handleError() {
@@ -2131 +2225 @@
-                
-                Debug.logString("affected: " + c);
+                d.dumpScoreboard();
-                
--1
+null
-                for each (let cmp in d.chunks) {
-                        if (cmp.start < c.start && cmp.start > max) {
-i
+cmp
-                                max = cmp.start;
-                        }
-                }
- > -1
+
-                        Debug.logString("handleError: found joinable chunk; recovering suceeded, chunk: " + found);
-d.chunks[found]
+found
-                        if (--d.maxChunks == 1) {
-
-
-{ return ch != c; }
-b) { return a.start - b.start; }
+ 
+
+ch != c
+ b) a.start - b.start
-                        
-                        // check for overlapping ranges we might have created
@@ -2173 +2268 @@
-                        return true;
-                }
+                Debug.logString("recovery failed");
-                return false;
-        },
@@ -2299 +2395 @@
-        // Generic handler for now :p
-        handleFtp: function  DL_handleFtp(aChannel) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        },
-        
@@ -2335 +2465 @@
-        },
-        
-
+ 
-        _supportedChannels: [
-                {i:Ci.nsIHttpChannel, f:'handleHttp'},
@@ -2352 +2482 @@
-                                try {
-                                        chan = aRequest.QueryInterface(sc.i);
-                                }
-                                catch (ex) {
-                                        continue;
-                                }
-                                if (chan) {
-                                        if ((this.rexamine = this[sc.f](chan))) {
-                                                 return;
-                                        }
-                                        break;
-
+
+
+
+
-                        }
-
@@ -2369 +2497 @@
-                                if (d.fileName.getExtension() == 'metalink') {
-                                        d.isMetalink = true;
-tru
+fals
-                                }                               
-                                
@@ -2388 +2516 @@
-                                                }
-                                                var nsd = Utils.getFreeDisk(realDest);
-
+
+
-                                                // simply moving should succeed
-                                                if (d.compression && (!tmp || Utils.getFreeDisk(vtmp) == nsd)) {
-
-
+
+
+
+
-                                                        tsd *= 2.5;
-                                                }
@@ -2474 +2605 @@
-                        d.markAutoRetry();                              
-                        return;
-
-
+
+
+
+
+
+
+
+
+
+
+
-                // routine for normal chunk
-                Debug.logString(d + ": Chunk " + c.start + "-" + c.end + " finished.");
-                
-
+
+
-                if (c.starter && d.is(RUNNING)) {
-                        if (!d.urlManager.markBad(this.url)) {
@@ -2628 +2769 @@
-                }
-                else {
- 
+
-                }
-

trunk/chrome/locale/en-US/manager.properties

@@ -62 +62 @@
-loading=Loading downloads (%S of %S, %S%). Please wait...
-adding=Adding downloads. Please wait...
+ftperrortext=Wasn't able to communicate with the FTP Server or the Server responded incorrectly