ETM-Schurig/etm-powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port snapd plugin to displayname

Browse Source
This commit is contained in:
Simon Stürz 2018-01-27 14:03:39 +01:00 committed by Michael Zanetti
parent be180cc90d
commit e216f510ef
3 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
snapd/devicepluginsnapd.cpp
View File

@ -33,7 +33,7 @@ DevicePluginSnapd::DevicePluginSnapd()
void DevicePluginSnapd::init()
{
// Check advanced mode
m_advancedMode = configValue(advancedModeParamTypeId).toBool();
m_advancedMode = configValue(SnapdAdvancedModeParamTypeId).toBool();
connect(this, &DevicePluginSnapd::configValueChanged, this, &DevicePluginSnapd::onPluginConfigurationChanged);
// Setup timers
@ -131,10 +131,10 @@ DeviceManager::DeviceError DevicePluginSnapd::executeAction(Device *device, cons
return DeviceManager::DeviceErrorHardwareFailure;
}
if (action.actionTypeId() == startUpdateActionTypeId) {
if (action.actionTypeId() == snapdControlStartUpdateActionTypeId) {
m_snapdControl->snapRefresh();
return DeviceManager::DeviceErrorNoError;
} else if (action.actionTypeId() == checkUpdatesActionTypeId) {
} else if (action.actionTypeId() == snapdControlCheckUpdatesActionTypeId) {
m_snapdControl->checkForUpdates();
return DeviceManager::DeviceErrorNoError;
}
@ -171,7 +171,7 @@ DeviceManager::DeviceError DevicePluginSnapd::executeAction(Device *device, cons
void DevicePluginSnapd::onPluginConfigurationChanged(const ParamTypeId &paramTypeId, const QVariant &value)
{
if (paramTypeId == advancedModeParamTypeId) {
if (paramTypeId == SnapdAdvancedModeParamTypeId) {
qCDebug(dcSnapd()) << "Advanced mode" << (value.toBool() ? "enabled." : "disabled.");
m_advancedMode = value.toBool();

106
snapd/devicepluginsnapd.json
View File

@ -1,26 +1,26 @@
{
"name": "Snapd",
"idName": "Snapd",
"displayName": "Snapd",
"id": "b82bce59-59bf-48b3-b781-54a6f45800f3",
"paramTypes": [
{
"id": "017fe4c5-fc41-41fe-8e67-08fdaccb89ea",
"idName": "advancedMode",
"name": "Advanced mode",
"name": "advancedMode",
"displayName": "Advanced mode",
"type": "bool",
"defaultValue": false
}
],
"vendors": [
{
"name": "Canonical",
"idName": "canonical",
"displayName": "Canonical",
"name": "canonical",
"id": "60582ddf-32ea-4fcd-a6f2-f3beaaf21517",
"deviceClasses": [
{
"id": "d90cda58-4d8c-4b7f-a982-38e56a95b72a",
"idName": "snapdControl",
"name": "Update manager",
"name": "snapdControl",
"displayName": "Update manager",
"createMethods": [ "auto" ],
"basicTags": [ "Gateway" ],
"deviceIcon": "Gateway",
@ -28,47 +28,47 @@
"actionTypes": [
{
"id": "45626b75-f09d-4dd1-b6c4-ee33201b47b0",
"idName": "startUpdate",
"name": "Start update",
"name": "startUpdate",
"displayName": "Start update",
"paramTypes": [ ]
},
{
"id": "4738f2c9-666e-45b9-91d3-7bcbf722b669",
"idName": "checkUpdates",
"name": "Check for updates",
"name": "checkUpdates",
"displayName": "Check for updates",
"paramTypes": [ ]
}
],
"stateTypes": [
{
"id": "6b662b3e-fd12-4f24-be77-aec066f16d8c",
"idName": "snapdAvailable",
"name": "Update manager available",
"eventTypeName": "Update manager available changed",
"name": "snapdAvailable",
"displayName": "Update manager available",
"displayNameEvent": "Update manager available changed",
"type": "bool",
"defaultValue": false
},
{
"id": "a6b1d24b-d523-4516-9bce-5b467e5e09b2",
"idName": "updateAvailable",
"name": "System update available",
"eventTypeName": "System update available changed",
"name": "updateAvailable",
"displayName": "System update available",
"displayNameEvent": "System update available changed",
"type": "bool",
"defaultValue": false
},
{
"id": "01ca7a22-5607-4c5e-a465-a2ae7e8b529c",
"idName": "updateRunning",
"name": "System update running",
"eventTypeName": "System update running changed",
"name": "updateRunning",
"displayName": "System update running",
"displayNameEvent": "System update running changed",
"type": "bool",
"defaultValue": false
},
{
"id": "c671545a-6bde-4c08-8e37-0d256841a3a5",
"idName": "lastUpdateTime",
"name": "Last automatic system update",
"eventTypeName": "Last automatic system update time changed",
"name": "lastUpdateTime",
"displayName": "Last automatic system update",
"displayNameEvent": "Last automatic system update time changed",
"unit": "UnixTime",
"type": "int",
"eventRuleRelevant": false,
@ -77,9 +77,9 @@
},
{
"id": "122c2423-a1d9-400f-80f8-b1f798975914",
"idName": "nextUpdateTime",
"name": "Next automatic system update",
"eventTypeName": "Next automatic system update time changed",
"name": "nextUpdateTime",
"displayName": "Next automatic system update",
"displayNameEvent": "Next automatic system update time changed",
"unit": "UnixTime",
"type": "int",
"eventRuleRelevant": false,
@ -88,9 +88,9 @@
},
{
"id": "4987aca3-3916-4cb3-938f-df6c99d04dbf",
"idName": "status",
"name": "Status",
"eventTypeName": "Status changed",
"name": "status",
"displayName": "Status",
"displayNameEvent": "Status changed",
"type": "QString",
"eventRuleRelevant": false,
"stateRuleRelevant": false,
@ -100,44 +100,44 @@
},
{
"id": "ff0840d7-fcfc-4403-9d9f-301610d5a437",
"idName": "snap",
"name": "Snap",
"name": "snap",
"displayName": "Snap",
"createMethods": [ "auto" ],
"basicTags": [ "Gateway" ],
"deviceIcon": "Network",
"paramTypes": [
{
"id": "4f38614d-8be0-48dc-a24d-cee9ff1f2a89",
"idName": "snapName",
"name": "Name",
"name": "name",
"displayName": "Name",
"type": "QString",
"defaultValue": "-"
},
{
"id": "9afb98fb-f717-4f4c-8009-1a6514054c5f",
"idName": "snapId",
"name": "ID",
"name": "id",
"displayName": "ID",
"type": "QString",
"defaultValue": "-"
},
{
"id": "12b9a65f-970b-49b5-b1d0-1625fc6d8758",
"idName": "snapSummary",
"name": "Summary",
"name": "summary",
"displayName": "Summary",
"type": "QString",
"defaultValue": "-"
},
{
"id": "fe24c61b-e154-4259-b7ca-6f0602e9d1c3",
"idName": "snapDescription",
"name": "Description",
"name": "description",
"displayName": "Description",
"type": "QString",
"defaultValue": "-"
},
{
"id": "76ead9c5-0a18-40a2-b31d-f6bb6dfea0a5",
"idName": "snapDeveloper",
"name": "Developer",
"name": "developer",
"displayName": "Developer",
"type": "QString",
"defaultValue": "-"
}
@ -145,20 +145,20 @@
"actionTypes": [
{
"id": "e061dee6-62fc-45cc-9c9f-403c2be52939",
"idName": "snapRevert",
"name": "Rollback to previous version"
"name": "revert",
"displayName": "Rollback to previous version"
}
],
"stateTypes": [
{
"id": "7be2b61e-3f59-4b92-b2bb-50d027bb92ff",
"idName": "snapChannel",
"name": "Channel",
"eventTypeName": "Channel changed",
"name": "channel",
"displayName": "Channel",
"displayNameEvent": "Channel changed",
"displayNameAction": "Set channel",
"type": "QString",
"eventRuleRelevant": false,
"stateRuleRelevant": false,
"actionTypeName": "Set channel",
"defaultValue": "stable",
"writable": true,
"possibleValues": [
@ -170,9 +170,9 @@
},
{
"id": "532a95f3-db29-427e-bb32-d5a22029e586",
"idName": "snapVersion",
"name": "Version",
"eventTypeName": "Version changed",
"name": "version",
"displayName": "Version",
"displayNameEvent": "Version changed",
"type": "QString",
"eventRuleRelevant": false,
"stateRuleRelevant": false,
@ -180,9 +180,9 @@
},
{
"id": "f26a6404-e011-11e7-9224-2350048461eb",
"idName": "snapRevision",
"name": "Revision",
"eventTypeName": "Revision changed",
"name": "revision",
"displayName": "Revision",
"displayNameEvent": "Revision changed",
"type": "QString",
"eventRuleRelevant": false,
"stateRuleRelevant": false,

22
snapd/snapdcontrol.cpp
View File

@ -137,7 +137,7 @@ void SnapdControl::processChange(const QVariantMap &changeMap)
// If change is on Doing, update the status
if (changeStatus == "Doing") {
device()->setStateValue(statusStateTypeId, changeSummary);
device()->setStateValue(snapdControlStatusStateTypeId, changeSummary);
}
// If this change is on ready, we can remove it from our watch list
@ -161,10 +161,10 @@ bool SnapdControl::validAsyncResponse(const QVariantMap &responseMap)
void SnapdControl::onConnectedChanged(const bool &connected)
{
if (connected) {
device()->setStateValue(snapdAvailableStateTypeId, true);
device()->setStateValue(snapdControlSnapdAvailableStateTypeId, true);
update();
} else {
device()->setStateValue(snapdAvailableStateTypeId, false);
device()->setStateValue(snapdControlSnapdAvailableStateTypeId, false);
}
}
@ -182,8 +182,8 @@ void SnapdControl::onLoadSystemInfoFinished()
QDateTime nextRefreshTime = QDateTime::fromString(result.value("refresh").toMap().value("next").toString(), Qt::ISODate);
// Set update time information
device()->setStateValue(lastUpdateTimeStateTypeId, lastRefreshTime.toTime_t());
device()->setStateValue(nextUpdateTimeStateTypeId, nextRefreshTime.toTime_t());
device()->setStateValue(snapdControlLastUpdateTimeStateTypeId, lastRefreshTime.toTime_t());
device()->setStateValue(snapdControlNextUpdateTimeStateTypeId, nextRefreshTime.toTime_t());
reply->deleteLater();
}
@ -220,11 +220,11 @@ void SnapdControl::onLoadRunningChangesFinished()
m_watchingChanges.clear();
// Update not running any more
device()->setStateValue(updateRunningStateTypeId, false);
device()->setStateValue(statusStateTypeId, "-");
device()->setStateValue(snapdControlUpdateRunningStateTypeId, false);
device()->setStateValue(snapdControlStatusStateTypeId, "-");
} else {
// Update running
device()->setStateValue(updateRunningStateTypeId, true);
device()->setStateValue(snapdControlUpdateRunningStateTypeId, true);
}
reply->deleteLater();
@ -242,8 +242,8 @@ void SnapdControl::onLoadChangeFinished()
processChange(reply->dataMap().value("result").toMap());
if (m_watchingChanges.isEmpty()) {
device()->setStateValue(updateRunningStateTypeId, false);
device()->setStateValue(statusStateTypeId, "-");
device()->setStateValue(snapdControlUpdateRunningStateTypeId, false);
device()->setStateValue(snapdControlStatusStateTypeId, "-");
}
reply->deleteLater();
@ -296,7 +296,7 @@ void SnapdControl::onCheckForUpdatesFinished()
}
//qCDebug(dcSnapd()) << qUtf8Printable(QJsonDocument::fromVariant(reply->dataMap()).toJson(QJsonDocument::Indented));
device()->setStateValue(updateAvailableStateTypeId, !reply->dataMap().value("result").toList().isEmpty());
device()->setStateValue(snapdControlUpdateAvailableStateTypeId, !reply->dataMap().value("result").toList().isEmpty());
reply->deleteLater();
}