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

170006 - extension manager update service, ongoing work

This commit is contained in:
ben%bengoodger.com 2004-04-17 04:41:28 +00:00
Родитель efc92da8f6
Коммит b6f34fe5ce
4 изменённых файлов: 181 добавлений и 50 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

23
toolkit/mozapps/extensions/content/update.js
Просмотреть файл

@ -32,6 +32,28 @@ var gUpdateDialog = {
observe: function (aSubject, aTopic, aData)
{
switch (aTopic) {
case "update-started":
dump("*** update-started: " + aSubject + ", " + aData + "\n");
break;
case "update-item-started":
dump("*** update-item-started: " + aSubject + ", " + aData + "\n");
break;
case "update-item-ended":
dump("*** update-item-ended: " + aSubject + ", " + aData + "\n");
break;
case "update-ended":
dump("*** update-ended: " + aSubject + ", " + aData + "\n");
/*
var installObj = { };
for (var i = 0; i < aExtensions.length; ++i) {
var e = aExtensions[i];
var name = ds.getExtensionProperty(e.id, "name");
installObj[name + " " + e.version] = e.xpiURL;
}
if (trigger.updateEnabled())
trigger.install(installObj);
break; */
/*
case "update-start":
dump("*** update-start: " + aSubject + ", " + aData + "\n");
break;
@ -62,6 +84,7 @@ var gUpdateDialog = {
os.removeObserver(this, this._messages[i]);
break;
*/
}
}
};

5
toolkit/mozapps/extensions/public/nsIExtensionManager.idl
Просмотреть файл

@ -40,7 +40,6 @@
interface nsIInputStream;
interface nsIRDFDataSource;
interface nsIDOMWindowInternal;
[scriptable, uuid(c3515b0f-99f4-453b-805e-1fdf5724d6d9)]
interface nsIExtensionManager : nsISupports
@ -49,9 +48,7 @@ interface nsIExtensionManager : nsISupports
void uninstallExtension(in string aExtensionID);
void enableExtension(in string aExtensionID);
void disableExtension(in string aExtensionID);
/* aDOMWindow param here is temporary hack until xpinstall trigger is accessible
via xpconnect */
void updateExtension(in string aExtensionID, in nsIDOMWindowInternal aDOMWindow);
void updateExtension(in string aExtensionID);
void installTheme(in string aThemeID);
void uninstallTheme(in string aThemeID);

49
toolkit/mozapps/extensions/service/VersionCheck.java
Просмотреть файл

@ -61,11 +61,51 @@ public class VersionCheck
return DriverManager.getConnection("jdbc:mysql://localhost/umo_extensions", "root", "");
}
public Extension[] getExtensionsToUpdate(Extension[] aExtensions, String aTargetApp, String aTargetAppVersion)
{
Vector results = new Vector();
for (int i = 0; i < aExtensions.length; ++i)
{
Extension e = aExtensions[i];
int id = getNewestExtension(e.getId(), e.getVersion(), aTargetApp, aTargetAppVersion);
if (id != -1)
{
e.setRow(id);
e.setVersion(getProperty(id, "version"));
e.setXpiURL(getProperty(id, "xpiurl"));
results.add(e);
}
}
return (Extension[])results.toArray();
}
// This method is a temporary workaround until Mozilla's Web Services implementation
// supports passing Arrays of complex types.
public Extension getNewestExtension(Extension aExtension,
String aTargetApp,
String aTargetAppVersion)
{
Extension e = null;
int id = getNewestExtension(aExtension.getId(), aExtension.getVersion(),
aTargetApp, aTargetAppVersion);
if (id != -1)
{
e = new Extension();
e.setRow(id);
e.setName(getProperty(id, "name"));
e.setVersion(getProperty(id, "version"));
e.setXpiURL(getProperty(id, "xpiurl"));
}
return e;
}
public Extension getExtension(String aExtensionGUID, String aInstalledVersion, String aTargetApp, String aTargetAppVersion)
{
int id = getNewestExtension(aExtensionGUID, aInstalledVersion, aTargetApp, aTargetAppVersion);
Extension e = new Extension();
Extension e = new Extension();
e.setRow(id);
e.setId(getProperty(id, "id"));
e.setVersion(getProperty(id, "version"));
@ -75,7 +115,7 @@ public class VersionCheck
return e;
}
public String getProperty(int aRowID, String aProperty)
protected String getProperty(int aRowID, String aProperty)
{
String result = null;
try
@ -96,10 +136,7 @@ public class VersionCheck
return result;
}
public int getNewestExtension(String aExtensionGUID,
String aInstalledVersion,
String aTargetApp,
String aTargetAppVersion)
protected int getNewestExtension(String aExtensionGUID, String aInstalledVersion, String aTargetApp, String aTargetAppVersion)
{
int id = -1;
int extensionVersionParts = getPartCount(aInstalledVersion);

154
toolkit/mozapps/extensions/src/nsExtensionManager.js.in
Просмотреть файл

@ -56,9 +56,47 @@ nsExtensionManager.prototype = {
.getService(Components.interfaces.nsIObserverService);
os.removeObserver(this, "profile-after-change");
// Check to see if the version of the application that is being started
// now is the same one that was started last time.
var pref = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
var currAppVersion = pref.getCharPref(PREF_EM_APP_VERSION);
var lastAppVersion = pref.getCharPref(PREF_EM_LAST_APP_VERSION);
if (currAppVersion != lastAppVersion) {
// Version mismatch, we're have to load the extensions datasource
// and do version checking.
var power = currAppVersion.split(".").length;
currAppVersion = this.parseVersion(currAppVersion, power);
var extensions = ds.getIncompatibleExtensionList(currAppVersion);
var updater = new nsExtensionUpdater(extensions, appID, currAppVersion);
updater.checkForUpdates(doneUpdatingExtension);
}
dump("*** profile extensions startup\n");
}
},
parseVersion: function (aVersion, aPower)
{
var parts = aVersion.split(".");
var vrsion = 0;
if (aPower == 0)
aPower = parts.length;
for (var i = 0; i < parts.length; ++i) {
var token = parts[i];
if (token.charAt(token.length-1) == "+") {
token = token.substr(0, token.lastIndexOf("+"));
version += 1;
if (token.length == 0)
continue;
}
version += parseInt(token) * Math.pow(10, aPower - i);
}
return version;
},
// nsIExtensionManager
installExtensionFromStream: function (aStream, aUseProfile)
@ -99,31 +137,16 @@ nsExtensionManager.prototype = {
this._ds.disableExtension(aExtensionID);
},
updateExtension: function (aExtensionID, aDOMWindow)
updateExtension: function (aExtensionID)
{
var pref = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
var appID = pref.getCharPref(PREF_EM_APP_ID);
var appVersion = pref.getCharPref(PREF_EM_APP_VERSION);
var ds = this._ds;
var extensionVersion = ds.getExtensionProperty(aExtensionID, "version");
var itemCount = 0;
var trigger = aDOMWindow.InstallTrigger;
function doneUpdatingExtension(aExtensionID, aXPIURL)
{
var name = ds.getExtensionProperty(aExtensionID, "name");
var obj = {};
obj[name] = aXPIURL;
if (trigger.updateEnabled())
trigger.install(obj);
}
var updater = new nsExtensionUpdater(aExtensionID, extensionVersion, appID, appVersion);
updater.checkForUpdates(doneUpdatingExtension);
var extensions = this._ds.getExtensionList(aExtensionID);
var updater = new nsExtensionUpdater(extensions, appID, appVersion);
updater.checkForUpdates();
},
// Themes
@ -175,22 +198,23 @@ nsExtensionManager.prototype = {
}
};
function nsExtensionUpdater(aExtensionID, aExtensionVersion,
function nsExtensionUpdater(aExtensions,
aTargetAppID, aTargetAppVersion)
{
this._extensionID = aExtensionID;
this._extensionVersion = aExtensionVersion;
this._extensions = aExtensions;
this._count = aExtensions.length;
this._appID = aTargetAppID;
this._appVersion = aTargetAppVersion;
this._os = Components.classes["@mozilla.org/observer-service;1"]
.getService(Components.interfaces.nsIObserverService);
}
nsExtensionUpdater.prototype = {
/////////////////////////////////////////////////////////////////////////////
//
checkForUpdates: function (aDoneUpdatingFunc)
checkForUpdates: function ()
{
this._doneUpdatingFunc = aDoneUpdatingFunc;
var wspFactory = Components.classes["@mozilla.org/xmlextras/proxy/webserviceproxyfactory;1"]
.getService(Components.interfaces.nsIWebServiceProxyFactory);
wspFactory.createProxyAsync("http://localhost:8080/axis/services/VersionCheck?wsdl",
@ -199,10 +223,21 @@ nsExtensionUpdater.prototype = {
_proxy: null,
_getExtensionUpdateURL: function (aExtensionGUID, aInstalledVersion,
aTargetApp, aTargetAppVersion)
_getExtensionsToUpdate: function ()
{
this._proxy.getNewestExtension(aExtensionGUID, aInstalledVersion, aTargetApp, aTargetAppVersion);
this._proxy.getExtensionsToUpdate(this._extensions, this._appID, this._appVersion);
},
_checkForUpdates: function ()
{
this._os.notifyObservers(null, "update-started", "");
//
for (var i = 0; i < this._extensions.length; ++i) {
var e = this._extensions[i];
this._os.notifyObservers(null, "update-item-started", e.name);
this._proxy.getNewestExtension(e, this._appID, this._appVersion);
//this._proxy.getExtension(e.id, e.version, this._appID, this._appVersion);
}
},
/////////////////////////////////////////////////////////////////////////////
@ -211,7 +246,8 @@ nsExtensionUpdater.prototype = {
{
this._proxy = aProxy;
this._proxy.setListener(this);
this._getExtensionUpdateURL(this._extensionID, this._extensionVersion, this._appID, this._appVersion);
// this._getExtensionsToUpdate();
this._checkForUpdates();
},
onError: function (aError)
@ -219,23 +255,30 @@ nsExtensionUpdater.prototype = {
dump("*** onError ERROR = " + aError + "\n");
},
getNewestExtensionCallback: function (aResult)
getExtensionsToUpdateCallback: function (aResult)
{
this._newestID = aResult;
if (this._newestID != -1)
this._proxy.getProperty(this._newestID, "xpiurl");
},
getPropertyCallback: function (aResult)
getExtensionCallback: function (aResult)
{
this._doneUpdatingFunc(this._extensionID, aResult);
dump("*** getExtensionCallback RESULT = " + aResult + "\n");
},
getNewestExtensionCallback: function (aResult)
{
dump("*** getNewestExtensionCallback RESULT = " + aResult + "\n");
this._os.notifyObservers(null, "update-item-ended", "goat");
if (--this._count == 0)
this._os.notifyObservers(null, "update-ended", "");
}
};
const PREF_EM_DEFAULTUPDATEURL = "update.url.extensions";
const PREF_EM_APP_ID = "app.id";
const PREF_EM_LAST_APP_VERSION = "extensions.lastAppVersion";
const PREF_EM_APP_VERSION = "general.useragent.vendorSub";
function EM_NS(aProperty)
@ -261,6 +304,37 @@ nsExtensionsDataSource.prototype = {
{
return this._rdf.GetLiteral(aLiteral);
},
_stripPrefix: function (aResourceURI)
{
return aResourceURI.substr("urn:mozilla:extension:".length, aResourceURI.length);
},
getExtensionList: function (aExtensionID)
{
var extensions = [];
if (aExtensionID) {
extensions.push({ id: aExtensionID,
version: this.getExtensionProperty(aExtensionID, "version"),
name: this.getExtensionProperty(aExtensionID, "name"),
row: -1, xpiURL: "" });
}
else {
var ctr = Components.classes["@mozilla.org/rdf/container;1"]
.createInstance(Components.interfaces.nsIRDFContainer);
ctr.Init(this, this._rdf.GetResource("urn:mozilla:extension:root"));
var elements = ctr.GetElements();
while (elements.hasMoreElements()) {
var e = elements.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
var id = this._stripPrefix(e.Value);
extensions.push({ id: id, version: this.getExtensionProperty(id, "version"),
name: this.getExtensionProperty(id, "name"), row: -1,
xpiURL: "" });
}
}
return extensions;
},
_setProperty: function (aDS, aSource, aProperty, aNewValue)
{
@ -555,21 +629,21 @@ nsExtensionsDataSource.prototype = {
throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
},
init: function (aURI)
Init: function (aURI)
{
},
refresh: function (aBlocking)
Refresh: function (aBlocking)
{
},
flush: function ()
Flush: function ()
{
this._flush(false);
this._flush(true);
},
flushTo: function (aURI)
FlushTo: function (aURI)
{
},