Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 04:27:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 393821 - Quick downloads (cached, local, data:, failed) don't appear until you reopen Download Manager. r=sdwilsh, a=mconnor

Browse Source
This commit is contained in:
edward.lee@engineering.uiuc.edu 2007-10-01 17:53:04 -07:00
parent 1779e27d03
commit d0f7be641e
2 changed files with 11 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
toolkit/mozapps/downloads/content/DownloadProgressListener.js
View File

@ -62,32 +62,25 @@ DownloadProgressListener.prototype = {
onDownloadStateChange: function dlPL_onDownloadStateChange(aState, aDownload)
{
var dl = getDownload(aDownload.id);
switch (aDownload.state) {
let state = aDownload.state;
switch (state) {
case Ci.nsIDownloadManager.DOWNLOAD_QUEUED:
// We'll have at least one active download now
gDownloadsActiveTitle.hidden = false;
case Ci.nsIDownloadManager.DOWNLOAD_DOWNLOADING:
// if dl is non-null, the download is already added to the UI, so we
// just make sure it is where it is supposed to be; otherwise, create it
if (!dl)
dl = this._createDownloadItem(aDownload);
gDownloadsView.insertBefore(dl, gDownloadsActiveTitle.nextSibling);
buildActiveDownloadsList();
break;
case Ci.nsIDownloadManager.DOWNLOAD_FAILED:
case Ci.nsIDownloadManager.DOWNLOAD_CANCELED:
case Ci.nsIDownloadManager.DOWNLOAD_BLOCKED:
downloadCompleted(aDownload);
break;
case Ci.nsIDownloadManager.DOWNLOAD_FINISHED:
downloadCompleted(aDownload);
autoRemoveAndClose(aDownload);
if (state == Ci.nsIDownloadManager.DOWNLOAD_FINISHED)
autoRemoveAndClose(aDownload);
break;
}
// autoRemoveAndClose could have already closed our window...
try {
dl.setAttribute("state", aDownload.state);
let dl = getDownload(aDownload.id);
dl.setAttribute("state", state);
updateStatus(dl);
gDownloadViewController.onCommandUpdate();
} catch (e) { }
@ -98,14 +91,6 @@ DownloadProgressListener.prototype = {
aMaxTotalProgress, aDownload)
{
var download = getDownload(aDownload.id);
if (!download) {
// d'oh - why this happens is complicated, let's just add it in
download = this._createDownloadItem(aDownload);
gDownloadsView.insertBefore(download, gDownloadsActiveTitle.nextSibling);
}
// any activity means we should have active downloads!
gDownloadsActiveTitle.hidden = false;
// Update this download's progressmeter
if (aDownload.percentComplete == -1) {
@ -147,25 +132,5 @@ DownloadProgressListener.prototype = {
onSecurityChange: function(aWebProgress, aRequest, aState, aDownload)
{
},
//////////////////////////////////////////////////////////////////////////////
//// DownloadProgressListener
_createDownloadItem: function(aDownload)
{
let uri = Cc["@mozilla.org/network/util;1"].
getService(Ci.nsIIOService).newFileURI(aDownload.targetFile);
let referrer = aDownload.referrer;
return createDownloadItem(aDownload.id,
uri.spec,
aDownload.displayName,
aDownload.source.spec,
aDownload.state,
aDownload.percentComplete,
Math.round(aDownload.startTime / 1000),
referrer ? referrer.spec : null,
aDownload.amountTransferred,
aDownload.size);
}
};

6
toolkit/mozapps/downloads/content/downloads.js
View File

@ -95,7 +95,7 @@ let gBaseQuery = "SELECT id, target, name, source, state, startTime, " +
"referrer, currBytes, maxBytes " +
"FROM moz_downloads " +
"WHERE #1 " +
"ORDER BY endTime ASC";
"ORDER BY endTime ASC, startTime ASC";
///////////////////////////////////////////////////////////////////////////////
// Utility Functions
@ -928,7 +928,7 @@ function buildActiveDownloadsList()
var stmt = gActiveDownloadsQuery;
if (!stmt) {
stmt = db.createStatement(replaceInsert(gBaseQuery, 1,
"state = ?1 OR state = ?2 OR state = ?3"));
"state = ?1 OR state = ?2 OR state = ?3 OR state = ?4 OR state = ?5"));
gActiveDownloadsQuery = stmt;
}
@ -936,6 +936,8 @@ function buildActiveDownloadsList()
stmt.bindInt32Parameter(0, Ci.nsIDownloadManager.DOWNLOAD_NOTSTARTED);
stmt.bindInt32Parameter(1, Ci.nsIDownloadManager.DOWNLOAD_DOWNLOADING);
stmt.bindInt32Parameter(2, Ci.nsIDownloadManager.DOWNLOAD_PAUSED);
stmt.bindInt32Parameter(3, Ci.nsIDownloadManager.DOWNLOAD_QUEUED);
stmt.bindInt32Parameter(4, Ci.nsIDownloadManager.DOWNLOAD_SCANNING);
buildDownloadList(stmt, gDownloadsActiveTitle);
} finally {
stmt.reset();