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

Tado: Format source using clang-format

Browse Source
This commit is contained in:
Simon Stürz 2025-12-19 15:24:13 +01:00
parent 4e9c5501d6
commit 616f660c9f
4 changed files with 68 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tado/integrationplugintado.cpp
View File

@ -29,9 +29,9 @@
#include <network/networkaccessmanager.h> #include <network/networkaccessmanager.h>
#include <QDebug> #include <QDebug>
#include <QUrlQuery>
#include <QJsonDocument> #include <QJsonDocument>
#include <QTimer> #include <QTimer>
#include <QUrlQuery>
#include <QtMath> #include <QtMath>
namespace { namespace {
@ -43,7 +43,7 @@ void finishPendingActions(const QList<ThingActionInfo *> &actions, Thing::ThingE
} }
} }
} }
} } // namespace
IntegrationPluginTado::IntegrationPluginTado() IntegrationPluginTado::IntegrationPluginTado()
{ {
@ -91,9 +91,7 @@ void IntegrationPluginTado::queueOverlayChange(ThingActionInfo *info, const QStr
pending.dirty = true; pending.dirty = true;
pending.pendingActions.append(info); pending.pendingActions.append(info);
connect(info, &ThingActionInfo::aborted, this, [this, info]() { connect(info, &ThingActionInfo::aborted, this, [this, info]() { removePendingAction(info); });
removePendingAction(info);
});
if (!m_stateSyncTimer.isActive()) { if (!m_stateSyncTimer.isActive()) {
m_stateSyncTimer.start(); m_stateSyncTimer.start();
@ -110,10 +108,7 @@ void IntegrationPluginTado::removePendingAction(ThingActionInfo *info)
} }
} }
void IntegrationPluginTado::init() void IntegrationPluginTado::init() {}
{
}
void IntegrationPluginTado::startPairing(ThingPairingInfo *info) void IntegrationPluginTado::startPairing(ThingPairingInfo *info)
{ {
@ -139,8 +134,6 @@ void IntegrationPluginTado::startPairing(ThingPairingInfo *info)
m_unfinishedTadoAccounts.take(info->thingId())->deleteLater(); m_unfinishedTadoAccounts.take(info->thingId())->deleteLater();
}); });
qCDebug(dcTado()) << "Tado server is reachable. Starting the OAuth pairing process using" << tado->loginUrl(); qCDebug(dcTado()) << "Tado server is reachable. Starting the OAuth pairing process using" << tado->loginUrl();
info->setOAuthUrl(QUrl(tado->loginUrl())); info->setOAuthUrl(QUrl(tado->loginUrl()));
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
@ -185,7 +178,6 @@ void IntegrationPluginTado::setupThing(ThingSetupInfo *info)
Thing *thing = info->thing(); Thing *thing = info->thing();
if (thing->thingClassId() == tadoAccountThingClassId) { if (thing->thingClassId() == tadoAccountThingClassId) {
qCDebug(dcTado) << "Setting up Tado account" << thing->name() << thing->params(); qCDebug(dcTado) << "Setting up Tado account" << thing->name() << thing->params();
Tado *tado = nullptr; Tado *tado = nullptr;
@ -205,7 +197,6 @@ void IntegrationPluginTado::setupThing(ThingSetupInfo *info)
pluginStorage()->setValue("refreshToken", tado->refreshToken()); pluginStorage()->setValue("refreshToken", tado->refreshToken());
pluginStorage()->endGroup(); pluginStorage()->endGroup();
} else { } else {
// Load refresh token // Load refresh token
pluginStorage()->beginGroup(thing->id().toString()); pluginStorage()->beginGroup(thing->id().toString());
QString refreshToken = pluginStorage()->value("refreshToken").toString(); QString refreshToken = pluginStorage()->value("refreshToken").toString();
@ -400,7 +391,6 @@ void IntegrationPluginTado::executeAction(ThingActionInfo *info)
} }
queueOverlayChange(info, homeId, zoneId, desired); queueOverlayChange(info, homeId, zoneId, desired);
} else if (action.actionTypeId() == zoneTargetTemperatureActionTypeId) { } else if (action.actionTypeId() == zoneTargetTemperatureActionTypeId) {
double temperature = action.param(zoneTargetTemperatureActionTargetTemperatureParamTypeId).value().toDouble(); double temperature = action.param(zoneTargetTemperatureActionTargetTemperatureParamTypeId).value().toDouble();
OverlayState desired; OverlayState desired;
if (temperature <= 0) { if (temperature <= 0) {
@ -565,8 +555,7 @@ void IntegrationPluginTado::onRequestExecuted(QUuid requestId, bool success)
} }
PendingRequest request = m_pendingRequests.take(requestId); PendingRequest request = m_pendingRequests.take(requestId);
finishPendingActions(request.actions, finishPendingActions(request.actions, success ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareNotAvailable);
success ? Thing::ThingErrorNoError : Thing::ThingErrorHardwareNotAvailable);
if (!m_pendingOverlayChanges.contains(request.zoneKey)) { if (!m_pendingOverlayChanges.contains(request.zoneKey)) {
return; return;
@ -604,13 +593,11 @@ void IntegrationPluginTado::onZonesReceived(const QString &homeId, QList<Tado::Z
Tado *tado = static_cast<Tado *>(sender()); Tado *tado = static_cast<Tado *>(sender());
if (m_tadoAccounts.values().contains(tado)) { if (m_tadoAccounts.values().contains(tado)) {
Thing *parentDevice = myThings().findById(m_tadoAccounts.key(tado)); Thing *parentDevice = myThings().findById(m_tadoAccounts.key(tado));
qCDebug(dcTado()) << "Zones received:" << zones.count() << parentDevice->name(); qCDebug(dcTado()) << "Zones received:" << zones.count() << parentDevice->name();
ThingDescriptors descriptors; ThingDescriptors descriptors;
foreach (Tado::Zone zone, zones) { foreach (Tado::Zone zone, zones) {
ThingDescriptor descriptor(zoneThingClassId, zone.name, "Type:" + zone.type, parentDevice->id()); ThingDescriptor descriptor(zoneThingClassId, zone.name, "Type:" + zone.type, parentDevice->id());
ParamList params; ParamList params;
params.append(Param(zoneThingHomeIdParamTypeId, homeId)); params.append(Param(zoneThingHomeIdParamTypeId, homeId));

11
tado/integrationplugintado.h
View File

@ -26,8 +26,8 @@
#define INTEGRATIONPLUGINTADO_H #define INTEGRATIONPLUGINTADO_H
#include <integrations/integrationplugin.h> #include <integrations/integrationplugin.h>
#include <plugintimer.h>
#include <network/oauth2.h> #include <network/oauth2.h>
#include <plugintimer.h>
#include <QHash> #include <QHash>
#include <QList> #include <QList>
@ -56,13 +56,15 @@ public:
void executeAction(ThingActionInfo *info) override; void executeAction(ThingActionInfo *info) override;
private: private:
struct OverlayState { struct OverlayState
{
bool deleteOverlay = false; bool deleteOverlay = false;
bool power = false; bool power = false;
double temperature = 0.0; double temperature = 0.0;
}; };
struct PendingOverlayChange { struct PendingOverlayChange
{
ThingId accountThingId; ThingId accountThingId;
QString homeId; QString homeId;
QString zoneId; QString zoneId;
@ -74,7 +76,8 @@ private:
QList<ThingActionInfo *> pendingActions; QList<ThingActionInfo *> pendingActions;
}; };
struct PendingRequest { struct PendingRequest
{
QString zoneKey; QString zoneKey;
QList<ThingActionInfo *> actions; QList<ThingActionInfo *> actions;
OverlayState sentState; OverlayState sentState;

26
tado/tado.cpp
View File

@ -25,14 +25,14 @@
#include "tado.h" #include "tado.h"
#include "extern-plugininfo.h" #include "extern-plugininfo.h"
#include <QJsonArray>
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonObject> #include <QJsonObject>
#include <QJsonArray>
#include <QUrlQuery> #include <QUrlQuery>
Tado::Tado(NetworkAccessManager *networkManager, QObject *parent) : Tado::Tado(NetworkAccessManager *networkManager, QObject *parent)
QObject(parent), : QObject(parent)
m_networkManager(networkManager) , m_networkManager(networkManager)
{ {
m_baseControlUrl = "https://my.tado.com/api/v2"; m_baseControlUrl = "https://my.tado.com/api/v2";
m_baseAuthorizationUrl = "https://login.tado.com/oauth2"; m_baseAuthorizationUrl = "https://login.tado.com/oauth2";
@ -68,7 +68,6 @@ bool Tado::connected()
return m_connectionStatus; return m_connectionStatus;
} }
QString Tado::loginUrl() const QString Tado::loginUrl() const
{ {
return m_loginUrl; return m_loginUrl;
@ -112,7 +111,6 @@ void Tado::getLoginUrl()
QNetworkReply *reply = m_networkManager->post(request, payload); QNetworkReply *reply = m_networkManager->post(request, payload);
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater); connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, this, [reply, this] { connect(reply, &QNetworkReply::finished, this, [reply, this] {
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
// Check HTTP status code // Check HTTP status code
if (status != 200 || reply->error() != QNetworkReply::NoError) { if (status != 200 || reply->error() != QNetworkReply::NoError) {
@ -157,7 +155,6 @@ void Tado::getLoginUrl()
}); });
} }
void Tado::getAccessToken() void Tado::getAccessToken()
{ {
QNetworkRequest request = QNetworkRequest(QUrl(m_baseAuthorizationUrl + "/token")); QNetworkRequest request = QNetworkRequest(QUrl(m_baseAuthorizationUrl + "/token"));
@ -175,12 +172,10 @@ void Tado::getAccessToken()
QNetworkReply *reply = m_networkManager->post(request, payload); QNetworkReply *reply = m_networkManager->post(request, payload);
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater); connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, this, [reply, this] { connect(reply, &QNetworkReply::finished, this, [reply, this] {
QByteArray data = reply->readAll(); QByteArray data = reply->readAll();
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
// Check HTTP status code // Check HTTP status code
if (status != 200 || reply->error() != QNetworkReply::NoError) { if (status != 200 || reply->error() != QNetworkReply::NoError) {
emit connectionError(reply->error()); emit connectionError(reply->error());
if (reply->error() == QNetworkReply::HostNotFoundError) if (reply->error() == QNetworkReply::HostNotFoundError)
@ -216,7 +211,6 @@ void Tado::getAccessToken()
emit refreshTokenReceived(m_refreshToken); emit refreshTokenReceived(m_refreshToken);
} }
setAuthenticationStatus(true); setAuthenticationStatus(true);
// Refresh 10 sekonds before expiration // Refresh 10 sekonds before expiration
@ -244,7 +238,6 @@ void Tado::getHomes()
//qCDebug(dcTado()) << "Sending request" << request.url() << request.rawHeaderList(); //qCDebug(dcTado()) << "Sending request" << request.url() << request.rawHeaderList();
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater); connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, this, [reply, this] { connect(reply, &QNetworkReply::finished, this, [reply, this] {
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
// Check HTTP status code // Check HTTP status code
@ -312,7 +305,6 @@ void Tado::getZones(const QString &homeId)
//qCDebug(dcTado()) << "Sending request" << request.url() << request.rawHeaderList(); //qCDebug(dcTado()) << "Sending request" << request.url() << request.rawHeaderList();
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater); connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, this, [reply, homeId, this] { connect(reply, &QNetworkReply::finished, this, [reply, homeId, this] {
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
// Check HTTP status code // Check HTTP status code
@ -369,7 +361,6 @@ void Tado::getZoneState(const QString &homeId, const QString &zoneId)
//qCDebug(dcTado()) << "Sending request" << request.url() << request.rawHeaderList(); //qCDebug(dcTado()) << "Sending request" << request.url() << request.rawHeaderList();
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater); connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, this, [reply, homeId, zoneId, this] { connect(reply, &QNetworkReply::finished, this, [reply, homeId, zoneId, this] {
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
// Check HTTP status code // Check HTTP status code
@ -386,7 +377,6 @@ void Tado::getZoneState(const QString &homeId, const QString &zoneId)
return; return;
} }
setConnectionStatus(true); setConnectionStatus(true);
setAuthenticationStatus(true); setAuthenticationStatus(true);
@ -454,13 +444,13 @@ QUuid Tado::setOverlay(const QString &homeId, const QString &zoneId, bool power,
else else
powerString = "OFF"; powerString = "OFF";
body.append("{\"setting\":{\"type\":\"HEATING\",\"power\":\"" + powerString + "\",\"temperature\":{\"celsius\":" + QVariant(targetTemperature).toByteArray() + "}},\"termination\":{\"type\":\"MANUAL\"}}"); body.append("{\"setting\":{\"type\":\"HEATING\",\"power\":\"" + powerString + "\",\"temperature\":{\"celsius\":" + QVariant(targetTemperature).toByteArray()
+ "}},\"termination\":{\"type\":\"MANUAL\"}}");
//qCDebug(dcTado()) << "Sending request" << body; //qCDebug(dcTado()) << "Sending request" << body;
QNetworkReply *reply = m_networkManager->put(request, body); QNetworkReply *reply = m_networkManager->put(request, body);
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater); connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, this, [homeId, zoneId, requestId, reply, this] { connect(reply, &QNetworkReply::finished, this, [homeId, zoneId, requestId, reply, this] {
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
if (status != 200 || reply->error() != QNetworkReply::NoError) { if (status != 200 || reply->error() != QNetworkReply::NoError) {
emit requestExecuted(requestId, false); emit requestExecuted(requestId, false);
@ -525,10 +515,8 @@ QUuid Tado::deleteOverlay(const QString &homeId, const QString &zoneId)
QNetworkReply *reply = m_networkManager->deleteResource(request); QNetworkReply *reply = m_networkManager->deleteResource(request);
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater); connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, this, [homeId, zoneId, requestId, reply, this] { connect(reply, &QNetworkReply::finished, this, [homeId, zoneId, requestId, reply, this] {
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
if (status < 200 || status > 210 || reply->error() != QNetworkReply::NoError) { if (status < 200 || status > 210 || reply->error() != QNetworkReply::NoError) {
emit requestExecuted(requestId, false); emit requestExecuted(requestId, false);
emit connectionError(reply->error()); emit connectionError(reply->error());
@ -590,7 +578,6 @@ void Tado::requestAuthenticationToken()
QNetworkReply *reply = m_networkManager->post(request, payload); QNetworkReply *reply = m_networkManager->post(request, payload);
connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater); connect(reply, &QNetworkReply::finished, reply, &QNetworkReply::deleteLater);
connect(reply, &QNetworkReply::finished, this, [reply, this] { connect(reply, &QNetworkReply::finished, this, [reply, this] {
int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
if (status != 200 || reply->error() != QNetworkReply::NoError) { if (status != 200 || reply->error() != QNetworkReply::NoError) {
qCDebug(dcTado()) << "Request error:" << status << "Retrying:" << m_pollAuthenticationCount << "/" << m_pollAuthenticationLimit; qCDebug(dcTado()) << "Request error:" << status << "Retrying:" << m_pollAuthenticationCount << "/" << m_pollAuthenticationLimit;
@ -643,7 +630,6 @@ void Tado::setAuthenticationStatus(bool status)
if (!status) if (!status)
m_refreshTimer.stop(); m_refreshTimer.stop();
} }
void Tado::setConnectionStatus(bool status) void Tado::setConnectionStatus(bool status)

15
tado/tado.h
View File

@ -25,8 +25,8 @@
#ifndef TADO_H #ifndef TADO_H
#define TADO_H #define TADO_H
#include <network/networkaccessmanager.h>
#include <integrations/thing.h> #include <integrations/thing.h>
#include <network/networkaccessmanager.h>
#include <QObject> #include <QObject>
#include <QTimer> #include <QTimer>
@ -36,13 +36,15 @@ class Tado : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
struct Zone { struct Zone
{
QString id; QString id;
QString name; QString name;
QString type; QString type;
}; };
struct Overlay { struct Overlay
{
bool power; bool power;
double temperature; double temperature;
QString zoneType; QString zoneType;
@ -50,7 +52,8 @@ public:
QString tadoMode; QString tadoMode;
}; };
struct ZoneState { struct ZoneState
{
bool connected = false; bool connected = false;
bool power = false; bool power = false;
QString tadoMode; QString tadoMode;
@ -68,7 +71,8 @@ public:
QString overlayType; QString overlayType;
}; };
struct Home { struct Home
{
QString id; QString id;
QString name; QString name;
}; };
@ -141,7 +145,6 @@ signals:
void zoneStateReceived(const QString &homeId, const QString &zoneId, Tado::ZoneState sate); void zoneStateReceived(const QString &homeId, const QString &zoneId, Tado::ZoneState sate);
void overlayReceived(const QString &homeId, const QString &zoneId, const Tado::Overlay &overlay); void overlayReceived(const QString &homeId, const QString &zoneId, const Tado::Overlay &overlay);
void connectionError(QNetworkReply::NetworkError error); void connectionError(QNetworkReply::NetworkError error);
}; };
#endif // TADO_H #endif // TADO_H