Differential D7960 Diff 19855 plugins/runcommand/runcommandplugin.cpp

Changeset View

Standalone View

View Options

plugins/runcommand/runcommandplugin.cpp

Context not available.
29#include <QSettings> 29​#include <QSettings>
30#include <QJsonDocument> 30​#include <QJsonDocument>
31#include <KShell> 31​#include <KShell>
32​#include <QUuid>
32 33​
33#include <core/networkpackage.h> 34​#include <core/networkpackage.h>
34#include <core/device.h> 35​#include <core/device.h>
35 36​
36#define PACKAGE_TYPE_RUNCOMMAND QStringLiteral("kdeconnect.runcommand") 37​#define PACKAGE_TYPE_RUNCOMMAND QStringLiteral("kdeconnect.runcommand")
38​#define PACKAGE_TYPE_RUNCOMMAND_ADD QStringLiteral("kdeconnect.runcommand.add")
37 39​
38K_PLUGIN_FACTORY_WITH_JSON( KdeConnectPluginFactory, "kdeconnect_runcommand.json", registerPlugin< RunCommandPlugin >(); ) 40​K_PLUGIN_FACTORY_WITH_JSON( KdeConnectPluginFactory, "kdeconnect_runcommand.json", registerPlugin< RunCommandPlugin >(); )
39 41​
Context not available.
51 53​
52bool RunCommandPlugin::receivePackage(const NetworkPackage& np) 54​bool RunCommandPlugin::receivePackage(const NetworkPackage& np)
53{ 55​{
56​ if(np.type() == PACKAGE_TYPE_RUNCOMMAND_ADD) {
57​ QString name = np.get<QString>("name");
58​ QString command = np.get<QString>("command");
59​ addCommand(name, command);
60​ }
61​
54 if (np.get<bool>(QStringLiteral("requestCommandList"), false)) { 62​ if (np.get<bool>(QStringLiteral("requestCommandList"), false)) {
55 sendConfig(); 63​ sendConfig();
thomaspUnsubmitted
Done

is a

return true;

missing here?

thomasp: is a ``` return true; ``` missing here?
56 return true; 64​ return true;
Context not available.
83{ 91​{
84 QString commands = config()->get<QString>(QStringLiteral("commands"),QStringLiteral("{}")); 92​ QString commands = config()->get<QString>(QStringLiteral("commands"),QStringLiteral("{}"));
85 NetworkPackage np(PACKAGE_TYPE_RUNCOMMAND, {{"commandList", commands}}); 93​ NetworkPackage np(PACKAGE_TYPE_RUNCOMMAND, {{"commandList", commands}});
94​ np.set<bool>(QStringLiteral("canAddCommand"), true);
86 sendPackage(np); 95​ sendPackage(np);
87} 96​}
88 97​
Context not available.
90 sendConfig(); 99​ sendConfig();
91} 100​}
92 101​
102​void RunCommandPlugin::addCommand(const QString& name, const QString& command)
103​{
104​ QJsonDocument jsonDocument = QJsonDocument::fromJson(config()->get<QByteArray>(QStringLiteral("commands"), "{}"));
105​ QJsonObject jsonConfig = jsonDocument.object();
106​
107​ QString key = QUuid::createUuid().toString();
108​ QJsonObject entry;
109​ entry[QStringLiteral("name")] = name;
110​ entry[QStringLiteral("command")] = command;
111​ jsonConfig[key] = entry;
112​
113​ QJsonDocument document;
114​ document.setObject(jsonConfig);
115​ config()->set(QStringLiteral("commands"), document.toJson(QJsonDocument::Compact));
116​}
117​
93#include "runcommandplugin.moc" 118​#include "runcommandplugin.moc"
Context not available.
thomaspUnsubmitted
Done

config()->set(...) in addCommand already calls sendConfig() through the configChanged signal

thomasp: `config()->set(...)` in `addCommand` already calls `sendConfig()` through the `configChanged`…