andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

- Including ExternalCommandHelper asynchronous DBus call in ExternalCommand::execute 

- Stop helper before starting a new in CoreBackendManager::startExternalCommandHelper
- Unregister org.kde.kpmcore.helperinterface service in ExternalCommandHelper::exit
This commit is contained in:
Caio Carvalho 2018-03-22 02:32:59 -03:00
parent 4b91f2c07e
commit dac3372a78
3 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/corebackendmanager.cpp
View File

@ -65,6 +65,8 @@ QVector<KPluginMetaData> CoreBackendManager::list() const
void CoreBackendManager::startExternalCommandHelper()
{
stopExternalCommandHelper();
KAuth::Action action = KAuth::Action(QStringLiteral("org.kde.kpmcore.externalcommand.init"));
action.setHelperId(QStringLiteral("org.kde.kpmcore.externalcommand"));
action.setTimeout(10 * 24 * 3600 * 1000); // 10 days

52
src/util/externalcommand.cpp
View File

@ -152,6 +152,7 @@ bool ExternalCommand::start(int timeout)
// connect(this, &ExternalCommand::finished, &loop, &QEventLoop::quit);
// loop.exec();
// return true;
Q_UNUSED(timeout)
execute();
return true;
}
@ -173,20 +174,43 @@ void ExternalCommand::execute()
return;
}
QDBusInterface iface(QStringLiteral("org.kde.kpmcore.helperinterface"), QStringLiteral("/Helper"), QStringLiteral("org.kde.kpmcore.externalcommand"), QDBusConnection::systemBus());
iface.setTimeout(10 * 24 * 3600 * 1000); // 10 days
if (iface.isValid()) {
QDBusReply<QVariantMap> reply = iface.call(QStringLiteral("start"), CoreBackendManager::self()->Uuid(), cmd, args(), m_Input, QStringList());
if (reply.isValid()) {
m_Output = reply.value()[QStringLiteral("output")].toByteArray();
setExitCode(reply.value()[QStringLiteral("exitCode")].toInt());
}
else {
qWarning() << reply.error().message();
}
}
QDBusInterface iface(QStringLiteral("org.kde.kpmcore.helperinterface"),
QStringLiteral("/Helper"),
QStringLiteral("org.kde.kpmcore.externalcommand"),
QDBusConnection::systemBus());
emit finished();
iface.setTimeout(10 * 24 * 3600 * 1000); // 10 days
if (iface.isValid()) {
QDBusPendingCall pcall = iface.asyncCall(QStringLiteral("start"),
CoreBackendManager::self()->Uuid(),
cmd,
args(),
m_Input,
QStringList());
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
QEventLoop loop;
auto exitLoop = [&] (QDBusPendingCallWatcher *watcher) {
loop.exit();
if (watcher->isError())
qWarning() << watcher->error();
else {
QDBusPendingReply<QVariantMap> reply = *watcher;
m_Output = reply.value()[QStringLiteral("output")].toByteArray();
setExitCode(reply.value()[QStringLiteral("exitCode")].toInt());
}
emit finished();
};
connect(watcher, &QDBusPendingCallWatcher::finished, exitLoop);
loop.exec();
}
}
bool ExternalCommand::write(const QByteArray& input)
@ -210,7 +234,7 @@ bool ExternalCommand::waitFor(int timeout)
}*/
// onReadOutput();
Q_UNUSED(timeout)
return true;
}

5
src/util/externalcommandhelper.cpp
View File

@ -225,6 +225,11 @@ void ExternalCommandHelper::exit(const QString& Uuid)
{
isCallerAuthorized(Uuid);
m_loop.exit();
if (QDBusConnection::systemBus().unregisterService(QStringLiteral("org.kde.kpmcore.helperinterface")))
qDebug() << "org.kde.kpmcore.helperinterface unregistered";
QDBusConnection::systemBus().unregisterObject(QStringLiteral("/Helper"));
}
void ExternalCommandHelper::onReadOutput()