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

Bug 1203167 - Keep user-installed engines when refreshing an outdated cache, r=adw.

Browse Source
This commit is contained in:
Florian Quèze 2015-10-30 09:54:51 +01:00
parent 856c27d449
commit e23e1d16b4
1 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
toolkit/components/search/nsSearchService.js
View File

@ -3032,6 +3032,9 @@ SearchService.prototype = {
this._loadFromChromeURLs(chromeURIs);
// Load user-installed engines from the obsolete cache.
this._loadEnginesFromCache(cache, true);
otherDirs.forEach(this._loadEnginesFromDir, this);
this._buildCache();
@ -3039,10 +3042,7 @@ SearchService.prototype = {
}
LOG("_loadEngines: loading from cache directories");
for (let cacheKey in cache.directories) {
let dir = cache.directories[cacheKey];
this._loadEnginesFromCache(dir);
}
this._loadEnginesFromCache(cache);
LOG("_loadEngines: done");
},
@ -3163,6 +3163,10 @@ SearchService.prototype = {
let enginesFromURLs =
yield checkForSyncCompletion(this._asyncLoadFromChromeURLs(chromeURIs));
engines = engines.concat(enginesFromURLs);
// Load user-installed engines from the obsolete cache.
this._loadEnginesFromCache(cache, true);
for (let loadDir of otherDirs) {
let enginesFromDir =
yield checkForSyncCompletion(this._asyncLoadEnginesFromDir(loadDir));
@ -3177,10 +3181,7 @@ SearchService.prototype = {
}
LOG("_asyncLoadEngines: loading from cache directories");
for (let cacheKey in cache.directories) {
let dir = cache.directories[cacheKey];
this._loadEnginesFromCache(dir);
}
this._loadEnginesFromCache(cache);
LOG("_asyncLoadEngines: done");
}.bind(this));
@ -3329,12 +3330,24 @@ SearchService.prototype = {
}
},
_loadEnginesFromCache: function SRCH_SVC__loadEnginesFromCache(aDir) {
let engines = aDir.engines;
LOG("_loadEnginesFromCache: Loading from cache. " + engines.length + " engines to load.");
for (let i = 0; i < engines.length; i++) {
let json = engines[i];
_loadEnginesFromCache: function SRCH_SVC__loadEnginesFromCache(cache,
skipReadOnly) {
if (!cache.directories)
return;
for each (let dir in cache.directories) {
let engines = dir.engines;
LOG("_loadEnginesFromCache: Loading from cache. " + engines.length + " engines to load.");
for (let engine of engines) {
if (skipReadOnly && engine._readOnly !== false)
continue;
this._loadEngineFromCache(engine);
}
}
},
_loadEngineFromCache: function SRCH_SVC__loadEngineFromCache(json) {
try {
let engine;
if (json.filePath)
@ -3346,9 +3359,8 @@ SearchService.prototype = {
engine._initWithJSON(json);
this._addEngineToStore(engine);
} catch (ex) {
LOG("Failed to load " + engines[i]._name + " from cache: " + ex);
LOG("Engine JSON: " + engines[i].toSource());
}
LOG("Failed to load " + json._name + " from cache: " + ex);
LOG("Engine JSON: " + json.toSource());
}
},