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

runners now support extensions (and network/local io), though without any access restrictions

Browse Source 
svn path=/trunk/KDE/kdebase/runtime/; revision=1070945
This commit is contained in:
Aaron J. Seigo 2010-01-07 02:39:49 +00:00
parent 366ca646bd
commit f8eb8c96e9
3 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scriptengines/javascript/CMakeLists.txt
View File

@ -49,17 +49,16 @@ install(FILES plasma-scriptengine-applet-simple-javascript.desktop DESTINATION $
set(javascript_runner_engine_SRCS
javascriptrunner.cpp
scriptenv.cpp
)
kde4_add_plugin(plasma_runnerscript_javascript ${javascript_runner_engine_SRCS})
target_link_libraries(plasma_runnerscript_javascript
${KDE4_KDECORE_LIBS}
${KDE4_PLASMA_LIBS}
${QT_QTSCRIPT_LIBRARY}
${QT_QTUITOOLS_LIBRARY}
${QT_QTXML_LIBRARY}
)
${KDE4_KDECORE_LIBS}
${KDE4_KIO_LIBS}
${KDE4_PLASMA_LIBS}
${QT_QTSCRIPT_LIBRARY})
install(TARGETS plasma_runnerscript_javascript DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-scriptengine-runner-javascript.desktop DESTINATION ${SERVICES_INSTALL_DIR})
@ -76,10 +75,10 @@ set(javascript_dataengine_engine_SRCS
kde4_add_plugin(plasma_dataenginescript_javascript ${javascript_dataengine_engine_SRCS})
target_link_libraries(plasma_dataenginescript_javascript
${KDE4_KDECORE_LIBS}
${KDE4_KIO_LIBS}
${KDE4_PLASMA_LIBS}
${QT_QTSCRIPT_LIBRARY})
${KDE4_KDECORE_LIBS}
${KDE4_KIO_LIBS}
${KDE4_PLASMA_LIBS}
${QT_QTSCRIPT_LIBRARY})
install(TARGETS plasma_dataenginescript_javascript DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES plasma-scriptengine-dataengine-javascript.desktop DESTINATION ${SERVICES_INSTALL_DIR})

48
scriptengines/javascript/javascriptrunner.cpp
View File

@ -18,12 +18,13 @@
#include "javascriptrunner.h"
#include <QScriptEngine>
#include <QFile>
#include <Plasma/AbstractRunner>
#include <Plasma/QueryMatch>
#include "authorization.h"
#include "scriptenv.h"
typedef const Plasma::RunnerContext* ConstRunnerContextStar;
typedef const Plasma::QueryMatch* ConstSearchMatchStar;
@ -34,11 +35,11 @@ Q_DECLARE_METATYPE(ConstRunnerContextStar)
Q_DECLARE_METATYPE(ConstSearchMatchStar)
JavaScriptRunner::JavaScriptRunner(QObject *parent, const QVariantList &args)
: RunnerScript(parent)
: RunnerScript(parent),
m_engine(new ScriptEnv(this))
{
Q_UNUSED(args);
m_engine = new QScriptEngine(this);
importExtensions();
connect(m_engine, SIGNAL(reportError(ScriptEnv*,bool)), this, SLOT(reportError(ScriptEnv*,bool)));
}
JavaScriptRunner::~JavaScriptRunner()
@ -54,6 +55,11 @@ bool JavaScriptRunner::init()
{
setupObjects();
Authorization auth;
if (!m_engine->importExtensions(description(), m_self, auth)) {
return false;
}
QFile file(mainScript());
if (!file.open(QIODevice::ReadOnly | QIODevice::Text) ) {
kWarning() << "Unable to load script file";
@ -65,14 +71,14 @@ bool JavaScriptRunner::init()
m_engine->evaluate(script);
if (m_engine->hasUncaughtException()) {
reportError();
reportError(m_engine, true);
return false;
}
return true;
}
void JavaScriptRunner::match(Plasma::RunnerContext *search)
void JavaScriptRunner::match(Plasma::RunnerContext &search)
{
QScriptValue fun = m_self.property("match");
if (!fun.isFunction()) {
@ -81,7 +87,7 @@ void JavaScriptRunner::match(Plasma::RunnerContext *search)
}
QScriptValueList args;
args << m_engine->toScriptValue(search);
args << m_engine->toScriptValue(&search);
QScriptContext *ctx = m_engine->pushContext();
ctx->setActivationObject(m_self);
@ -89,7 +95,7 @@ void JavaScriptRunner::match(Plasma::RunnerContext *search)
m_engine->popContext();
if (m_engine->hasUncaughtException()) {
reportError();
reportError(m_engine, false);
}
}
@ -111,7 +117,7 @@ void JavaScriptRunner::exec(const Plasma::RunnerContext *search, const Plasma::Q
m_engine->popContext();
if (m_engine->hasUncaughtException()) {
reportError();
reportError(m_engine, false);
}
}
@ -126,26 +132,12 @@ void JavaScriptRunner::setupObjects()
global.setProperty("runner", m_self);
}
void JavaScriptRunner::importExtensions()
void JavaScriptRunner::reportError(ScriptEnv *engine, bool fatal)
{
QStringList extensions;
//extensions << "qt.core" << "qt.gui" << "qt.svg" << "qt.xml" << "org.kde.plasma";
//extensions << "qt.core" << "qt.gui" << "qt.xml";
foreach (const QString &ext, extensions) {
kDebug() << "importing " << ext << "...";
QScriptValue ret = m_engine->importExtension(ext);
if (ret.isError()) {
kDebug() << "failed to import extension" << ext << ":" << ret.toString();
}
}
kDebug() << "done importing extensions.";
}
void JavaScriptRunner::reportError()
{
kDebug() << "Error: " << m_engine->uncaughtException().toString()
<< " at line " << m_engine->uncaughtExceptionLineNumber() << endl;
kDebug() << m_engine->uncaughtExceptionBacktrace();
Q_UNUSED(fatal)
kDebug() << "Error: " << engine->uncaughtException().toString()
<< " at line " << engine->uncaughtExceptionLineNumber() << endl;
kDebug() << engine->uncaughtExceptionBacktrace();
}
#include "javascriptrunner.moc"

8
scriptengines/javascript/javascriptrunner.h
View File

@ -25,7 +25,7 @@
#include <Plasma/RunnerScript>
class QScriptEngine;
class ScriptEnv;
class JavaScriptRunner : public Plasma::RunnerScript
{
@ -41,7 +41,7 @@ public:
Q_INVOKABLE Plasma::AbstractRunner* runner() const;
/** Reimplemented to forward to script. */
void match(Plasma::RunnerContext *search);
void match(Plasma::RunnerContext &search);
/** Reimplemented to forward to script. */
void exec(const Plasma::RunnerContext *search, const Plasma::QueryMatch *action);
@ -49,10 +49,10 @@ public:
protected:
void setupObjects();
void importExtensions();
void reportError();
void reportError(ScriptEnv *engine, bool fatal);
private:
QScriptEngine *m_engine;
ScriptEnv *m_engine;
QScriptValue m_self;
};