Changeset 394 for branches/maierman/manager-trees

Timestamp:

2007-06-07 23:50:35 (2 years ago)

Author:

MaierMan

Message:

last pre-merge round of bugfixes.

Files:

• branches/maierman/manager-trees/chrome/content/common/bindings.xml (modified) (1 diff)
• branches/maierman/manager-trees/chrome/content/common/internalFunctions.js (modified) (4 diffs)
• branches/maierman/manager-trees/chrome/content/dta/manager.js (modified) (29 diffs)
• branches/maierman/manager-trees/chrome/content/dta/manager/decompressor.js (modified) (2 diffs)
• branches/maierman/manager-trees/chrome/content/dta/manager/info.js (modified) (7 diffs)
• branches/maierman/manager-trees/chrome/content/dta/manager/metalinker.js (modified) (1 diff)
• branches/maierman/manager-trees/chrome/content/dta/manager/sessionmanager.js (modified) (2 diffs)
• branches/maierman/manager-trees/chrome/content/dta/manager/verificator.js (modified) (1 diff)
• branches/maierman/manager-trees/chrome/content/integration/saveas.js (modified) (3 diffs)

branches/maierman/manager-trees/chrome/content/common/bindings.xml

@@ -80 +80 @@
-                <content>
-                        <xul:vbox flex="1">
-=readonly
+
-                                <xul:menupopup anonid="popup" xbl:inherits="onselect=onchange,oncommand=onchange"/>
-                        </xul:menulist>

branches/maierman/manager-trees/chrome/content/common/internalFunctions.js

@@ -295 +295 @@
-                }
-                var rv = Date.parse(str);
-isNaN
+!isFinite
-                        throw new Error("invalid date");
-                }
@@ -330 +330 @@
-         * @author Nils
-         */
-makeNumber: function U_make
+formatNumber: function U_format
-                rv = _atos(rv);
-                if (typeof(digits) != 'number') {
@@ -348 +348 @@
-                var s = Math.floor(aDelta % 60);
-                if (h) {
-makeNumber(h, 2) + ":" + this.makeNumber(m, 2) + ":" + this.make
-
-makeNumber(m, 2) + ":" + this.make
+formatNumber(h, 2) + ":" + this.formatNumber(m, 2) + ":" + this.format
+
+formatNumber(m, 2) + ":" + this.format
-        }
-};
@@ -598 +598 @@
-                step = stop - start > 0 ? 1 : -1; 
-        }
-isNaN(start) || isNaN(stop) || isNaN
+!isFinite(start) || !isFinite(stop) || !isFinite
-                throw Components.results.NS_ERROR_INVALID_ARG;
-        }

branches/maierman/manager-trees/chrome/content/dta/manager.js

@@ -53 +53 @@
-const REFRESH_FREQ = 1000;
-const REFRESH_NFREQ = 1000 / REFRESH_FREQ;
+const STREAMS_FREQ = 100;
-
-var Dialog = {
@@ -87 +88 @@
-                                                if (d.totalSize > 0) {
-                                                        var remaining = Math.ceil((d.totalSize - d.partialSize) / ((d.partialSize - i.lastBytes) * REFRESH_NFREQ));
-isNaN
+!isFinite
-                                                                d.status = _("unknown");
-                                                        }
@@ -376 +377 @@
-                return this._urls[0].charset;
-        },
-        replace: function um_replace(url, newUrl) {
-                for (var i = 0, e = this._urls.length; i < e; ++i) {
-                        if (this._urls[i].url == url) {
-                                this._urls[i] = newUrl;
-                                break;
-                        }
-                }
-        },
-        markBad: function um_markBad(url) {
-                if (this._urls.length > 1) {
@@ -433 +426 @@
-        encoding: null,
-        fileName: null,
-false
+'bytes'
-        contentlength: 0,
-        time: null,
@@ -510 +503 @@
-                                if (value) {
-                                        this.fileName = value[2].getUsableFileName();
-                                        Debug.dump("found fn:" + this.fileName);
-                                }
-                        }
@@ -732 +724 @@
-        set destinationName(nv) {
-                this.destinationNameOverride = nv;
+                this._destinationFile = this.destinationPath + this.destinationName;
-                this.invalidate();
-                return nv;
@@ -914 +907 @@
-        },
-
-        removeFromInProgressList: function QI_removeFromInProgressList() {
-                //this.speeds = new Array();
-                for (var i=0; i<inProgressList.length; i++)
-                        if (this==inProgressList[i].d) {
-                                inProgressList.splice(i, 1);
-                                break;
-                        }
-        },
-        
-        refreshPartialSize: function QI_refreshPartialSize(){
-                var size = 0;
@@ -946 +930 @@
-
-                try {
+                        if (!this.checkNameConflict()) {
+                                return;
+                        }
-                        var destination = new FileFactory(this.destinationPath);
-                        Debug.dump(this.fileName + ": Move " + this.tmpFile.path + " to " + this.destinationFile);
@@ -952 +939 @@
-                                destination.create(Ci.nsIFile.DIRECTORY_TYPE, 0766);
-                        }
-                        this.checkFilenameConflict();
-                        var df = destination.clone();
-                        df.append(this.destinationName);
@@ -1111 +1097 @@
-                        
-                        var replacements = {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                        this._destinationFile = mask = this.pathName.addFinalSlash() + mask.removeBadChars().removeFinalChar(".").trim();
@@ -1143 +1134 @@
-                }
-                this._icon = null;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if (pos != -1) {
-                        ext = basename.slice(pos);
-                        basename = basename.slice(0, pos);
-                }
-var i = 1; isInProgress(newDest.path, this) != -1 || newDest.exists()
-make
-}
-if (newDest.path == dest.path) {
-return;
+let i = 1;
+format
+       if (!newDest.exists()) {
+               break;
+}
-                }
-                newDest = newDest.leafName;
@@ -1171 +1191 @@
-
-                var s = -1, p;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-        },
@@ -1304 +1294 @@
-                        chunk.isRunning = true;
-                        download.state = RUNNING;
+                        download.checkNameConflict();
-                        chunk.download = new Download(download, chunk, header);
-                        ++download.activeChunks;
@@ -1415 +1406 @@
-Chunk.prototype = {
-        isRunning: false,
+        get isStarter() {
+                return this.end <= 0;
+        },
-        get start() {
-                return this._start;
@@ -1435 +1429 @@
-        },
-        get complete() {
-
+
+
+
+
-        },
-        get parent() {
@@ -1518 +1515 @@
-        toString: function() {
-                let len = this.parent.totalSize ? String(this.parent.totalSize).length  : 10; 
-make
+format
-                        + "/"
-make
+format
-                        + "/"
-make
+format
-                        + " running:"
-                        + this.isRunning
-                        + " written/remain:"
-make
+format
-                        + "/"
-make
+format
-        }
-}
-
-headerHack
+getInfo
-
-        this.d = d;
-        this.c = c;
-HeaderHack = headerHack
+InfoGetter = getInfo
-        this.url = d.urlManager.getURL();
-        var referrer = d.refPage;
@@ -1551 +1548 @@
-                // no-op
-        }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                        http.referrer = referrer;
-                }
-
-
-
+
+
+
+
+
-        }
-        this.c.isRunning = true;
@@ -1679 +1677 @@
-                        this._chan == newChannel;
-                        this._redirectedTo = newChannel.URI.spec;
-
+
+
-                }
-                catch (ex) {
@@ -1769 +1768 @@
-                var d = this.d;
-                
-503
+0
-                try {
-                        code = aChannel.responseStatus;
@@ -1778 +1777 @@
-                }
-                
-
+!code || 
-                        if (!this.handleError()) {
-                                Debug.dump("handleError: Cannot recover from problem!", code);
-                                var file = d.fileName.length > 50 ? d.fileName.substring(0, 50) + "..." : d.fileName;
+                                code = Utils.formatNumber(code, 3);
-                                d.fail(
-                                        _("error", [code]),
@@ -1795 +1795 @@
-                if (aChannel.responseStatus != 206 && c.start + c.written != 0) {
-                        Debug.dump(d + ": Server returned a " + aChannel.responseStatus + " response instead of 206... Normal mode");
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
@@ -1811 +1815 @@
-                }
-                catch (ex) {
-.fileName
+
-                        // restart download from the beginning
-                        d.hasToBeRedownloaded = true;
@@ -1818 +1822 @@
-                }
-                
-
-
+
-                        return;
-                }
@@ -1938 +1941 @@
-                        }
-
-HeaderHack
+InfoGetter
-                                // Checks for available disk space.
-                                
@@ -1990 +1993 @@
-                                }
-                                c.end = d.totalSize - 1;
-
-
-
-
-
+
+
+
-                        if (d.isResumable) {
-                                d.resumeDownload();
@@ -2018 +2019 @@
-                // check if we're complete now
-                let shouldFinish = false;
-!d.chunks.some(function(e) { return e.isRunning
+d.chunks.every(function(e) { return e.complete
-                        if (!d.resumeDownload()) {
-                                d.dumpScoreboard();
@@ -2039 +2040 @@
-                        return;
-                }
-                
-                // ok, chunk passed all the integrity checks!
-
-                if (!d.is(RUNNING)) {
-                        d.speed = '';
-
-
-
+
+
+
+
+
+
+
+
-                // rude way to determine disconnection: if connection is closed before download is started we assume a server error/disconnection
-!this.started && d.isResumable && !d.is(CANCELED, PAUSED)
-this.handleError(
+c.isStarter && !shouldFinish
+d.urlManager.markBad(this.url
-                                Debug.dump(d + ": Server error or disconnection (type 1)");
-                                d.status = _("srver");
-                                d.speed = '';
-                                d.setPaused();
-
-
+
+
+
+
+
+
-                }
-
@@ -2063 +2071 @@
-                        d.finishDownload();
-                }
-
-
+
-                        d.resumeDownload();
-                }
@@ -2175 +2182 @@
-        return -1;
-}
-
-function askForRenaming(t, s1, s2, s3) {
-        if (Prefs.onConflictingFilenames == 3) {
-                if (Prefs.askEveryTime) {
-                        var passingArguments = new Object();
-                        passingArguments.text = t;
-                        passingArguments.s1 = s1;
-                        passingArguments.s2 = s2;
-                        passingArguments.s3 = s3;
-
-                        window.openDialog(
-                                "chrome://dta/content/dta/dialog.xul","_blank","chrome,centerscreen,resizable=no,dialog,modal,close=no,dependent",
-                                passingArguments
-                        );
-
-                        // non faccio registrare il timeout
-                        inProgressList.forEach(function(o) { o.d.timeLastProgress = Utils.getTimestamp(); });
-
-                        Prefs.askEveryTime = (passingArguments.temp == 0) ? true : false;
-                        Prefs.sessionPreference = passingArguments.scelta;
-                }
-                return Prefs.sessionPreference;
-        }
-        return Prefs.onConflictingFilenames;
-}

branches/maierman/manager-trees/chrome/content/dta/manager/decompressor.js

@@ -117 +117 @@
-                this.download.invalidate();
-                var thisp = this;
-200
+STREAMS_FREQ
-        },      
-        onStartRequest: function(r, c) {
@@ -159 +159 @@
-                        }
-                        this.download.partialSize = offset;
-                        this.download.invalidate();
-                }
-                catch (ex) {

branches/maierman/manager-trees/chrome/content/dta/manager/info.js

@@ -15 +15 @@
-
-var Dialog = {
+        get isFullyDisabled() {
+                return $('directory', 'renaming', 'hash').every(
+                        function(e) {
+                                return e.hasAttribute('disabled');
+                        }
+                );
+        },
-        load: function DTA_load() {
-                make_();
@@ -41 +48 @@
-                                $("infoURL").value = $("sourcePage").value = "---";
-                                $("hash").setAttribute('readonly', 'true');
+                                $("hash").setAttribute('disabled', 'true');
-        
-                                var mask = downloads[0].mask;
@@ -63 +71 @@
-                        }                               
-                        if (downloads.every(function(d) { return d.is(COMPLETE, FINISHING); })) {
-
-
-
-
+
+
+
+
+
+
+
+
-                                $('dTaDownloadInfo').buttons = 'accept';
-                        }                       
@@ -75 +87 @@
-        },
-        accept: function DTA_accept() {
-$('directory', 'renaming', 'hash').every(function(e) { return e.hasAttribute('readonly'); })
+this.isFullyDisabled
-                        return true;
-                }               
@@ -137 +149 @@
-                compl.addColorStop(1, 'rgba(0,199,56,255)');
-                
-                var join = "#A5FE2C";
-                
-                var cancel = canvas.createLinearGradient(0,0,0,16);
-                cancel.addColorStop(0, 'rgba(151,58,2,100)');
@@ -150 +160 @@
-                canvas.fillRect(0,0,300,20);
-
-
+, FINISHING
-                        canvas.fillStyle = compl;
-                        canvas.fillRect(0,0,300,20);
@@ -167 +177 @@
-                                function(c) {
-                                        this.canvas.fillStyle = prog;
-
+
+
+
+
+
+
-                                },
-                                this
-                        );
-                        canvas.fillStyle = join;
-                        canvas.fillRect(0,16,Math.round(d.chunks[d.firstChunk].chunkSize/d.totalSize*300),4);
-                }
-                setTimeout('Dialog.draw();', 150);

branches/maierman/manager-trees/chrome/content/dta/manager/metalinker.js

@@ -113 +113 @@
-                                        if (url.hasAttribute('preference')) {
-                                                var a = new Number(url.getAttribute('preference'));
-!isNaN
+isFinite
-                                                        preference = a;
-                                                }

branches/maierman/manager-trees/chrome/content/dta/manager/sessionmanager.js

@@ -84 +84 @@
-                );
-                e.state = d.is(COMPLETE, CANCELED) ? d.state : PAUSED;
+                if (d.destinationNameOverride) {
+                        e.destinationName = d.destinationNameOverride;
+                }
-
-                e.referrer = d.refPage.spec;
@@ -198 +201 @@
-                                [
-                                        'fileName',
+                                        'destinationName',
-                                        'isResumable',
-                                        'state',

branches/maierman/manager-trees/chrome/content/dta/manager/verificator.js

@@ -89 +89 @@
-                this.download.invalidate();
-                var thisp = this;
-200
+STREAMS_FREQ
-        },
-        QueryInterface: function(iid) {

branches/maierman/manager-trees/chrome/content/integration/saveas.js

@@ -50 +50 @@
-                        this.referrer = this.url;
-                }
+                this.url = new DTA_URL(this.url);
-
-                this.ddDirectory = document.getElementById('tdtalist');
@@ -93 +94 @@
-                // take care of FlashGot... for now.
-                // need to negotiate with the author (and possible other extension authors)
-
-