sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If we receive an application/octet-stream, check the mime type by looking at its extension.

Browse Source
This commit is contained in:
Tomeu 2007-03-30 14:32:07 +02:00
parent e179dbae14
commit 891624888f
1 changed files with 53 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/src/GeckoDownload.cpp
View File

@ -3,11 +3,15 @@
#include <nsIFactory.h> #include <nsIFactory.h>
#include <nsIFile.h> #include <nsIFile.h>
#include <nsIFileURL.h> #include <nsIFileURL.h>
#include <nsServiceManagerUtils.h>
#include <nsIMIMEService.h>
#include "sugar-download-manager.h" #include "sugar-download-manager.h"
#include "GeckoDownload.h" #include "GeckoDownload.h"
#define APPLICATION_OCTET_STREAM "application/octet-stream"
class GeckoDownload : public nsITransfer class GeckoDownload : public nsITransfer
{ {
public: public:
@ -62,6 +66,8 @@ GeckoDownload::Init (nsIURI *aSource,
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
file->GetNativePath (mTargetFileName); file->GetNativePath (mTargetFileName);
return NS_OK;
} }
NS_IMETHODIMP NS_IMETHODIMP
@ -80,6 +86,26 @@ GeckoDownload::OnStateChange (nsIWebProgress *aWebProgress,
mMIMEInfo->GetMIMEType(mimeType); mMIMEInfo->GetMIMEType(mimeType);
mSource->GetSpec(url); mSource->GetSpec(url);
/* If the file is application/octet-stream, look up a better mime type
from the extension. */
if(mimeType.Equals(APPLICATION_OCTET_STREAM)) {
nsresult rv;
nsCOMPtr<nsIMIMEService> mimeService(
do_GetService("@mozilla.org/mime;1", &rv));
NS_ENSURE_SUCCESS(rv, rv);
const char *fileExt = strrchr(mTargetFileName.get(), '.');
if(fileExt) {
nsCString contentType;
mimeService->GetTypeFromExtension(nsCString(fileExt),
contentType);
if(!contentType.IsEmpty()) {
mimeType = contentType;
}
}
}
sugar_download_manager_download_started(download_manager, sugar_download_manager_download_started(download_manager,
url.get(), url.get(),
mimeType.get(), mimeType.get(),