alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't kill the entire plugin just because an addon fails

Browse Source 
svn path=/trunk/KDE/kdebase/runtime/; revision=1171464
This commit is contained in:
Aaron J. Seigo 2010-09-03 22:00:12 +00:00
parent bb4f213215
commit 60bda70955
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
scriptengines/javascript/common/scriptenv.cpp
View File

@ -235,7 +235,7 @@ QScriptValue ScriptEnv::getUrl(QScriptContext *context, QScriptEngine *engine)
ScriptEnv *env = ScriptEnv::findScriptEnv(engine); ScriptEnv *env = ScriptEnv::findScriptEnv(engine);
if (!env) { if (!env) {
//kDebug() << "findScriptEnv failed"; //kDebug() << "findScriptEnv failed";
return engine->undefinedValue(); return engine->undefinedValue();
} }
@ -406,14 +406,24 @@ QScriptValue ScriptEnv::listAddons(QScriptContext *context, QScriptEngine *engin
QScriptValue ScriptEnv::loadAddon(QScriptContext *context, QScriptEngine *engine) QScriptValue ScriptEnv::loadAddon(QScriptContext *context, QScriptEngine *engine)
{ {
if (context->argumentCount() < 2) { if (context->argumentCount() < 2) {
return context->throwError(i18n("loadAddon takes two arguments: addon type and addon name to load")); QScriptValue rv = context->throwError(i18n("loadAddon takes two arguments: addon type and addon name to load"));
ScriptEnv *env = ScriptEnv::findScriptEnv(engine);
if (env) {
env->checkForErrors(false);
}
return rv;
} }
const QString type = context->argument(0).toString(); const QString type = context->argument(0).toString();
const QString plugin = context->argument(1).toString(); const QString plugin = context->argument(1).toString();
if (type.isEmpty() || plugin.isEmpty()) { if (type.isEmpty() || plugin.isEmpty()) {
return context->throwError(i18n("loadAddon takes two arguments: addon type and addon name to load")); QScriptValue rv = context->throwError(i18n("loadAddon takes two arguments: addon type and addon name to load"));
ScriptEnv *env = ScriptEnv::findScriptEnv(engine);
if (env) {
env->checkForErrors(false);
}
return rv;
} }
const QString constraint = QString("[X-KDE-PluginInfo-Category] == '%1' and [X-KDE-PluginInfo-Name] == '%2'") const QString constraint = QString("[X-KDE-PluginInfo-Category] == '%1' and [X-KDE-PluginInfo-Name] == '%2'")
@ -421,7 +431,12 @@ QScriptValue ScriptEnv::loadAddon(QScriptContext *context, QScriptEngine *engine
KService::List offers = KServiceTypeTrader::self()->query("Plasma/JavascriptAddon", constraint); KService::List offers = KServiceTypeTrader::self()->query("Plasma/JavascriptAddon", constraint);
if (offers.isEmpty()) { if (offers.isEmpty()) {
return context->throwError(i18n("Failed to find Addon %1 of type %1", plugin, type)); QScriptValue rv = context->throwError(i18n("Failed to find Addon %1 of type %2", plugin, type));
ScriptEnv *env = ScriptEnv::findScriptEnv(engine);
if (env) {
env->checkForErrors(false);
}
return rv;
} }
Plasma::PackageStructure::Ptr structure(new JavascriptAddonPackageStructure); Plasma::PackageStructure::Ptr structure(new JavascriptAddonPackageStructure);
@ -432,7 +447,12 @@ QScriptValue ScriptEnv::loadAddon(QScriptContext *context, QScriptEngine *engine
QFile file(package.filePath("mainscript")); QFile file(package.filePath("mainscript"));
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
return context->throwError(i18n("Failed to open script file for Addon %1: %2", plugin, package.filePath("mainscript"))); QScriptValue rv = context->throwError(i18n("Failed to open script file for Addon %1: %2", plugin, package.filePath("mainscript")));
ScriptEnv *env = ScriptEnv::findScriptEnv(engine);
if (env) {
env->checkForErrors(false);
}
return rv;
} }
QTextStream buffer(&file); QTextStream buffer(&file);
@ -446,8 +466,13 @@ QScriptValue ScriptEnv::loadAddon(QScriptContext *context, QScriptEngine *engine
QScriptValue::Undeletable | QScriptValue::Undeletable |
QScriptValue::SkipInEnumeration); QScriptValue::SkipInEnumeration);
engine->evaluate(code, file.fileName()); engine->evaluate(code, file.fileName());
engine->popContext(); engine->popContext();
ScriptEnv *env = ScriptEnv::findScriptEnv(engine);
if (env) {
return env->checkForErrors(false);
}
return true; return true;
} }