From fd4440f9408eb01edb8449a78b7acc083eea3939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= Date: Mon, 2 Dec 2019 15:04:51 +0100 Subject: [PATCH] WIP: doesnt work (stacked in event loop) --- src/colnod/colnodapi.cpp | 8 ++++---- src/colnod/syncmanager.cpp | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/colnod/colnodapi.cpp b/src/colnod/colnodapi.cpp index 5249f5f..de04fc5 100644 --- a/src/colnod/colnodapi.cpp +++ b/src/colnod/colnodapi.cpp @@ -21,16 +21,13 @@ ColnodAPI::ColnodAPI(serversdk::RequestManager* reqMan, const bool &dryMode, con void ColnodAPI::downloadData(const qint64 &time) { // Have to get Login - Timestamp timestamp; - timestamp.setTimestamp(time); auto login = requestLogin(); - connect(login.get(), &serversdk::Request::finished, this, [&](){ + connect(login.get(), &serversdk::Request::finished, this, [=](){ // Get login token if (!checkRequest(login)) { emit downloadDataFinished(nullptr); return; } - AuthToken token; token.fromJson(login->responseData()); authToken = token.id(); @@ -53,6 +50,9 @@ void ColnodAPI::downloadData(const qint64 &time) // if I have all data emit downloadDataFinished connect(this, &ColnodAPI::partOfDataReady, this, &ColnodAPI::areDataReady); + Timestamp timestamp; + timestamp.setTimestamp(time); + auto tokensRequest = getTokensUpdated(timestamp); connect(tokensRequest.get(), &serversdk::Request::finished, errorHandler); connect(tokensRequest.get(), &serversdk::Request::finished, [=](){ diff --git a/src/colnod/syncmanager.cpp b/src/colnod/syncmanager.cpp index 5194f23..2d01b56 100644 --- a/src/colnod/syncmanager.cpp +++ b/src/colnod/syncmanager.cpp @@ -90,8 +90,6 @@ bool SyncManager::startSynchronization() if (!database->processData(preparedData->databaseData)) { qCritical(syncmanager) << "Not possible to upload data to database"; } - colnod->processData(preparedData->colnodData); - //qCritical(syncmanager) << "Not possible to upload data to colnod"; // data is processed to other sides connect(colnod.get(), &ColnodAPI::dataProcessFinished, [&](){ @@ -135,6 +133,9 @@ bool SyncManager::startSynchronization() QCoreApplication::exit(); }); + colnod->processData(preparedData->colnodData); + //qCritical(syncmanager) << "Not possible to upload data to colnod"; + }); });