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

Bug 1192921: Split DirectoryInstallLocation into an immutable and mutable version. r=rhelmer

Browse Source 
Most directory install locations are immutable at runtime. Only the profile
location can be installed into and uninstalled from. The system add-on locations
will be immutable as well but also be extended with some extra functionality so
it is useful to split the immutable parts out into a shared class that both
the mutable location and eventually system add-on locations can inherit from.

--HG--
extra : commitid : 93JIjq8Dq7f
extra : rebase_source : b7bb657f11a6313a00589790787ad91a26543e36
This commit is contained in:
Dave Townsend 2015-08-25 16:01:55 -07:00
parent 00a22e8793
commit 72d129f6ff
1 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
toolkit/mozapps/extensions/internal/XPIProvider.jsm
View File

@ -2301,7 +2301,8 @@ this.XPIProvider = {
}
try {
var location = new DirectoryInstallLocation(aName, dir, aScope, aLocked);
var location = aLocked ? new DirectoryInstallLocation(aName, dir, aScope)
: new MutableDirectoryInstallLocation(aName, dir, aScope);
}
catch (e) {
logger.warn("Failed to add directory install location " + aName, e);
@ -6741,30 +6742,20 @@ function AddonWrapper(aAddon) {
* containing the add-ons files. The directory or text file must have the same
* name as the add-on's ID.
*
* There may also a special directory named "staged" which can contain
* directories with the same name as an add-on ID. If the directory is empty
* then it means the add-on will be uninstalled from this location during the
* next startup. If the directory contains the add-on's files then they will be
* installed during the next startup.
*
* @param aName
* The string identifier for the install location
* @param aDirectory
* The nsIFile directory for the install location
* @param aScope
* The scope of add-ons installed in this location
* @param aLocked
* true if add-ons cannot be installed, uninstalled or upgraded in the
* install location
*/
function DirectoryInstallLocation(aName, aDirectory, aScope, aLocked) {
function DirectoryInstallLocation(aName, aDirectory, aScope) {
this._name = aName;
this.locked = aLocked;
this.locked = true;
this._directory = aDirectory;
this._scope = aScope
this._IDToFileMap = {};
this._linkedAddons = [];
this._stagingDirLock = 0;
if (!aDirectory.exists())
return;
@ -6899,6 +6890,51 @@ DirectoryInstallLocation.prototype = {
return locations;
},
/**
* Gets the directory that the add-on with the given ID is installed in.
*
* @param aId
* The ID of the add-on
* @return The nsIFile
* @throws if the ID does not match any of the add-ons installed
*/
getLocationForID: function DirInstallLocation_getLocationForID(aId) {
if (aId in this._IDToFileMap)
return this._IDToFileMap[aId].clone();
throw new Error("Unknown add-on ID " + aId);
},
/**
* Returns true if the given addon was installed in this location by a text
* file pointing to its real path.
*
* @param aId
* The ID of the addon
*/
isLinkedAddon: function DirInstallLocation__isLinkedAddon(aId) {
return this._linkedAddons.indexOf(aId) != -1;
}
};
/**
* An extension of DirectoryInstallLocation which adds methods to installing
* and removing add-ons from the directory at runtime.
*
* @param aName
* The string identifier for the install location
* @param aDirectory
* The nsIFile directory for the install location
* @param aScope
* The scope of add-ons installed in this location
*/
function MutableDirectoryInstallLocation(aName, aDirectory, aScope) {
DirectoryInstallLocation.call(this, aName, aDirectory, aScope);
this.locked = false;
this._stagingDirLock = 0;
}
MutableDirectoryInstallLocation.prototype = Object.create(DirectoryInstallLocation.prototype);
Object.assign(MutableDirectoryInstallLocation.prototype, {
/**
* Gets the staging directory to put add-ons that are pending install and
* uninstall into.
@ -7163,32 +7199,7 @@ DirectoryInstallLocation.prototype = {
delete this._IDToFileMap[aId];
},
/**
* Gets the directory that the add-on with the given ID is installed in.
*
* @param aId
* The ID of the add-on
* @return The nsIFile
* @throws if the ID does not match any of the add-ons installed
*/
getLocationForID: function DirInstallLocation_getLocationForID(aId) {
if (aId in this._IDToFileMap)
return this._IDToFileMap[aId].clone();
throw new Error("Unknown add-on ID " + aId);
},
/**
* Returns true if the given addon was installed in this location by a text
* file pointing to its real path.
*
* @param aId
* The ID of the addon
*/
isLinkedAddon: function DirInstallLocation__isLinkedAddon(aId) {
return this._linkedAddons.indexOf(aId) != -1;
}
};
});
#ifdef XP_WIN
/**