Changeset 1097

Timestamp:

2008-09-15 06:27:46 (4 months ago)

Author:

MaierMan

Message:

Remove broken downloads from queuefile

Files:

• trunk/chrome/content/dta/manager.js (modified) (1 diff)
• trunk/chrome/content/dta/manager/sessionmanager.js (modified) (3 diffs)

trunk/chrome/content/dta/manager.js

@@ -1849 +1849 @@
-                        e.hashType = Utils.atos(this.hash.type);
-                }
-
-
-
-
+
-                        e.state = QUEUED;
-                }

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

@@ -44 +44 @@
-
-var SessionManager = {
+        _broken: [],
+        
-        init: function() {
-                this._con = Serv('@mozilla.org/storage/service;1', 'mozIStorageService')
@@ -194 +196 @@
-                                        stmt.finalize();
-                                        delete stmt;
+                                        if (this._broken.length) {
+                                                try {
+                                                        for each (let id in this._broken) {
+                                                                this.deleteDownload(id);
+                                                                Debug.logString("Removed broken download #" + id);
+                                                        }
+                                                }
+                                                catch (ex) {
+                                                        Debug.log("failed to remove broken downloads", ex);
+                                                }
+                                                this._broken = [];
+                                        }                                       
-                                        delete this._loader;
-                                        this.endUpdate();
@@ -205 +219 @@
-                                try {
-                                        let dbId = stmt.getInt64(0);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                                        }
-                                
-                                        // only access the setter of the last so that we don't generate stuff trice.
-                                        d._pathName = get('pathName');
-                                        d._description = get('description');
-                                        d._mask = get('mask');
-                                        d.fileName = get('fileName');
-                                        
-                                        let tmpFile = get('tmpFile');
-                                        if (tmpFile) {
-                                                try {
-                                                        tmpFile = new FileFactory(tmpFile);
-                                                        if (tmpFile.exists()) {
-                                                                d._tmpFile = tmpFile;
-                                                        }
-                                                        else {
-                                                                // Download partfile is gone!
-                                                                // XXX find appropriate error message!
-                                                                d.fail(_("accesserror"), _("permissions") + " " + _("destpath") + ". " + _("checkperm"), _("accesserror"));
-                                                        }
-                                                }
-                                                catch (ex) {
-                                                        Debug.log("tried to construct with invalid tmpFile", ex);
-                                                        d.cancel();
-                                                }
-                                        }                               
-        
-                                        d.startDate = new Date(get("startDate"));
-                                        d.visitors = new VisitorManager(down.visitors);
-                                        
-                                        for each (let e in [
-                                                'contentType',
-                                                'conflicts',
-                                                'postData',
-                                                'destinationName',
-                                                'resumable',
-                                                'totalSize',
-                                                'compression',
-                                                'fromMetalink',
-                                        ]) {
-                                                d[e] = (e in down) ? down[e] : null;
-                                        }
-        
-                                        if (down.hash) {
-                                                d.hash = new DTA_Hash(down.hash, down.hashType);
-                                        }
-                                        if ('maxChunks' in down) {
-                                                d._maxChunks = down.maxChunks;
-                                        }
-        
-                                        d.started = d.partialSize != 0;
-                                        let state = get('state') 
-                                        if (state) {
-                                                d._state = state;
-                                        }
-                                        switch (d._state) {
-                                                case PAUSED:
-                                                case QUEUED:
-                                                {
-                                                        for each (let c in down.chunks) {
-                                                                d.chunks.push(new Chunk(d, c.start, c.end, c.written));
-                                                        }
-                                                        d.refreshPartialSize();
-                                                        if (d._state == PAUSED) {
-                                                                d.status = TEXT_PAUSED;
-                                                        }
-                                                        else {
-                                                                d.status = TEXT_QUEUED;
-                                                        }
-                                                }
-                                                break;
-                                                
-                                                case COMPLETE:
-                                                        d.partialSize = d.totalSize;
-                                                        d.status = TEXT_COMPLETE;
-                                                break;
-                                                
-                                                case CANCELED:
-                                                        d.status = TEXT_CANCELED;
-                                                break;
-                                        }
-                                        
-                                        // XXX better call this only once
-                                        // See above
-                                        d.rebuildDestination();
-        
-                                        Tree.add(d);
-                                }
-                                catch (ex) {