Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for bug 140136 - clean up progress listener stuff in the URI loader to more closely match what actually happens in the browser and embedded contexts - mostly just function renaming and code reorg

Browse Source 
r=pinkerton, sr=blake
This commit is contained in:
alecf%netscape.com 2002-06-03 20:52:27 +00:00
parent 947d470f7b
commit c0f296b92f
3 changed files with 56 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
uriloader/exthandler/makefile.win
View File

@ -29,7 +29,6 @@ REQUIRES = xpcom \
rdf \
webshell \
helperAppDlg \
progressDlg \
plugin \
unicharutil \
intl \

80
uriloader/exthandler/nsExternalHelperAppService.cpp
View File

@ -54,7 +54,6 @@
#include "nsIRefreshURI.h"
#include "nsIDocumentLoader.h"
#include "nsIHelperAppLauncherDialog.h"
#include "nsIProgressDialog.h"
#include "nsITransport.h"
#include "nsIFileTransportService.h"
#include "nsCExternalHandlerService.h" // contains contractids for the helper app service
@ -730,7 +729,7 @@ nsExternalAppHandler::nsExternalAppHandler()
mReceivedDispostionInfo = PR_FALSE;
mStopRequestIssued = PR_FALSE;
mDataBuffer = (char *) nsMemory::Alloc((sizeof(char) * DATA_BUFFER_SIZE));
mProgressWindowCreated = PR_FALSE;
mProgressListenerInitialized = PR_FALSE;
mContentLength = -1;
mProgress = 0;
}
@ -760,15 +759,11 @@ NS_IMETHODIMP nsExternalAppHandler::Observe(nsISupports *aSubject, const char *a
NS_IMETHODIMP nsExternalAppHandler::SetWebProgressListener(nsIWebProgressListener * aWebProgressListener)
{
// The progress window only appears after the helper app dialog has told us
// what to do. We need to be careful not to confuse helper app dialog
// calls to this method with ones from the progress dialog!
if (mReceivedDispostionInfo && aWebProgressListener)
{
// this call back means we've succesfully brought up the
// progress window so set the appropriate flag...
mProgressWindowCreated = PR_TRUE;
}
// this call back means we've succesfully brought up the
// progress window so set the appropriate flag, even though
// aWebProgressListener might be null
mProgressListenerInitialized = PR_TRUE;
// Go ahead and register the progress listener....
@ -1397,7 +1392,7 @@ NS_IMETHODIMP nsExternalAppHandler::OnStopRequest(nsIRequest *request, nsISuppor
nsresult nsExternalAppHandler::ExecuteDesiredAction()
{
nsresult rv = NS_OK;
if (mProgressWindowCreated && !mCanceled)
if (mProgressListenerInitialized && !mCanceled)
{
nsMIMEInfoHandleAction action = nsIMIMEInfo::saveToDisk;
mMimeInfo->GetPreferredAction(&action);
@ -1470,25 +1465,10 @@ NS_IMETHODIMP nsExternalAppHandler::GetSuggestedFileName(PRUnichar ** aSuggested
return NS_OK;
}
nsresult nsExternalAppHandler::ShowProgressDialog()
nsresult nsExternalAppHandler::InitializeDownload(nsIDownload* aDownload)
{
// we are back from the helper app dialog (where the user chooses to save or open), but we aren't
// done processing the load. in this case, throw up a progress dialog so the user can see what's going on...
nsresult rv;
nsCOMPtr<nsILocalFile> local = do_QueryInterface(mFinalFileDestination);
nsCOMPtr<nsIDownload> dl = do_CreateInstance("@mozilla.org/download;1", &rv);
if (NS_FAILED(rv)) {
// we don't have a progress window implementation available,
// so we just proceed normally so that we can handle the file
// once the download is complete.
mProgressWindowCreated = PR_TRUE;
// however, we do want to indicate that the progress object was
// not created, so return an error
return rv;
}
nsXPIDLString openWith(NS_LITERAL_STRING(""));
nsMIMEInfoHandleAction action = nsIMIMEInfo::saveToDisk;
mMimeInfo->GetPreferredAction(&action);
@ -1510,14 +1490,36 @@ nsresult nsExternalAppHandler::ShowProgressDialog()
}
}
}
rv = dl->Init(mSourceUrl, local, nsnull, openWith, mTimeDownloadStarted, nsnull);
nsCOMPtr<nsILocalFile> local = do_QueryInterface(mFinalFileDestination);
rv = aDownload->Init(mSourceUrl, local, nsnull,
openWith, mTimeDownloadStarted, nsnull);
if (NS_FAILED(rv)) return rv;
rv = aDownload->SetObserver(this);
dl->SetObserver(this);
nsCOMPtr<nsIWebProgressListener> listener = do_QueryInterface(dl);
if (listener)
SetWebProgressListener(listener);
return rv;
}
nsresult nsExternalAppHandler::CreateProgressListener()
{
// we are back from the helper app dialog (where the user chooses to save or open), but we aren't
// done processing the load. in this case, throw up a progress dialog so the user can see what's going on...
nsresult rv;
nsCOMPtr<nsIWebProgressListener> listener;
nsCOMPtr<nsIDownload> dl = do_CreateInstance("@mozilla.org/download;1", &rv);
if (NS_SUCCEEDED(rv)) {
InitializeDownload(dl);
listener = do_QueryInterface(dl);
}
// note we might not have a listener here if the QI() failed, or if
// there is no nsIDownload object, but we still call
// SetWebProgressListener() to make sure our progress state is sane
SetWebProgressListener(listener);
return rv;
}
@ -1630,8 +1632,8 @@ NS_IMETHODIMP nsExternalAppHandler::SaveToDisk(nsIFile * aNewFileLocation, PRBoo
mFinalFileDestination = do_QueryInterface(fileToUse);
if (!mProgressWindowCreated)
ShowProgressDialog();
if (!mProgressListenerInitialized)
CreateProgressListener();
// now that the user has chosen the file location to save to, it's okay to fire the refresh tag
// if there is one. We don't want to do this before the save as dialog goes away because this dialog
@ -1731,8 +1733,8 @@ NS_IMETHODIMP nsExternalAppHandler::LaunchWithApplication(nsIFile * aApplication
mFinalFileDestination = do_QueryInterface(fileToUse);
// launch the progress window now that the user has picked the desired action.
if (!mProgressWindowCreated)
ShowProgressDialog();
if (!mProgressListenerInitialized)
CreateProgressListener();
return NS_OK;
}

22
uriloader/exthandler/nsExternalHelperAppService.h
View File

@ -50,6 +50,7 @@
class nsExternalAppHandler;
class nsIMIMEInfo;
class nsIRDFService;
class nsIDownload;
class nsExternalHelperAppService : public nsIExternalHelperAppService, public nsPIExternalAppLauncher,
public nsIExternalProtocolService, public nsIMIMEService, public nsIObserver
@ -179,12 +180,12 @@ protected:
// the canceled flag is set if the user canceled the launching of this application before we finished
// saving the data to a temp file...
PRBool mCanceled;
PRPackedBool mCanceled;
// have we received information from the user about how they want to dispose of this content...
PRBool mReceivedDispostionInfo;
PRBool mStopRequestIssued;
PRBool mProgressWindowCreated;
PRPackedBool mReceivedDispostionInfo;
PRPackedBool mStopRequestIssued;
PRPackedBool mProgressListenerInitialized;
PRInt64 mTimeDownloadStarted;
PRInt32 mContentLength;
PRInt32 mProgress; // Number of bytes received (for sending progress notifications).
@ -201,9 +202,11 @@ protected:
// and load group instead of using the window which initiated the load....RetargetLoadNotifications contains
// that information...
nsresult RetargetLoadNotifications(nsIRequest *request);
// if the user tells us how they want to dispose of the content and we still haven't finished downloading while
// they were deciding, then throw a progress dialog so they know what's going on...
nsresult ShowProgressDialog();
// if the user tells us how they want to dispose of the content and
// we still haven't finished downloading while they were deciding,
// then create a progress listener of some kind so they know
// what's going on...
nsresult CreateProgressListener();
nsresult PromptForSaveToFile(nsILocalFile ** aNewFile, const nsAFlatString &aDefaultFile, const nsAFlatString &aDefaultFileExt);
// if the passed in channel is an nsIHTTPChannel, we'll attempt to extract a suggested file name
// from the content disposition header...
@ -220,9 +223,14 @@ protected:
// an internal method used to actually launch a helper app given the temp file
// once we are done receiving data AND have showed the progress dialog.
nsresult OpenWithApplication(nsIFile * aApplication);
// helper routine which peaks at the mime action specified by mMimeInfo
// and calls either MoveFile or OpenWithApplication
nsresult ExecuteDesiredAction();
// initialize an nsIDownload object for use as a progress object
nsresult InitializeDownload(nsIDownload*);
// helper routine to ensure mSuggestedFileName is "correct";
// the base class implementation ensures that mSuggestedFileName has
// mTempFileExtension as extension;