Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 02:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1405670 - stop saving the last modification date of directories we loaded engines from, r=adw.

Browse Source
This commit is contained in:
Florian Quèze 2017-11-17 12:04:27 +01:00
parent 47b9babf07
commit 229e50d560
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2031,10 +2031,6 @@ Engine.prototype = {
if (aJson.filePath) {
this._filePath = aJson.filePath;
}
if (aJson.dirPath) {
this._dirPath = aJson.dirPath;
this._dirLastModifiedTime = aJson.dirLastModifiedTime;
}
if (aJson.extensionID) {
this._extensionID = aJson.extensionID;
}
@ -2082,12 +2078,6 @@ Engine.prototype = {
// from the profile if the user removes the engine.
json.filePath = this._filePath;
}
if (this._dirPath) {
// The directory path is only stored for extension-shipped engines,
// it's used to invalidate the cache.
json.dirPath = this._dirPath;
json.dirLastModifiedTime = this._dirLastModifiedTime;
}
if (this._extensionID) {
json.extensionID = this._extensionID;
}
@ -3357,10 +3347,6 @@ SearchService.prototype = {
try {
addedEngine = new Engine(file, true);
addedEngine._initFromFile(file);
if (!addedEngine._isDefault) {
addedEngine._dirPath = aDir.path;
addedEngine._dirLastModifiedTime = aDir.lastModifiedTime;
}
} catch (ex) {
LOG("_loadEnginesFromDir: Failed to load " + file.path + "!\n" + ex);
continue;
@ -3381,8 +3367,7 @@ SearchService.prototype = {
async _asyncLoadEnginesFromDir(aDir) {
LOG("_asyncLoadEnginesFromDir: Searching in " + aDir.path + " for search engines.");
let dirPath = aDir.path;
let iterator = new OS.File.DirectoryIterator(dirPath);
let iterator = new OS.File.DirectoryIterator(aDir.path);
let osfiles = await iterator.nextBatch();
iterator.close();
@ -3408,12 +3393,6 @@ SearchService.prototype = {
file.initWithPath(osfile.path);
addedEngine = new Engine(file, false);
await checkForSyncCompletion(addedEngine._asyncInitFromFile(file));
if (!addedEngine._isDefault) {
addedEngine._dirPath = dirPath;
let info = await OS.File.stat(dirPath);
addedEngine._dirLastModifiedTime =
info.lastModificationDate.getTime();
}
engines.push(addedEngine);
} catch (ex) {
if (ex.result == Cr.NS_ERROR_ALREADY_INITIALIZED) {