Changes in / [481:487]

Files:

• /trunk/components/dtaprotocol.js (deleted)
• /trunk/defaults/preferences/dta.js (modified) (1 diff)
• /trunk/chrome/locale/en-US/conflicts.properties (added)
• /trunk/chrome/locale/en-US/conflicts.dtd (added)
• /trunk/chrome/locale/en-US/manager.properties (modified) (1 diff)
• /trunk/chrome/locale/en-US/dialog.dtd (deleted)
• /trunk/chrome/content/preferences/mainPane.xul (modified) (1 diff)
• /trunk/chrome/content/dta/manager.js (modified) (6 diffs)
• /trunk/chrome/content/dta/select.xul (modified) (1 diff)
• /trunk/chrome/content/dta/manager/verificator.js (modified) (1 diff)
• /trunk/chrome/content/dta/manager/prefs.js (modified) (2 diffs)
• /trunk/chrome/content/dta/manager/conflicts.xul (added)
• /trunk/chrome/content/dta/dialog.xul (deleted)

/trunk/defaults/preferences/dta.js

@@ -42 +42 @@
-pref("extensions.dta.saveTemp", true);
-pref("extensions.dta.downloadWin", true);
-existing
+conflictresolution
-pref("extensions.dta.ntask", 4);
-pref("extensions.dta.timeout", 300);

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

@@ -16 +16 @@
-verify=Verifying...
-verifyerrortitle=Verification error
-\n\nProvided:\n%S\nActual:\n%S
+
-failed=Download of %S failed.
-alreadyexists=A file called \"%S\" already exists on directory \"%S\".
-whatdoyouwith=What do you want to do with download \"%S\"?
-reninto=Rename into \"%S\"
-overwrite=Overwrite
-skip=Skip
-samedestination=Download \"%S\" has the same destination \"%S\" as another currently running download \"%S\".
-whatdoyou=What do you want to do?
-renfirst=Rename the first one into \"%S\"
-skipfirst=Skip the first one
-cancelsecond=Cancel the second one
-whatdoyoucomplete=What do you want to do with the completed download \"%S\"?
-cancel=Cancel
-skipped=Skipped

/trunk/chrome/content/preferences/mainPane.xul

@@ -20 +20 @@
-
-                <preferences>
-existing
+conflictresolution
-                  <preference id="dtantask" name="extensions.dta.ntask" type="int"/>
-                  <preference id="dtaalert" name="extensions.dta.alertbox" type="int"/>

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

@@ -172 +172 @@
-                }
-        },
+        checkSameName: function D_checkSameName(download, name) {
+                for (let i = 0; i < this._running.length; ++i) {
+                        if (this._running[i].d == download) {
+                                continue;
+                        }
+                        if (this._running[i].d.destinationName == name) {
+                                return true;
+                        }
+                }
+                return false;
+        },
-        startNext: function D_startNext() {
-                try {
@@ -980 +991 @@
-                        return;
-                }
-
-
-
-
-
+
+
+
+
+
+
+
-                        // safeguard against some failed chunks.
-                        this.chunks.forEach(function(c) { c.close(); });
@@ -1193 +1206 @@
-                this._destinationFile = this.destinationPath + this.destinationName;
-                this._icon = null;
-                this.checkNameConflict();               
-        },
-
-        checkNameConflict: function  QI_checkFileNameConflict() {
-
-                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
-                                        );
-
-                                        Dialog.fixTimeouts();
-                
-                                        Prefs.askEveryTime = (passingArguments.temp == 0) ? true : false;
-                                        Prefs.sessionPreference = passingArguments.scelta;
-                                }
-                                return Prefs.sessionPreference;
-                        }
-                        return Prefs.onConflictingFilenames;
-                }
-                
-                let dn = this._destinationName, ds = this._destinationPath, df = this._destinationFile;
-                let dest = new FileFactory(this.destinationFile), newDest = new FileFactory(df);
-                if (!this.is(RUNNING, FINISHING) || !dest.exists()) {
-                        return true;
-                }
-                        
-                let basename = dn, ext = '', pos = basename.lastIndexOf('.');
-                if (pos != -1) {
-                        ext = basename.slice(pos);
-                        basename = basename.slice(0, pos);
-                }
-                for (let i = 1;; ++i) {
-                        newDest.leafName = basename + "_" +  Utils.formatNumber(i) + ext;
-                        if (!newDest.exists()) {
-                                break;
-                        }
-                }
-                newDest = newDest.leafName;
-
-                var shortUrl = this.urlManager.usable.cropCenter(70);
-
-                function mc(aCaption, aValue) {
-                        return {caption: aCaption, value: aValue};
-                }
-
-                var s = -1, p;
-                s = askForRenaming(
-                        _('alreadyexists', [dn, ds]) + " " + _('whatdoyouwith', [shortUrl]),
-                        mc(_('reninto', [newDest]), 0),
-                        mc(_('overwrite'), 1),
-                        mc(_('skip'), 2)
-                );
-                
-                switch (s) {
-                        case 0: this.destinationName = newDest; return true;
-                        case 1: return true;
-                        /*case 3: inProgressList[p].d.cancel(); return true;*/
-                        default: this.cancel(_('skipped')); return false;
-                }
-        },
-
@@ -2040 +1985 @@
-                                }
-                                c.end = d.totalSize - 1;
-
+
+
-                        }
-                        
@@ -2118 +2064 @@
-                        let d = this.d;
-                        
-
-
+
+
+
+
+
+
-                        }
-
@@ -2225 +2175 @@
-        'init'
-);
+
+var ConflictManager = {
+        _items: [],
+        resolve: function(download, reentry) {
+                if (!this._check(download)) {
+                        if (reentry) {
+                                download[reentry]();
+                        }
+                        return;
+                }
+                for (let i = 0; i < this._items.length; ++i) {
+                        if (this._items[i].download == download) {
+                                Debug.dump("conflict resolution updated to: " + reentry);
+                                
+                                this._items[i].reentry = reentry;
+                                return;
+                        }
+                }
+                Debug.dump("conflict resolution queued to: " + reentry);
+                this._items.push({download: download, reentry: reentry});
+                this._process();
+        },
+        _check: function(download) {
+                let dest = new FileFactory(download.destinationFile);
+                let sn = false;
+                if (download.is(RUNNING)) {
+                        sn = Dialog.checkSameName(download, download.destinationName);
+                }
+                Debug.dump("conflict check: " + sn + "/" + dest.exists() + " for " + download.destinationFile);
+                return dest.exists() || sn;
+        },
+        _process: function() {
+                if (this._processing) {
+                        return;
+                }
+                while (this._items.length) {
+                        let cur = this._items[0];
+                        if (!this._check(cur.download)) {
+                                if (reentry) {
+                                        download[reentry]();
+                                }
+                                this._items.shift();
+                                continue;
+                        }
+                        break;
+                }
+                if (!this._items.length) {
+                        return;
+                }
+                let cur = this._items[0];
+                let download = cur.download;
+                let basename = download._destinationName, ext = '', pos = basename.lastIndexOf('.');
+                if (pos != -1) {
+                        ext = basename.slice(pos);
+                        basename = basename.slice(0, pos);
+                }
+                let newDest = new FileFactory(download.destinationFile);
+                for (let i = 1;; ++i) {
+                        newDest.leafName = basename + "_" +  Utils.formatNumber(i) + ext;
+                        if (!newDest.exists() && (!download.is(RUNNING) || !Dialog.checkSameName(this, newDest.leafName))) {
+                                break;
+                        }
+                }
+                cur.newDest = newDest.leafName;
+        
+                if (Prefs.conflictResolution != 3) {
+                        this._return(Prefs.conflictResolution);
+                        return;
+                }
+                if (this._sessionSetting) {
+                        this._return(this._sessionSetting);
+                        return;
+                }
+
+                var options = {
+                        url: download.urlManager.usable.cropCenter(45),
+                        fn: download.destinationName.cropCenter(45),
+                        newDest: cur.newDest.cropCenter(45)
+                };
+                
+                this._processing = true;
+                
+                window.openDialog(
+                        "chrome://dta/content/dta/manager/conflicts.xul",
+                        "_blank",
+                        "chrome,centerscreen,resizable=no,dialog,close=no,dependent",
+                        options, this
+                );
+        },
+        _returnFromDialog: function(option, type) {
+                if (type == 1) {
+                        this._sessionSetting = option;
+                }
+                if (type == 2) {
+                        Preferences.setDTA('conflictresolution', option);
+                }               
+                this._return(option);
+        },
+        _return: function(option) {
+                let cur = this._items[0];
+                switch (option) {
+                        /* rename */    case 0: cur.download.destinationName = cur.newDest; break;
+                        /* overwrite */ case 1: break;
+                        /* skip */      default: cur.download.cancel(_('skipped')); break;
+                }
+                if (cur.reentry) {
+                        cur.download[cur.reentry]();
+                }
+                this._items.shift();
+                this._processing = false;
+                this._process();
+        }
+};

/trunk/chrome/content/dta/select.xul

@@ -49 +49 @@
-                <key keycode="VK_ESCAPE" oncommand="self.close();"/>
-                <key id="kMacEsc" modifiers="accel" key="W" oncommand="self.close();"/>
+                <key modifiers="accel" key="A" oncommand="Dialog.selectAll();"/>
-                <key keycode="VK_RETURN" oncommand="Dialog.download(true);"/>
-                <key keycode="VK_ENTER" oncommand="Dialog.download(true);"/>

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

@@ -105 +105 @@
-                this.hash = hexdigest(this.hash.finish(false));
-                if (this.hash != this.download.hash.sum) {
-, [this.download.hash.sum, this.hash]
+
-                        switch (act) {
-                                case 0: this._delete(); this.download.retry(); return;

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

@@ -41 +41 @@
-        showOnlyFilenames: true,
-        alertingSystem: (SYSTEMSLASH == '\\') ? 1 : 0,
-
-
-
-
-
+
-
-        maxInProgress: 5,
@@ -96 +92 @@
-                        'setTime',
-                        'showOnlyFilenames',
-['onConflictingFilenames', 'existing']
+'conflictResolution'
-                        ['alertingSystem', 'alertbox'],
-                        'finishEvent'