Changeset 1022

Timestamp:

08/01/08 07:32:07 (1 month ago)

Author:

MaierMan

Message:

Some more refactoring/modularization

Files:

• trunk/chrome/content/common/internalFunctions.js (modified) (9 diffs)
• trunk/chrome/content/dta/addurl.js (modified) (1 diff)
• trunk/chrome/content/dta/manager.js (modified) (3 diffs)
• trunk/chrome/content/dta/manager/customevent.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/modules/utils.jsm (added)

trunk/chrome/content/common/internalFunctions.js

@@ -68 +68 @@
-const CANCELED =  1<<5;
-const QUEUED =    1<<6;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-/**
@@ -111 +93 @@
-        return elements;
-}
-
-function merge(me, that) {
-        for (let c in that) {
-                me[c] = that[c];
-        }
-}
-
-// not instanceof save, you know ;)
-function clone(obj) {
-        var rv = {};
-        merge(rv, obj);
-        merge(rv.prototype, this.prototype);
-        rv.constructor = this.constructor;
-        return rv;
-}
-merge(
-        String.prototype,
-        { 
-                trim: function() {
-                        return this.replace(/^\s+|\s+$/g, '');
-                },
-                removeBadChars: function() {
-                        return this
-                                .replace(/[\n\r\v?:<>*|"]/g, '_')
-                                .replace(/%(?:25)?20/g, ' ');
-                },
-                addFinalSlash: function() {
-                        if (this.length == 0) {
-                                return SYSTEMSLASH;
-                        }
-                        
-                        if (this[this.length - 1] != SYSTEMSLASH) {
-                                return this + SYSTEMSLASH;
-                        }
-                        return this;
-                },
-                removeFinalChar: function(c) {
-                        if (this.length == 0) {
-                                return this;
-                        }
-                        if (this[this.length - 1] == c) {
-                                return this.substring(0, this.length - 1);
-                        }
-                        return this;
-                },
-                removeLeadingChar: function(c) {
-                        if (this.length == 0) {
-                                return this;
-                        }
-                        if (this[0] == c) {
-                                return this.slice(1);
-                        }
-                        return this;
-                },
-                removeFinalSlash: function() {
-                        return this.removeFinalChar(SYSTEMSLASH);
-                },
-                replaceSlashes: function(replaceWith) {
-                        return this.replace(/[\\/]/g, replaceWith);
-                },
-                normalizeSlashes: function() {
-                        return this.replaceSlashes(SYSTEMSLASH);
-                },
-                removeLeadingSlash: function() {
-                        return this.removeLeadingChar(SYSTEMSLASH);
-                },
-                getUsableFileName: function() {
-                        let t = this.replace(/\?.*$/, '')
-                                .normalizeSlashes()
-                                .trim()
-                                .removeFinalSlash();
-                        return t.split(SYSTEMSLASH).pop().removeBadChars().trim();
-                },
-                getExtension: function() {
-                        let name = this.getUsableFileName();
-                        let c = name.lastIndexOf('.');
-                        if (c == -1) {
-                                return null;
-                        }
-                        return name.slice(c + 1);
-                },
-                cropCenter : function(newLength) {
-                        if (this.length > newLength) {
-                                return this.substring(0, newLength / 2) + "..." + this.substring(this.length - newLength / 2, this.length);
-                        }
-                        return this;
-                },
-                toURI: function(charset, baseURI) {
-                        return IOService.newURI(this, charset, baseURI);                        
-                },
-                toURL: function(charset, baseURI) {
-                        return this.toURI(charset, baseURI).QueryInterface(Components.interfaces.nsIURL);
-                }
-        }
-);
-
-var Utils = {
@@ -307 +194 @@
-                }
-        },
-        /**
-         * returns a numeric timestamp
-         * @param date Optional. DateString to get stamp for. NOW if ommitted
-         * @return Numeric timestamp
-         * @author Nils
-        */
-        getTimestamp: function(str) {
-                if (!str) {
-                        return Date.now();
-                }
-                if (typeof(str) != 'string' && !(str instanceof String)) {
-                        throw new Error("not a string");
-                }
-                var rv = Date.parse(str);
-                if (!isFinite(rv)) {
-                        throw new Error("invalid date");
-                }
-                return rv;
-        },
-
-        /**
@@ -333 +201 @@
-         */
-        formatBytes: function U_formatBytes(aNumber) {
+                const formatBytes_units = [['sizeB', 0], ['sizeKB', 1], ['sizeMB', 2], ['sizeGB', 2], ['sizeTB', 3]];
+                const formatBytes_nunits = formatBytes_units.length;
+
-                aNumber = Number(aNumber);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                        aNumber /= 1024;
-units.pop()
+formatBytes_units[i]
-                }
-                
-                return _(unit[0], [aNumber.toFixed(unit[1])]);
-        },
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        formatConflictName: function U_formatConflictName(basename, conflicts) {
-                if (!conflicts) {
@@ -389 +234 @@
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/**
@@ -418 +325 @@
- */
-function getIcon(link, metalink, size) {
+
+        const _recognizedMac = /\.(?:gz|zip|gif|jpe?g|jpe|mp3|pdf|avi|mpe?g)$/i;
+
+        function _getIconMac(url, size) {
+                let uri = url.toURI();
+                if (_recognizedMac.test(uri.path)) {
+                        return "moz-icon://" + url + "?size=" + size;
+                }
+                return "moz-icon://file.html?size=" + size;
+        }
+        
+        function _getIconOther(url, size) {
+                return "moz-icon://" + url + "?size=" + size;
+        };
+        
+        function _getIcon(url, size) {
+                if (/mac/i.test(navigator.platform)) {
+                        _getIcon = _getIconMac; 
+                }
+                else {
+                        _getIcon = _getIconOther;
+                }
+                return _getIcon(url, size);
+        };
+
-        if (metalink) {
-                return "chrome://dta/skin/icons/metalink.png";
@@ -436 +368 @@
-                }
-                else {
-_atos(link
+link.toString(
-                }
-                let ext = url.getExtension();
@@ -569 +501 @@
-};
-
-/**
- * Range generator (python style). Difference: step direction is initialized accordingly if corresponding parameter is omitted.
- * @param start Optional. Start value (default: 0)
- * @param stop Stop value (exclusive)
- * @param step Optional. Step value (default: 1/-1)
- * @author Nils
- */
-function range() {
-        if (arguments.length == 0) {
-                throw Components.results.NS_ERROR_INVALID_ARG;
-        }
-        var start = 0, stop = Number(arguments[0]), step;
-        if (arguments.length >= 2) {
-                start = stop;
-                stop = Number(arguments[1]);
-        }
-        if (arguments.length >= 3) {
-                step = Number(arguments[2]);
-        }
-        else {
-                step = stop - start > 0 ? 1 : -1; 
-        }
-        if (!isFinite(start) || !isFinite(stop) || !isFinite(step) || step == 0) {
-                throw Components.results.NS_ERROR_INVALID_ARG;
-        }
-        if ((stop - start) / step < 0) {
-                // negative range
-                return;
-        }
-        stop += -Math.abs(step)/step;
-        stop += step - ((stop - start) % step);
-        for (; start != stop; start += step) {
-                yield start;
-        }
-
-}
-
-/**
- * Convert string-castable data int a hexdigest string
- * @param data String-castable data to hash
- * @return The hex digest of given data
- * @author Nils (derived from dmo example)
- */
-function hexdigest(data) {
-        data = _atos(data);
-        // range is required as we extended String
-        return [("0" + data.charCodeAt(i).toString(16)).slice(-2) for (i in range(data.length))].join("");      
-}
-
-/**
@@ -655 +539 @@
-                converter.charset = 'utf8';
-                
-_
+Utils.
-                ch.update(value, value.length);
-        }
-        var rv = ch.finish(encoding == HASH_B64);
-        if (encoding == HASH_HEX) {
-
+Utils.
-        }
-        return rv;
-}
-
-/**
- * returns a new UUID in string representation
- * @return String UUID
- * @author Nils
- */
-function newUUIDString() {
-        var uuidgen = Components.classes["@mozilla.org/uuid-generator;1"]
-                .getService(Components.interfaces.nsIUUIDGenerator);
-        newUUIDString = function() {
-                return uuidgen.generateUUID().toString();
-        }
-        return newUUIDString();
-}
-
-// XXX switch to nsITimer?
-function Timer(func, interval, persist, now) {
-
+Utils.
-        if (typeof(func) != 'function') {
-                func = new Function(func);

trunk/chrome/content/dta/addurl.js

@@ -86 +86 @@
-        },
-        join: function(str) {
-
+Utils.
-                        yield (str + this._format(i));
-                }

trunk/chrome/content/dta/manager.js

@@ -1017 +1017 @@
-                                name = name.substring(0, 60);
-                        }
-
+Utils.
-                        this._tmpFile = dest;
-                }
@@ -1044 +1044 @@
-                let state = this._state;
-                for (let i = 0, e = arguments.length; i < e; ++i) {
-&
+==
-                                return true;
-                        }
@@ -1713 +1713 @@
-                );
-                if (this.hash) {
-_
-_
+Utils.
+Utils.
-                }
-                if (this.autoRetrying) {

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

@@ -43 +43 @@
-                function callback(u) {
-                        u = u.substr(1, u.length - 2);
-
+Utils.
-                        uuids[id] = u;
-                        return id;

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

@@ -570 +570 @@
-                        modifySome($('delete'), function(d) d.is(COMPLETE));
-                        modifySome($('export'), function(d) !!d.count);
-
+, CANCELED
-                }
-                catch (ex) {

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

@@ -88 +88 @@
-                        this.download.invalidate();
-                        
-
+Utils.
-                        if (this.hash != this.download.hash.sum) {
-                                Debug.logString("hash mismatch, actual: " + this.hash + " expected: " + this.download.hash.sum);