mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Have separate states for new search plugin install and search plugin update and only remove old files for updates. b=290038 r=mconnor sr=brendan a=roc

This commit is contained in:
dbaron%dbaron.org 2007-09-06 22:07:26 +00:00
Родитель 08e22106d8
Коммит 17fc855a98
3 изменённых файлов: 65 добавлений и 19 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
suite/browser/public/nsISearchService.idl
Просмотреть файл

@ -70,15 +70,25 @@ interface nsIInternetSearchService : nsISupports
in wstring suggestedTitle, in wstring suggestedCategory); in wstring suggestedTitle, in wstring suggestedCategory);
}; };
[noscript, uuid(ac0c0781-ab71-11d3-a652-b09b68feee44)] [noscript, uuid(7b171610-80ca-4d33-b16c-4186cd7b7e73)]
interface nsIInternetSearchContext : nsISupports interface nsIInternetSearchContext : nsISupports
{ {
// context types: WEB_SEARCH_CONTEXT=1, ENGINE_DOWNLOAD_CONTEXT, ICON_DOWNLOAD_CONTEXT };
const unsigned long WEB_SEARCH_CONTEXT = 1; const unsigned long WEB_SEARCH_CONTEXT = 1;
const unsigned long ENGINE_DOWNLOAD_CONTEXT = 2;
const unsigned long ICON_DOWNLOAD_CONTEXT = 3; // The download of the .src file for a *new* engine.
const unsigned long ENGINE_UPDATE_CONTEXT = 4; const unsigned long ENGINE_DOWNLOAD_NEW_CONTEXT = 2;
const unsigned long ICON_UPDATE_CONTEXT = 5;
// The download of the icon file for a new engine.
const unsigned long ICON_DOWNLOAD_NEW_CONTEXT = 3;
// The head request to see if we need to update the engine.
const unsigned long ENGINE_UPDATE_HEAD_CONTEXT = 4;
// The download of the .src file for an engine update.
const unsigned long ENGINE_DOWNLOAD_UPDATE_CONTEXT = 5;
// The download of the icon file for an engine update.
const unsigned long ICON_DOWNLOAD_UPDATE_CONTEXT = 6;
// attributes // attributes
readonly attribute unsigned long ContextType; readonly attribute unsigned long ContextType;

55
suite/browser/src/nsInternetSearchService.cpp
Просмотреть файл

@ -726,7 +726,7 @@ InternetSearchDataSource::FireTimer(nsITimer* aTimer, void* aClosure)
search->busyResource = searchURI; search->busyResource = searchURI;
nsCOMPtr<nsIInternetSearchContext> engineContext; nsCOMPtr<nsIInternetSearchContext> engineContext;
if (NS_FAILED(rv = NS_NewInternetSearchContext(nsIInternetSearchContext::ENGINE_UPDATE_CONTEXT, if (NS_FAILED(rv = NS_NewInternetSearchContext(nsIInternetSearchContext::ENGINE_UPDATE_HEAD_CONTEXT,
nsnull, searchURI, nsnull, nsnull, getter_AddRefs(engineContext)))) nsnull, searchURI, nsnull, nsnull, getter_AddRefs(engineContext))))
return; return;
if (!engineContext) return; if (!engineContext) return;
@ -2450,6 +2450,15 @@ InternetSearchDataSource::EndUpdateBatch()
NS_IMETHODIMP NS_IMETHODIMP
InternetSearchDataSource::AddSearchEngine(const char *engineURL, const char *iconURL, InternetSearchDataSource::AddSearchEngine(const char *engineURL, const char *iconURL,
const PRUnichar *suggestedTitle, const PRUnichar *suggestedCategory) const PRUnichar *suggestedTitle, const PRUnichar *suggestedCategory)
{
return AddSearchEngineInternal(engineURL, iconURL, suggestedTitle, suggestedCategory, PR_FALSE);
}
nsresult
InternetSearchDataSource::AddSearchEngineInternal(const char *engineURL, const char *iconURL,
const PRUnichar *suggestedTitle,
const PRUnichar *suggestedCategory,
PRBool isUpdate)
{ {
NS_PRECONDITION(engineURL != nsnull, "null ptr"); NS_PRECONDITION(engineURL != nsnull, "null ptr");
if (!engineURL) return(NS_ERROR_NULL_POINTER); if (!engineURL) return(NS_ERROR_NULL_POINTER);
@ -2473,7 +2482,7 @@ InternetSearchDataSource::AddSearchEngine(const char *engineURL, const char *ico
// download engine // download engine
nsCOMPtr<nsIInternetSearchContext> engineContext; nsCOMPtr<nsIInternetSearchContext> engineContext;
if (NS_FAILED(rv = NS_NewInternetSearchContext(nsIInternetSearchContext::ENGINE_DOWNLOAD_CONTEXT, if (NS_FAILED(rv = NS_NewInternetSearchContext(isUpdate ? nsIInternetSearchContext::ENGINE_DOWNLOAD_UPDATE_CONTEXT : nsIInternetSearchContext::ENGINE_DOWNLOAD_NEW_CONTEXT,
nsnull, nsnull, nsnull, suggestedCategory, getter_AddRefs(engineContext)))) nsnull, nsnull, nsnull, suggestedCategory, getter_AddRefs(engineContext))))
return(rv); return(rv);
if (!engineContext) return(NS_ERROR_UNEXPECTED); if (!engineContext) return(NS_ERROR_UNEXPECTED);
@ -2491,7 +2500,7 @@ InternetSearchDataSource::AddSearchEngine(const char *engineURL, const char *ico
// download icon // download icon
nsCOMPtr<nsIInternetSearchContext> iconContext; nsCOMPtr<nsIInternetSearchContext> iconContext;
if (NS_FAILED(rv = NS_NewInternetSearchContext(nsIInternetSearchContext::ICON_DOWNLOAD_CONTEXT, if (NS_FAILED(rv = NS_NewInternetSearchContext(isUpdate ? nsIInternetSearchContext::ICON_DOWNLOAD_UPDATE_CONTEXT : nsIInternetSearchContext::ICON_DOWNLOAD_NEW_CONTEXT,
nsnull, nsnull, nsnull, nsnull, getter_AddRefs(iconContext)))) nsnull, nsnull, nsnull, nsnull, getter_AddRefs(iconContext))))
return(rv); return(rv);
if (!iconContext) return(NS_ERROR_UNEXPECTED); if (!iconContext) return(NS_ERROR_UNEXPECTED);
@ -2516,6 +2525,11 @@ InternetSearchDataSource::AddSearchEngine(const char *engineURL, const char *ico
nsresult nsresult
InternetSearchDataSource::saveContents(nsIChannel* channel, nsIInternetSearchContext *context, PRUint32 contextType) InternetSearchDataSource::saveContents(nsIChannel* channel, nsIInternetSearchContext *context, PRUint32 contextType)
{ {
NS_ASSERTION(contextType == nsIInternetSearchContext::ENGINE_DOWNLOAD_NEW_CONTEXT ||
contextType == nsIInternetSearchContext::ICON_DOWNLOAD_NEW_CONTEXT ||
contextType == nsIInternetSearchContext::ENGINE_DOWNLOAD_UPDATE_CONTEXT ||
contextType == nsIInternetSearchContext::ICON_DOWNLOAD_UPDATE_CONTEXT,
"unexpected context");
nsresult rv = NS_OK; nsresult rv = NS_OK;
if (!channel) return(NS_ERROR_UNEXPECTED); if (!channel) return(NS_ERROR_UNEXPECTED);
@ -2539,8 +2553,8 @@ InternetSearchDataSource::saveContents(nsIChannel* channel, nsIInternetSearchCon
// make sure that search engines are .src files // make sure that search engines are .src files
PRInt32 extensionOffset; PRInt32 extensionOffset;
if (contextType == nsIInternetSearchContext::ENGINE_DOWNLOAD_CONTEXT || if (contextType == nsIInternetSearchContext::ENGINE_DOWNLOAD_NEW_CONTEXT ||
contextType == nsIInternetSearchContext::ENGINE_UPDATE_CONTEXT) contextType == nsIInternetSearchContext::ENGINE_DOWNLOAD_UPDATE_CONTEXT)
{ {
extensionOffset = baseName.RFind(".src", PR_TRUE); extensionOffset = baseName.RFind(".src", PR_TRUE);
if ((extensionOffset < 0) || (extensionOffset != (PRInt32)(baseName.Length()-4))) if ((extensionOffset < 0) || (extensionOffset != (PRInt32)(baseName.Length()-4)))
@ -2571,7 +2585,19 @@ InternetSearchDataSource::saveContents(nsIChannel* channel, nsIInternetSearchCon
// XXX - It appears that this is done in order to discard the upper // XXX - It appears that this is done in order to discard the upper
// byte of each PRUnichar. I hope that's OK!! // byte of each PRUnichar. I hope that's OK!!
// //
outFile->Remove(PR_FALSE); if (contextType == nsIInternetSearchContext::ENGINE_DOWNLOAD_UPDATE_CONTEXT ||
contextType == nsIInternetSearchContext::ICON_DOWNLOAD_UPDATE_CONTEXT) {
// This is an update operation that we triggered. Remove the old one.
outFile->Remove(PR_FALSE);
} else {
PRBool exists;
rv = outFile->Exists(&exists);
if (NS_FAILED(rv) || exists) {
// We already have a search plugin with this filename; don't
// replace it (bug 290038).
return NS_ERROR_UNEXPECTED;
}
}
nsCOMPtr<nsIOutputStream> outputStream, fileOutputStream; nsCOMPtr<nsIOutputStream> outputStream, fileOutputStream;
rv = NS_NewLocalFileOutputStream(getter_AddRefs(fileOutputStream), outFile); rv = NS_NewLocalFileOutputStream(getter_AddRefs(fileOutputStream), outFile);
@ -2588,8 +2614,8 @@ InternetSearchDataSource::saveContents(nsIChannel* channel, nsIInternetSearchCon
outputStream->Flush(); outputStream->Flush();
outputStream->Close(); outputStream->Close();
if (contextType == nsIInternetSearchContext::ENGINE_DOWNLOAD_CONTEXT || if (contextType == nsIInternetSearchContext::ENGINE_DOWNLOAD_NEW_CONTEXT ||
contextType == nsIInternetSearchContext::ENGINE_UPDATE_CONTEXT) contextType == nsIInternetSearchContext::ENGINE_DOWNLOAD_UPDATE_CONTEXT)
{ {
#ifdef XP_MAC #ifdef XP_MAC
// set appropriate Mac file type/creator for search engine files // set appropriate Mac file type/creator for search engine files
@ -2607,7 +2633,8 @@ InternetSearchDataSource::saveContents(nsIChannel* channel, nsIInternetSearchCon
// update graph with various required info // update graph with various required info
SaveEngineInfoIntoGraph(outFile, nsnull, hintUni, dataBuf, PR_FALSE, PR_FALSE); SaveEngineInfoIntoGraph(outFile, nsnull, hintUni, dataBuf, PR_FALSE, PR_FALSE);
} }
else if (contextType == nsIInternetSearchContext::ICON_DOWNLOAD_CONTEXT) else if (contextType == nsIInternetSearchContext::ICON_DOWNLOAD_NEW_CONTEXT ||
contextType == nsIInternetSearchContext::ICON_DOWNLOAD_UPDATE_CONTEXT)
{ {
// update graph with icon info // update graph with icon info
SaveEngineInfoIntoGraph(nsnull, outFile, nsnull, nsnull, PR_FALSE, PR_FALSE); SaveEngineInfoIntoGraph(nsnull, outFile, nsnull, nsnull, PR_FALSE, PR_FALSE);
@ -5121,8 +5148,10 @@ InternetSearchDataSource::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
// continue to process nsIInternetSearchContext::WEB_SEARCH_CONTEXT // continue to process nsIInternetSearchContext::WEB_SEARCH_CONTEXT
rv = webSearchFinalize(channel, context); rv = webSearchFinalize(channel, context);
} }
else if (contextType == nsIInternetSearchContext::ENGINE_DOWNLOAD_CONTEXT || else if (contextType == nsIInternetSearchContext::ENGINE_DOWNLOAD_NEW_CONTEXT ||
contextType == nsIInternetSearchContext::ICON_DOWNLOAD_CONTEXT) contextType == nsIInternetSearchContext::ICON_DOWNLOAD_NEW_CONTEXT ||
contextType == nsIInternetSearchContext::ENGINE_DOWNLOAD_UPDATE_CONTEXT ||
contextType == nsIInternetSearchContext::ICON_DOWNLOAD_UPDATE_CONTEXT)
{ {
nsCOMPtr<nsIHttpChannel> httpChannel (do_QueryInterface(channel)); nsCOMPtr<nsIHttpChannel> httpChannel (do_QueryInterface(channel));
if (!httpChannel) return(NS_ERROR_UNEXPECTED); if (!httpChannel) return(NS_ERROR_UNEXPECTED);
@ -5135,7 +5164,7 @@ InternetSearchDataSource::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
rv = saveContents(channel, context, contextType); rv = saveContents(channel, context, contextType);
} }
} }
else if (contextType == nsIInternetSearchContext::ENGINE_UPDATE_CONTEXT) else if (contextType == nsIInternetSearchContext::ENGINE_UPDATE_HEAD_CONTEXT)
{ {
nsCOMPtr<nsIRDFResource> theEngine; nsCOMPtr<nsIRDFResource> theEngine;
if (NS_FAILED(rv = context->GetEngine(getter_AddRefs(theEngine)))) return(rv); if (NS_FAILED(rv = context->GetEngine(getter_AddRefs(theEngine)))) return(rv);
@ -5271,7 +5300,7 @@ InternetSearchDataSource::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
} }
// download it! // download it!
AddSearchEngine(updateURL.get(), updateIconURL.get(), nsnull, nsnull); AddSearchEngineInternal(updateURL.get(), updateIconURL.get(), nsnull, nsnull, PR_TRUE);
} }
else else
{ {

7
suite/browser/src/nsInternetSearchService.h
Просмотреть файл

@ -184,6 +184,13 @@ friend int PR_CALLBACK searchModePrefCallback(const char *pref, void *aClosur
static void FireTimer(nsITimer* aTimer, void* aClosure); static void FireTimer(nsITimer* aTimer, void* aClosure);
// Just like AddSearchEngine, but with an extra fifth parameter to say
// whether it's our internal update or a new engine.
nsresult AddSearchEngineInternal(const char *engineURL,
const char *iconURL,
const PRUnichar *suggestedTitle,
const PRUnichar *suggestedCategory,
PRBool isUpdate);
public: public:
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS